Changeset 10943 in vbox

Timestamp:

Jul 29, 2008 5:24:13 PM (17 years ago)

Author:

vboxsync

Message:

iprt/asm.h: Fixed missing ASMAtomicReadU64 and ASMAtomicUoReadU64 on 64-bit windows.

File:

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

trunk/include/iprt/asm.h

@@ -3317 +3317 @@
  * @remark  This will fault if the memory is read-only!
  */
-#if RT_INLINE_ASM_EXTERNAL
+#if RT_INLINE_ASM_EXTERNAL && !defined(RT_ARCH_AMD64)
 DECLASM(uint64_t) ASMAtomicReadU64(volatile uint64_t *pu64);
 #else
@@ -3324 +3324 @@
     uint64_t u64;
 # ifdef RT_ARCH_AMD64
-#  if RT_INLINE_ASM_GNU_STYLE
     Assert(!((uintptr_t)pu64 & 7));
+/*#  if RT_INLINE_ASM_GNU_STYLE
     __asm__ __volatile__(  "mfence\n\t"
                            "movq %1, %0\n\t"
@@ -3338 +3338 @@
         mov     [u64], rax
     }
-#  endif
+#  endif*/
+    ASMMemoryFence();
+    u64 = *pu64;
 # else /* !RT_ARCH_AMD64 */
 #  if RT_INLINE_ASM_GNU_STYLE
@@ -3389 +3391 @@
  * @remark  This will fault if the memory is read-only!
  */
-#if RT_INLINE_ASM_EXTERNAL
+#if RT_INLINE_ASM_EXTERNAL && !defined(RT_ARCH_AMD64)
 DECLASM(uint64_t) ASMAtomicUoReadU64(volatile uint64_t *pu64);
 #else
@@ -3396 +3398 @@
     uint64_t u64;
 # ifdef RT_ARCH_AMD64
-#  if RT_INLINE_ASM_GNU_STYLE
+    Assert(!((uintptr_t)pu64 & 7));
+/*#  if RT_INLINE_ASM_GNU_STYLE
     Assert(!((uintptr_t)pu64 & 7));
     __asm__ __volatile__("movq %1, %0\n\t"
@@ -3408 +3411 @@
         mov     [u64], rax
     }
-#  endif
+#  endif */
+    u64 = *pu64;
 # else /* !RT_ARCH_AMD64 */
 #  if RT_INLINE_ASM_GNU_STYLE