Changeset 7090 in vbox

Timestamp:

Feb 22, 2008 9:12:31 AM (17 years ago)

Author:

vboxsync

Message:

fixed ASMAtomicXchgU64 for 32-bit hosts

File:

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

trunk/include/iprt/asm.h

@@ -2028 +2028 @@
     uint32_t u32 = (uint32_t)u64;
     __asm__ __volatile__(/*"xchgl %%esi, %5\n\t"*/
-                         "xchgl %%ebx, %3\n\t"
+                         "xchgl %%ebx, %2\n\t"
                          "1:\n\t"
-                         "lock; cmpxchg8b (%5)\n\t"
+                         "movl  (%4), %%eax\n\t"
+                         "movl 4(%4), %%edx\n\t"
+                         "lock; cmpxchg8b (%4)\n\t"
                          "jnz 1b\n\t"
-                         "xchgl %%ebx, %3\n\t"
+                         "xchgl %%ebx, %2\n\t"
                          /*"xchgl %%esi, %5\n\t"*/
                          : "=A" (u64),
                            "=m" (*pu64)
-                         : "0" (*pu64),
-                           "m" ( u32 ),
+                         : "m" ( u32 ),
                            "c" ( (uint32_t)(u64 >> 32) ),
                            "S" (pu64) );
 #   else /* !PIC */
     __asm__ __volatile__("1:\n\t"
-                         "lock; cmpxchg8b %1\n\t"
+                         "movl  (%4), %%eax\n\t"
+                         "movl 4(%4), %%edx\n\t"
+                         "lock; cmpxchg8b (%4)\n\t"
                          "jnz 1b\n\t"
                          : "=A" (u64),
                            "=m" (*pu64)
-                         : "0" (*pu64),
-                           "b" ( (uint32_t)u64 ),
-                           "c" ( (uint32_t)(u64 >> 32) ));
+                         : "b" ( (uint32_t)u64 ),
+                           "c" ( (uint32_t)(u64 >> 32) ),
+                           "S" (pu64) );
 #   endif
 #  else
@@ -2056 +2059 @@
         mov     ecx, dword ptr [u64 + 4]
         mov     edi, pu64
+    retry:
         mov     eax, dword ptr [edi]
         mov     edx, dword ptr [edi + 4]
-    retry:
         lock cmpxchg8b [edi]
         jnz retry
@@ -2126 +2129 @@
         {
             mov     rbx, dword ptr [u128]
-            mov     rcx, dword ptr [u128 + 4]
+            mov     rcx, dword ptr [u128 + 8]
             mov     rdi, pu128
+        retry:
             mov     rax, dword ptr [rdi]
-            mov     rdx, dword ptr [rdi + 4]
-        retry:
+            mov     rdx, dword ptr [rdi + 8]
             lock cmpxchg16b [rdi]
             jnz retry
             mov     dword ptr [u128], rax
-            mov     dword ptr [u128 + 4], rdx
+            mov     dword ptr [u128 + 8], rdx
         }
 #  endif