Changeset 87189 in vbox

Timestamp:

Jan 6, 2021 1:19:56 PM (4 years ago)

Author:

vboxsync

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

142120

Message:

iprt/asm.h: More fun. bugref:9898

File:

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

trunk/include/iprt/asm.h

@@ -4419 +4419 @@
 
 # elif defined(RT_ARCH_ARM64) || defined(RT_ARCH_ARM32)
-    RTASM_ARM_LOAD_MODIFY_STORE_RET_NEW_32(ASMAtomicUoOr32, pu32, NO_BARRIER,
+    RTASM_ARM_LOAD_MODIFY_STORE_RET_NEW_32(ASMAtomicUoOrU32, pu32, NO_BARRIER,
                                            "orr %w[uNew], %w[uNew], %w[uVal]\n\t",
                                            "orr %[uNew], %[uNew], %[uVal]\n\t",
@@ -5186 +5186 @@
  *          traps accessing the last bits in the bitmap.
  */
-#if RT_INLINE_ASM_EXTERNAL && !RT_INLINE_ASM_USES_INTRIN
+#if RT_INLINE_ASM_EXTERNAL_TMP_ARM && !RT_INLINE_ASM_USES_INTRIN
 RT_ASM_DECL_PRAGMA_WATCOM(void) ASMBitSet(volatile void RT_FAR *pvBitmap, int32_t iBit) RT_NOTHROW_PROTO;
 #else
@@ -5194 +5194 @@
     _bittestandset((long RT_FAR *)pvBitmap, iBit);
 
-# elif RT_INLINE_ASM_GNU_STYLE
+# elif defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86)
+#  if RT_INLINE_ASM_GNU_STYLE
     __asm__ __volatile__("btsl %1, %0"
                          : "=m" (*(volatile long RT_FAR *)pvBitmap)
@@ -5201 +5202 @@
                          : "memory"
                          , "cc");
-# else
+#  else
     __asm
     {
-#  ifdef RT_ARCH_AMD64
+#   ifdef RT_ARCH_AMD64
         mov     rax, [pvBitmap]
         mov     edx, [iBit]
         bts     [rax], edx
-#  else
+#   else
         mov     eax, [pvBitmap]
         mov     edx, [iBit]
         bts     [eax], edx
-#  endif
+#   endif
     }
+#  endif
+
+# else
+    int32_t offBitmap = iBit / 32;
+    AssertStmt(!((uintptr_t)pvBitmap & 3), offBitmap += (uintptr_t)pvBitmap & 3; iBit += ((uintptr_t)pvBitmap & 3) * 8);
+    ASMAtomicUoOrU32(&((uint32_t volatile *)pvBitmap)[offBitmap], RT_BIT_32(iBit & 31));
 # endif
 }
@@ -5228 +5235 @@
  * @remarks x86: Requires a 386 or later.
  */
-#if RT_INLINE_ASM_EXTERNAL && !RT_INLINE_ASM_USES_INTRIN
+#if RT_INLINE_ASM_EXTERNAL_TMP_ARM && !RT_INLINE_ASM_USES_INTRIN
 RT_ASM_DECL_PRAGMA_WATCOM(void) ASMAtomicBitSet(volatile void RT_FAR *pvBitmap, int32_t iBit) RT_NOTHROW_PROTO;
 #else
@@ -5236 +5243 @@
 # if RT_INLINE_ASM_USES_INTRIN
     _interlockedbittestandset((long RT_FAR *)pvBitmap, iBit);
-# elif RT_INLINE_ASM_GNU_STYLE
+# elif defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86)
+#  if RT_INLINE_ASM_GNU_STYLE
     __asm__ __volatile__("lock; btsl %1, %0"
                          : "=m" (*(volatile long *)pvBitmap)
@@ -5243 +5251 @@
                          : "memory"
                          , "cc");
-# else
+#  else
     __asm
     {
-#  ifdef RT_ARCH_AMD64
+#   ifdef RT_ARCH_AMD64
         mov     rax, [pvBitmap]
         mov     edx, [iBit]
         lock bts [rax], edx
-#  else
+#   else
         mov     eax, [pvBitmap]
         mov     edx, [iBit]
         lock bts [eax], edx
-#  endif
+#   endif
     }
+#  endif
+
+# else
+    ASMAtomicOrU32(&((uint32_t volatile *)pvBitmap)[iBit / 32], RT_BIT_32(iBit & 31));
 # endif
 }
@@ -5271 +5283 @@
  *          traps accessing the last bits in the bitmap.
  */
-#if RT_INLINE_ASM_EXTERNAL && !RT_INLINE_ASM_USES_INTRIN
+#if RT_INLINE_ASM_EXTERNAL_TMP_ARM && !RT_INLINE_ASM_USES_INTRIN
 RT_ASM_DECL_PRAGMA_WATCOM(void) ASMBitClear(volatile void RT_FAR *pvBitmap, int32_t iBit) RT_NOTHROW_PROTO;
 #else
@@ -5279 +5291 @@
     _bittestandreset((long RT_FAR *)pvBitmap, iBit);
 
-# elif RT_INLINE_ASM_GNU_STYLE
+# elif defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86)
+#  if RT_INLINE_ASM_GNU_STYLE
     __asm__ __volatile__("btrl %1, %0"
                          : "=m" (*(volatile long RT_FAR *)pvBitmap)
@@ -5286 +5299 @@
                          : "memory"
                          , "cc");
-# else
+#  else
     __asm
     {
-#  ifdef RT_ARCH_AMD64
+#   ifdef RT_ARCH_AMD64
         mov     rax, [pvBitmap]
         mov     edx, [iBit]
         btr     [rax], edx
-#  else
+#   else
         mov     eax, [pvBitmap]
         mov     edx, [iBit]
         btr     [eax], edx
-#  endif
+#   endif
     }
+#  endif
+
+# else
+    int32_t offBitmap = iBit / 32;
+    AssertStmt(!((uintptr_t)pvBitmap & 3), offBitmap += (uintptr_t)pvBitmap & 3; iBit += ((uintptr_t)pvBitmap & 3) * 8);
+    ASMAtomicUoAndU32(&((uint32_t volatile *)pvBitmap)[offBitmap], ~RT_BIT_32(iBit & 31));
 # endif
 }
@@ -5314 +5333 @@
  * @remarks x86: Requires a 386 or later.
  */
-#if RT_INLINE_ASM_EXTERNAL
+#if RT_INLINE_ASM_EXTERNAL_TMP_ARM
 RT_ASM_DECL_PRAGMA_WATCOM(void) ASMAtomicBitClear(volatile void RT_FAR *pvBitmap, int32_t iBit) RT_NOTHROW_PROTO;
 #else
@@ -5320 +5339 @@
 {
     AssertMsg(!((uintptr_t)pvBitmap & 3), ("address %p not 32-bit aligned", pvBitmap));
-# if RT_INLINE_ASM_GNU_STYLE
+# if defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86)
+#  if RT_INLINE_ASM_GNU_STYLE
     __asm__ __volatile__("lock; btrl %1, %0"
                          : "=m" (*(volatile long RT_FAR *)pvBitmap)
@@ -5327 +5347 @@
                          : "memory"
                          , "cc");
-# else
+#  else
     __asm
     {
-#  ifdef RT_ARCH_AMD64
+#   ifdef RT_ARCH_AMD64
         mov     rax, [pvBitmap]
         mov     edx, [iBit]
         lock btr [rax], edx
-#  else
+#   else
         mov     eax, [pvBitmap]
         mov     edx, [iBit]
         lock btr [eax], edx
-#  endif
+#   endif
     }
+#  endif
+# else
+    ASMAtomicAndU32(&((uint32_t volatile *)pvBitmap)[iBit / 32], ~RT_BIT_32(iBit & 31));
 # endif
 }