Changeset 106551 in vbox for trunk/include

Timestamp:

Oct 21, 2024 10:14:22 AM (7 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

165385

Message:

iprt/asm.h: Adjustments of the win/arm64 changes - RT_INLINE_ASM_USES_INTRIN is always defined and we must test the value it has. bugref:10392

File:

• trunk/include/iprt/asm.h (modified) (24 diffs)

trunk/include/iprt/asm.h

@@ -1421 +1421 @@
 
 # elif defined(RT_ARCH_ARM64) || defined(RT_ARCH_ARM32)
-#  ifdef RT_INLINE_ASM_USES_INTRIN
+#  if RT_INLINE_ASM_USES_INTRIN
 #   if defined(RTASM_ARM64_USE_FEAT_LSE_WITHOUT_DMB)
     uint32_t const uOldActual = __casal32(pu32, u32Old, u32New);
@@ -1618 +1618 @@
 
 # elif defined(RT_ARCH_ARM64) || defined(RT_ARCH_ARM32)
-#  ifdef RT_INLINE_ASM_USES_INTRIN
+#  if RT_INLINE_ASM_USES_INTRIN
 #   if defined(RTASM_ARM64_USE_FEAT_LSE_WITHOUT_DMB)
     uint64_t const uOldActual = __casal64(pu64, u64Old, u64New);
@@ -1998 +1998 @@
 
 # elif defined(RT_ARCH_ARM64) || defined(RT_ARCH_ARM32)
-#  ifdef RT_INLINE_ASM_USES_INTRIN
+#  if RT_INLINE_ASM_USES_INTRIN
 #   if defined(RTASM_ARM64_USE_FEAT_LSE)
 #    if defined(RTASM_ARM64_USE_FEAT_LSE_WITHOUT_DMB)
@@ -2166 +2166 @@
 
 # elif defined(RT_ARCH_ARM64) || defined(RT_ARCH_ARM32)
-#  ifdef RT_INLINE_ASM_USES_INTRIN
+#  if RT_INLINE_ASM_USES_INTRIN
 #   if defined(RTASM_ARM64_USE_FEAT_LSE)
 #    if defined(RTASM_ARM64_USE_FEAT_LSE_WITHOUT_DMB)
@@ -2334 +2334 @@
 
 # elif defined(RT_ARCH_ARM64) || defined(RT_ARCH_ARM32)
-#  ifdef RT_INLINE_ASM_USES_INTRIN
+#  if RT_INLINE_ASM_USES_INTRIN
 #   if defined(RTASM_ARM64_USE_FEAT_LSE)
 #    if defined(RTASM_ARM64_USE_FEAT_LSE_WITHOUT_DMB)
@@ -3002 +3002 @@
 DECLINLINE(void) ASMSerializeInstruction(void) RT_NOTHROW_DEF
 {
-# ifdef RT_INLINE_ASM_USES_INTRIN
+# if RT_INLINE_ASM_USES_INTRIN
     __dsb(_ARM64_BARRIER_SY);
 # else
@@ -3033 +3033 @@
 # endif
 #elif defined(RT_ARCH_ARM64) || defined(RT_ARCH_ARM32)
-# ifdef RT_INLINE_ASM_USES_INTRIN
+# if RT_INLINE_ASM_USES_INTRIN
     __dmb(_ARM64_BARRIER_SY);
 # else
@@ -3068 +3068 @@
 # endif
 #elif defined(RT_ARCH_ARM64) || defined(RT_ARCH_ARM32)
-# ifdef RT_INLINE_ASM_USES_INTRIN
+# if RT_INLINE_ASM_USES_INTRIN
     __dmb(_ARM64_BARRIER_ST);
 # else
@@ -3099 +3099 @@
 # endif
 #elif defined(RT_ARCH_ARM64) || defined(RT_ARCH_ARM32)
-# ifdef RT_INLINE_ASM_USES_INTRIN
+# if RT_INLINE_ASM_USES_INTRIN
     __dmb(_ARM64_BARRIER_LD);
 # else
@@ -3119 +3119 @@
 {
 #if defined(RT_ARCH_ARM64) || defined(RT_ARCH_ARM32)
-# ifdef RT_INLINE_ASM_USES_INTRIN
+# if RT_INLINE_ASM_USES_INTRIN
     return __load_acquire8(pu8);
 
@@ -3170 +3170 @@
 {
 #if defined(RT_ARCH_ARM64) || defined(RT_ARCH_ARM32)
-# ifdef RT_INLINE_ASM_USES_INTRIN
+# if RT_INLINE_ASM_USES_INTRIN
     return (uint8_t)__iso_volatile_load8((volatile char *)pu8); /* (emits ldrsb, sign-extending it to 32-bit) */
 
@@ -3218 +3218 @@
 {
 #if defined(RT_ARCH_ARM64) || defined(RT_ARCH_ARM32)
-# ifdef RT_INLINE_ASM_USES_INTRIN
+# if RT_INLINE_ASM_USES_INTRIN
     return __iso_volatile_load8((volatile const char *)pi8);
 
@@ -3250 +3250 @@
     Assert(!((uintptr_t)pu16 & 1));
 #if defined(RT_ARCH_ARM64) || defined(RT_ARCH_ARM32)
-# ifdef RT_INLINE_ASM_USES_INTRIN
+# if RT_INLINE_ASM_USES_INTRIN
     return __load_acquire16(pu16);
 
@@ -3302 +3302 @@
     Assert(!((uintptr_t)pu16 & 1));
 #if defined(RT_ARCH_ARM64) || defined(RT_ARCH_ARM32)
-# ifdef RT_INLINE_ASM_USES_INTRIN
+# if RT_INLINE_ASM_USES_INTRIN
     return (uint16_t)__iso_volatile_load16((volatile int16_t *)pu16);  /* (emits ldrsh, sign-extending it to 32-bit) */
 
@@ -3352 +3352 @@
     Assert(!((uintptr_t)pi16 & 1));
 #if defined(RT_ARCH_ARM64) || defined(RT_ARCH_ARM32)
-# ifdef RT_INLINE_ASM_USES_INTRIN
+# if RT_INLINE_ASM_USES_INTRIN
     return __iso_volatile_load16(pi16);
 
@@ -3384 +3384 @@
     Assert(!((uintptr_t)pu32 & 3));
 #if defined(RT_ARCH_ARM64) || defined(RT_ARCH_ARM32)
-# ifdef RT_INLINE_ASM_USES_INTRIN
+# if RT_INLINE_ASM_USES_INTRIN
     return (uint32_t)__load_acquire32(pu32);
 
@@ -3439 +3439 @@
     Assert(!((uintptr_t)pu32 & 3));
 #if defined(RT_ARCH_ARM64) || defined(RT_ARCH_ARM32)
-# ifdef RT_INLINE_ASM_USES_INTRIN
+# if RT_INLINE_ASM_USES_INTRIN
     return (uint32_t)__iso_volatile_load32((volatile int32_t *)pu32);
 
@@ -3495 +3495 @@
     Assert(!((uintptr_t)pi32 & 3));
 #if defined(RT_ARCH_ARM64) || defined(RT_ARCH_ARM32)
-# ifdef RT_INLINE_ASM_USES_INTRIN
+# if RT_INLINE_ASM_USES_INTRIN
     return __iso_volatile_load32(pi32);
 
@@ -3602 +3602 @@
     Assert(!((uintptr_t)pu64 & 7));
 
-#  ifdef RT_INLINE_ASM_USES_INTRIN
+#  if RT_INLINE_ASM_USES_INTRIN
     u64 = (uint64_t)__load_acquire64(pu64);
 
@@ -3726 +3726 @@
 # elif defined(RT_ARCH_ARM64) || defined(RT_ARCH_ARM32)
     Assert(!((uintptr_t)pu64 & 7));
-#  ifdef RT_INLINE_ASM_USES_INTRIN
+#  if RT_INLINE_ASM_USES_INTRIN
     u64 = (uint64_t)__iso_volatile_load64((volatile int64_t *)pu64);
 
@@ -4185 +4185 @@
     /* The DMB SY will ensure ordering a la x86, the stlrb is probably overkill
        as all byte accesses are single-copy atomic, which I think suffices here. */
-# ifdef RT_INLINE_ASM_USES_INTRIN
+# if RT_INLINE_ASM_USES_INTRIN
     __dmb(_ARM64_BARRIER_SY);
     __stlr8(pu8, u8);
@@ -4258 +4258 @@
 #if defined(RT_ARCH_ARM64)
     /* See ASMAtomicWriteU8 comments. */
-# ifdef RT_INLINE_ASM_USES_INTRIN
+# if RT_INLINE_ASM_USES_INTRIN
     __dmb(_ARM64_BARRIER_SY);
     __stlr16(pu16, u16);
@@ -4333 +4333 @@
 #if defined(RT_ARCH_ARM64)
    /* See ASMAtomicWriteU8 comments. */
-# ifdef RT_INLINE_ASM_USES_INTRIN
+# if RT_INLINE_ASM_USES_INTRIN
     __dmb(_ARM64_BARRIER_SY);
     __stlr32(pu32, u32);
@@ -4416 +4416 @@
 #if defined(RT_ARCH_ARM64)
     /* See ASMAtomicWriteU8 comments. */
-# ifdef RT_INLINE_ASM_USES_INTRIN
+# if RT_INLINE_ASM_USES_INTRIN
     __dmb(_ARM64_BARRIER_SY);
     __stlr64(pu64, u64);