Skip to content

Commit ec9d4fb

Browse files
committed
Adjust ARM64_ATOMICS_FEATURE_FLAG_BIT to match the new bit position
1 parent 50c85ee commit ec9d4fb

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

src/coreclr/nativeaot/Runtime/AsmOffsets.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ ASM_CONST(3FFFFFDF,3FFFFFDF,MAX_STRING_LENGTH)
3737

3838
#if defined(HOST_ARM64)
3939
// Bit position for the ARM64IntrinsicConstants_Atomics flags, to be used with tbz / tbnz instructions
40-
// ARM64IntrinsicConstants_Atomics = 0x0080
41-
ASM_CONST( 7, 7, ARM64_ATOMICS_FEATURE_FLAG_BIT)
40+
// ARM64IntrinsicConstants_Atomics = 0x0040
41+
ASM_CONST( 6, 6, ARM64_ATOMICS_FEATURE_FLAG_BIT)
4242
#endif
4343

4444
ASM_OFFSET( 0, 0, MethodTable, m_usComponentSize)

src/native/minipal/cpufeatures.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ enum ARM64IntrinsicConstants
5656
#include <assert.h>
5757

5858
// Bit position for the ARM64IntrinsicConstants_Atomics flags, to be used with tbz / tbnz instructions
59-
#define ARM64_ATOMICS_FEATURE_FLAG_BIT 7
59+
#define ARM64_ATOMICS_FEATURE_FLAG_BIT 6
6060
static_assert((1 << ARM64_ATOMICS_FEATURE_FLAG_BIT) == ARM64IntrinsicConstants_Atomics, "ARM64_ATOMICS_FEATURE_FLAG_BIT must match with ARM64IntrinsicConstants_Atomics");
6161

6262
#endif // HOST_ARM64

0 commit comments

Comments
 (0)