X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fx86-64%2Ftype-vops.lisp;h=d8e49e0ac7dbd5b00ecc6fe0e778bc4f28cde6af;hb=c4b30c86e3dd1d1cc70c572a6cfffe8b84e9c34a;hp=450a6a49419de491f4986ef475941ccbe198a2e4;hpb=c6538bf61955a67d0145aa3e6c937f6dd03f9e51;p=sbcl.git

diff --git a/src/compiler/x86-64/type-vops.lisp b/src/compiler/x86-64/type-vops.lisp
index 450a6a4..d8e49e0 100644
--- a/src/compiler/x86-64/type-vops.lisp
+++ b/src/compiler/x86-64/type-vops.lisp
@@ -20,7 +20,7 @@
                (make-byte-tn value))
               ((sc-is value control-stack)
                (make-ea :byte :base rbp-tn
-                        :disp (- (* (1+ (tn-offset value)) n-word-bytes))))
+                        :disp (frame-byte-offset (tn-offset value))))
               (t
                value))
         sb!vm::fixnum-tag-mask))
@@ -184,10 +184,27 @@
   (:arg-types unsigned-num)
   (:translate fixnump)
   (:temporary (:sc unsigned-reg) tmp)
+  (:info)
+  (:conditional :z)
   (:generator 5
     (inst mov tmp value)
-    (inst shr tmp n-positive-fixnum-bits)
-    (inst jmp (if not-p :nz :z) target)))
+    (inst shr tmp n-positive-fixnum-bits)))
+
+(define-vop (fixnump/signed-byte-64 type-predicate)
+  (:args (value :scs (signed-reg)))
+  (:info)
+  (:conditional :z)
+  (:arg-types signed-num)
+  (:translate fixnump)
+  (:generator 5
+    ;; Hackers Delight, p. 53: signed
+    ;;    a <= x <= a + 2^n - 1
+    ;; is equivalent to unsigned
+    ;;    ((x-a) >> n) = 0
+    (inst mov rax-tn #.(- sb!xc:most-negative-fixnum))
+    (inst add rax-tn value)
+    (inst shr rax-tn #.(integer-length (- sb!xc:most-positive-fixnum
+                                          sb!xc:most-negative-fixnum)))))
 
 ;;; A (SIGNED-BYTE 64) can be represented with either fixnum or a bignum with
 ;;; exactly one digit.