xnu-1699.22.73.tar.gz

[apple/xnu.git] / libkern / x86_64 / OSAtomic.s

diff --git a/libkern/x86_64/OSAtomic.s b/libkern/x86_64/OSAtomic.s
index b3b26164abadc95a503cadd63e3cd927729a717d..30713ef3db6859f34b36454e0042804c0e38d95b 100644 (file)
--- a/libkern/x86_64/OSAtomic.s
+++ b/libkern/x86_64/OSAtomic.s
@@ -31,13 +31,11 @@
 #;***************************************************************************
 
        .globl _OSCompareAndSwap
-
-// TODO FIXME!!
 _OSCompareAndSwap: #;oldValue, newValue, ptr
        movl             %edi, %eax
        lock
-       cmpxchgl        %esi, 0(%rdx)   #; CAS (eax is an implicit operand)
-       sete            %al                             #; did CAS succeed? (TZ=1)
+       cmpxchgl        %esi, (%rdx)    #; CAS (eax is an implicit operand)
+       sete            %al                     #; did CAS succeed? (TZ=1)
        movzbq          %al, %rax               #; clear out the high bytes
        ret
 
@@ -50,10 +48,10 @@ _OSCompareAndSwap: #;oldValue, newValue, ptr
 
 _OSCompareAndSwap64:
 _OSCompareAndSwapPtr: #;oldValue, newValue, ptr
-       movq             %rdi, %rax
+       movq            %rdi, %rax
        lock
-       cmpxchgq        %rsi, 0(%rdx)   #; CAS (eax is an implicit operand)
-       sete            %al                             #; did CAS succeed? (TZ=1)
+       cmpxchgq        %rsi, (%rdx)    #; CAS (rax is an implicit operand)
+       sete            %al                     #; did CAS succeed? (TZ=1)
        movzbq          %al, %rax               #; clear out the high bytes
        ret
 
@@ -66,7 +64,7 @@ _OSCompareAndSwapPtr: #;oldValue, newValue, ptr
 _OSAddAtomic64:
 _OSAddAtomicLong:
        lock
-       xaddq   %rdi, 0(%rsi)           #; Atomic exchange and add
+       xaddq   %rdi, (%rsi)            #; Atomic exchange and add
        movq    %rdi, %rax;
        ret
 
@@ -78,6 +76,6 @@ _OSAddAtomicLong:
        .globl  _OSAddAtomic
 _OSAddAtomic:
        lock
-       xaddl   %edi, 0(%rsi)           #; Atomic exchange and add
+       xaddl   %edi, (%rsi)            #; Atomic exchange and add
        movl    %edi, %eax;
        ret