X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fx86-64%2Ftype-vops.lisp;h=58e88548cd9ce0005c38555acc4905c636b2f785;hb=03833f4cc9997c5df2c2ceeeb45936c91cabb747;hp=d8e49e0ac7dbd5b00ecc6fe0e778bc4f28cde6af;hpb=cd23187a89f532f7b57e88b5392a7905e6ae3276;p=sbcl.git

diff --git a/src/compiler/x86-64/type-vops.lisp b/src/compiler/x86-64/type-vops.lisp
index d8e49e0..58e8854 100644
--- a/src/compiler/x86-64/type-vops.lisp
+++ b/src/compiler/x86-64/type-vops.lisp
@@ -83,13 +83,14 @@
 (defun %test-headers (value target not-p function-p headers
                             &optional (drop-through (gen-label)))
   (let ((lowtag (if function-p fun-pointer-lowtag other-pointer-lowtag)))
-    (multiple-value-bind (equal less-or-equal when-true when-false)
-        ;; EQUAL and LESS-OR-EQUAL are the conditions for branching to TARGET.
-        ;; WHEN-TRUE and WHEN-FALSE are the labels to branch to when we know
-        ;; it's true and when we know it's false respectively.
+    (multiple-value-bind (equal less-or-equal greater-or-equal when-true when-false)
+        ;; EQUAL, LESS-OR-EQUAL, and GREATER-OR-EQUAL are the conditions
+        ;; for branching to TARGET.  WHEN-TRUE and WHEN-FALSE are the
+        ;; labels to branch to when we know it's true and when we know
+        ;; it's false respectively.
         (if not-p
-            (values :ne :a drop-through target)
-            (values :e :na target drop-through))
+            (values :ne :a :b drop-through target)
+            (values :e :na :nb target drop-through))
       (%test-lowtag value when-false t lowtag)
       (inst mov al-tn (make-ea :byte :base value :disp (- lowtag)))
       (do ((remaining headers (cdr remaining)))
@@ -105,13 +106,28 @@
            (t
              (let ((start (car header))
                    (end (cdr header)))
-               (unless (= start bignum-widetag)
-                 (inst cmp al-tn start)
-                 (inst jmp :b when-false)) ; was :l
-               (inst cmp al-tn end)
-               (if last
-                   (inst jmp less-or-equal target)
-                   (inst jmp :be when-true))))))) ; was :le
+               (cond
+                 ((= start bignum-widetag)
+                  (inst cmp al-tn end)
+                  (if last
+                      (inst jmp less-or-equal target)
+                      (inst jmp :be when-true)))
+                 ((= end complex-array-widetag)
+                  (inst cmp al-tn start)
+                  (if last
+                      (inst jmp greater-or-equal target)
+                      (inst jmp :b when-false)))
+                 ((not last)
+                  (inst cmp al-tn start)
+                  (inst jmp :b when-false)
+                  (inst cmp al-tn end)
+                  (if last
+                      (inst jmp less-or-equal target)
+                      (inst jmp :be when-true)))
+                 (t
+                  (inst sub al-tn start)
+                  (inst cmp al-tn (- end start))
+                  (inst jmp less-or-equal target))))))))
       (emit-label drop-through))))
 
 
@@ -222,8 +238,8 @@
       (inst and al-tn lowtag-mask)
       (inst cmp al-tn other-pointer-lowtag)
       (inst jmp :ne nope)
-      (loadw rax-tn value 0 other-pointer-lowtag)
-      (inst cmp rax-tn (+ (ash 1 n-widetag-bits) bignum-widetag))
+      (inst cmp (make-ea-for-object-slot value 0 other-pointer-lowtag)
+            (+ (ash 1 n-widetag-bits) bignum-widetag))
       (inst jmp (if not-p :ne :e) target))
     NOT-TARGET))
 
@@ -238,8 +254,8 @@
       (inst and al-tn lowtag-mask)
       (inst cmp al-tn other-pointer-lowtag)
       (inst jmp :ne nope)
-      (loadw rax-tn value 0 other-pointer-lowtag)
-      (inst cmp rax-tn (+ (ash 1 n-widetag-bits) bignum-widetag))
+      (inst cmp (make-ea-for-object-slot value 0 other-pointer-lowtag)
+            (+ (ash 1 n-widetag-bits) bignum-widetag))
       (inst jmp :ne nope))
     YEP
     (move result value)))