X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fassembly%2Fx86-64%2Falloc.lisp;h=e40d38051015cf6e785fed992c5da07e238b89ee;hb=5728601f88c400d2992b6b8c70d8971d07de9029;hp=7fd309b3c9a88cb277b87f2030a5deb1d244f557;hpb=55f790051c0ebd727777da5f8b6541d87dd49b38;p=sbcl.git

diff --git a/src/assembly/x86-64/alloc.lisp b/src/assembly/x86-64/alloc.lisp
index 7fd309b..e40d380 100644
--- a/src/assembly/x86-64/alloc.lisp
+++ b/src/assembly/x86-64/alloc.lisp
@@ -103,19 +103,19 @@
                ;; 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 ((not-error (gen-label))
                      (error (generate-error-code nil 'tls-exhausted-error)))
-                 (inst cmp target (fixnumize tls-size))
+                 (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.