X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fassembly%2Fx86-64%2Falloc.lisp;h=e40d38051015cf6e785fed992c5da07e238b89ee;hb=37b1ed8e9b6faa84832b8251998b5d0eb1f6b307;hp=68a8ce33c31441fcbfe17c44a37f1937e81f76bb;hpb=c6538bf61955a67d0145aa3e6c937f6dd03f9e51;p=sbcl.git

diff --git a/src/assembly/x86-64/alloc.lisp b/src/assembly/x86-64/alloc.lisp
index 68a8ce3..e40d380 100644
--- a/src/assembly/x86-64/alloc.lisp
+++ b/src/assembly/x86-64/alloc.lisp
@@ -92,27 +92,33 @@
                (inst push other)
                (inst push target)
                (emit-label get-tls-index-lock)
-               (inst mov target 1)
-               (zeroize rax-tn)
-               (inst lock)
-               (inst cmpxchg (make-ea-for-symbol-value *tls-index-lock*) target)
-               (inst jmp :ne get-tls-index-lock)
+               (let ((not-rax ,(if (eql 'rax reg) 'other 'target)))
+                 (inst mov not-rax 1)
+                 (zeroize rax-tn)
+                 (inst cmpxchg (make-ea-for-symbol-value *tls-index-lock*)
+                       not-rax :lock)
+                 (inst jmp :ne get-tls-index-lock))
                ;; The symbol is now in OTHER.
                (inst pop other)
                ;; Now with the lock held, see if the symbol's tls index has been
                ;; set in the meantime.
                (loadw target other symbol-tls-index-slot other-pointer-lowtag)
-               (inst or target target)
+               (inst test target target)
                (inst jmp :ne release-tls-index-lock)
                ;; Allocate a new tls-index.
                (load-symbol-value target *free-tls-index*)
-               (let ((error (generate-error-code nil 'tls-exhausted-error)))
-                 (inst cmp target (fixnumize tls-size))
-                 (inst jmp :ge error))
+               (let ((not-error (gen-label))
+                     (error (generate-error-code nil 'tls-exhausted-error)))
+                 (inst cmp target (ash tls-size word-shift))
+                 (inst jmp :l not-error)
+                 (%clear-pseudo-atomic)
+                 (inst jmp error)
+                 (emit-label not-error))
                (inst add (make-ea-for-symbol-value *free-tls-index*)
-                     (fixnumize 1))
+                     n-word-bytes)
                (storew target other symbol-tls-index-slot other-pointer-lowtag)
                (emit-label release-tls-index-lock)
+               ;; No need for barriers on x86/x86-64 on unlock.
                (store-symbol-value 0 *tls-index-lock*)
                ;; Restore OTHER.
                (inst pop other))