0.8.14.13: Step SBCL, step!

[sbcl.git] / src / compiler / alpha / type-vops.lisp

diff --git a/src/compiler/alpha/type-vops.lisp b/src/compiler/alpha/type-vops.lisp
index c4395ea..d8723b1 100644 (file)
--- a/src/compiler/alpha/type-vops.lisp
+++ b/src/compiler/alpha/type-vops.lisp
@@ -10,116 +10,23 @@
 ;;;; files for more information.
 
 (in-package "SB!VM")
 ;;;; files for more information.
 
 (in-package "SB!VM")

-
-

 \f
 \f

-;;;; Test generation utilities.
-
-(eval-when (:compile-toplevel :execute)
-
-(defparameter immediate-types
-  (list unbound-marker-type base-char-type))
-
-(defparameter function-header-types
-  (list funcallable-instance-header-type
-       byte-code-function-type byte-code-closure-type
-       function-header-type closure-function-header-type
-       closure-header-type))
-
-(defun canonicalize-headers (headers)
-  (collect ((results))
-    (let ((start nil)
-         (prev nil)
-         (delta (- other-immediate-1-type other-immediate-0-type)))
-      (flet ((emit-test ()
-              (results (if (= start prev)
-                           start
-                           (cons start prev)))))
-       (dolist (header (sort headers #'<))
-         (cond ((null start)
-                (setf start header)
-                (setf prev header))
-               ((= header (+ prev delta))
-                (setf prev header))
-               (t
-                (emit-test)
-                (setf start header)
-                (setf prev header))))
-       (emit-test)))
-    (results)))
-
-) ; EVAL-WHEN
-
-(macrolet ((test-type (value temp target not-p &rest type-codes)
-  ;; Determine what interesting combinations we need to test for.
-  (let* ((type-codes (mapcar #'eval type-codes))
-        (fixnump (and (member even-fixnum-type type-codes)
-                      (member odd-fixnum-type type-codes)
-                      t))
-        (lowtags (remove lowtag-limit type-codes :test #'<))
-        (extended (remove lowtag-limit type-codes :test #'>))
-        (immediates (intersection extended immediate-types :test #'eql))
-        (headers (set-difference extended immediate-types :test #'eql))
-        (function-p (if (intersection headers function-header-types)
-                        (if (subsetp headers function-header-types)
-                            t
-                            (error "Can't test for mix of function subtypes ~
-                                    and normal header types."))
-                        nil)))
-    (unless type-codes
-      (error "Must supply at least on type for test-type."))
-    (cond
-     (fixnump
-      (when (remove-if #'(lambda (x)
-                          (or (= x even-fixnum-type)
-                              (= x odd-fixnum-type)))
-                      lowtags)
-       (error "Can't mix fixnum testing with other lowtags."))
-      (when function-p
-       (error "Can't mix fixnum testing with function subtype testing."))
-      (when immediates
-       (error "Can't mix fixnum testing with other immediates."))
-      (if headers
-         `(%test-fixnum-and-headers ,value ,temp ,target ,not-p
-                                    ',(canonicalize-headers headers))
-         `(%test-fixnum ,value ,temp ,target ,not-p)))
-     (immediates
-      (when headers
-       (error "Can't mix testing of immediates with testing of headers."))
-      (when lowtags
-       (error "Can't mix testing of immediates with testing of lowtags."))
-      (when (cdr immediates)
-       (error "Can't test multiple immediates at the same time."))
-      `(%test-immediate ,value ,temp ,target ,not-p ,(car immediates)))
-     (lowtags
-      (when (cdr lowtags)
-       (error "Can't test multiple lowtags at the same time."))
-      (if headers
-         `(%test-lowtag-and-headers
-           ,value ,temp ,target ,not-p ,(car lowtags)
-           ,function-p ',(canonicalize-headers headers))
-         `(%test-lowtag ,value ,temp ,target ,not-p ,(car lowtags))))
-     (headers
-      `(%test-headers ,value ,temp ,target ,not-p ,function-p
-                     ',(canonicalize-headers headers)))
-     (t
-      (error "Nothing to test?"))))))
-
-(defun %test-fixnum (value temp target not-p)
+(defun %test-fixnum (value target not-p &key temp)

   (assemble ()
   (assemble ()

-    (inst and value 3 temp)
+    (inst and value fixnum-tag-mask temp)

     (if not-p
         (inst bne temp target)
         (inst beq temp target))))
 
     (if not-p
         (inst bne temp target)
         (inst beq temp target))))
 

-(defun %test-fixnum-and-headers (value temp target not-p headers)
+(defun %test-fixnum-and-headers (value target not-p headers &key temp)

   (let ((drop-through (gen-label)))
     (assemble ()
   (let ((drop-through (gen-label)))
     (assemble ()

-      (inst and value 3 temp)
+      (inst and value fixnum-tag-mask temp)

       (inst beq temp (if not-p drop-through target)))
       (inst beq temp (if not-p drop-through target)))

-    (%test-headers value temp target not-p nil headers drop-through)))
+    (%test-headers value target not-p nil headers
+                  :drop-through drop-through :temp temp)))

 
 

-(defun %test-immediate (value temp target not-p immediate)
+(defun %test-immediate (value target not-p immediate &key temp)

   (assemble ()
     (inst and value 255 temp)
     (inst xor temp immediate temp)
   (assemble ()
     (inst and value 255 temp)
     (inst xor temp immediate temp)

@@ -127,7 +34,7 @@
        (inst bne temp target)
        (inst beq temp target))))
 
        (inst bne temp target)
        (inst beq temp target))))
 

-(defun %test-lowtag (value temp target not-p lowtag)
+(defun %test-lowtag (value target not-p lowtag &key temp)

   (assemble ()
     (inst and value lowtag-mask temp)
     (inst xor temp lowtag temp)
   (assemble ()
     (inst and value lowtag-mask temp)
     (inst xor temp lowtag temp)

@@ -135,15 +42,9 @@
        (inst bne temp target)
        (inst beq temp target))))
 
        (inst bne temp target)
        (inst beq temp target))))
 

-(defun %test-lowtag-and-headers (value temp target not-p lowtag
-                                      function-p headers)
-  (let ((drop-through (gen-label)))
-    (%test-lowtag value temp (if not-p drop-through target) nil lowtag)
-    (%test-headers value temp target not-p function-p headers drop-through)))
-
-(defun %test-headers (value temp target not-p function-p headers
-                           &optional (drop-through (gen-label)))
-  (let ((lowtag (if function-p function-pointer-type other-pointer-type)))
+(defun %test-headers (value target not-p function-p headers
+                     &key (drop-through (gen-label)) temp)
+  (let ((lowtag (if function-p fun-pointer-lowtag other-pointer-lowtag)))

     (multiple-value-bind
        (when-true when-false)
        ;; WHEN-TRUE and WHEN-FALSE are the labels to branch to when
     (multiple-value-bind
        (when-true when-false)
        ;; WHEN-TRUE and WHEN-FALSE are the labels to branch to when

@@ -152,7 +53,7 @@
            (values drop-through target)
            (values target drop-through))
       (assemble ()
            (values drop-through target)
            (values target drop-through))
       (assemble ()

-       (%test-lowtag value temp when-false t lowtag)
+       (%test-lowtag value when-false t lowtag :temp temp)

        (load-type temp value (- lowtag))
        (let ((delta 0))
          (do ((remaining headers (cdr remaining)))
        (load-type temp value (- lowtag))
        (let ((delta 0))
          (do ((remaining headers (cdr remaining)))

@@ -171,7 +72,7 @@
               (t
                (let ((start (car header))
                      (end (cdr header)))
               (t
                (let ((start (car header))
                      (end (cdr header)))

-                 (unless (= start bignum-type)
+                 (unless (= start bignum-widetag)

                    (inst subq temp (- start delta) temp)
                    (setf delta start)
                    (inst blt temp when-false))
                    (inst subq temp (- start delta) temp)
                    (setf delta start)
                    (inst blt temp when-false))

@@ -183,8 +84,6 @@
                          (inst ble temp target))
                      (inst ble temp when-true))))))))
        (emit-label drop-through)))))
                          (inst ble temp target))
                      (inst ble temp when-true))))))))
        (emit-label drop-through)))))

-
-

 \f
 ;;;; Type checking and testing:
 
 \f
 ;;;; Type checking and testing:
 

@@ -202,270 +101,35 @@
   (:info target not-p)
   (:policy :fast-safe))
 
   (:info target not-p)
   (:policy :fast-safe))
 

-
-(eval-when  (:compile-toplevel :execute)
-
-

 (defun cost-to-test-types (type-codes)
   (+ (* 2 (length type-codes))
      (if (> (apply #'max type-codes) lowtag-limit) 7 2)))
 (defun cost-to-test-types (type-codes)
   (+ (* 2 (length type-codes))
      (if (> (apply #'max type-codes) lowtag-limit) 7 2)))

-)

 
 

-(defmacro def-type-vops (pred-name check-name ptype error-code
-                                  &rest type-codes)
-  (let ((cost #+sb-xc-host (cost-to-test-types (mapcar #'eval type-codes))
-              #-sb-xc-host 10))
+(defmacro !define-type-vops (pred-name check-name ptype error-code
+                            (&rest type-codes)
+                            &key &allow-other-keys)
+  (let ((cost (cost-to-test-types (mapcar #'eval type-codes))))

     `(progn
        ,@(when pred-name
           `((define-vop (,pred-name type-predicate)
               (:translate ,pred-name)
               (:generator ,cost
     `(progn
        ,@(when pred-name
           `((define-vop (,pred-name type-predicate)
               (:translate ,pred-name)
               (:generator ,cost

-                (test-type value temp target not-p ,@type-codes)))))
+                (test-type value target not-p (,@type-codes) :temp temp)))))

        ,@(when check-name
           `((define-vop (,check-name check-type)
               (:generator ,cost
                 (let ((err-lab
                        (generate-error-code vop ,error-code value)))
        ,@(when check-name
           `((define-vop (,check-name check-type)
               (:generator ,cost
                 (let ((err-lab
                        (generate-error-code vop ,error-code value)))

-                  (test-type value temp err-lab t ,@type-codes)
+                  (test-type value err-lab t (,@type-codes) :temp temp)

                   (move value result))))))
        ,@(when ptype
           `((primitive-type-vop ,check-name (:check) ,ptype))))))
                   (move value result))))))
        ,@(when ptype
           `((primitive-type-vop ,check-name (:check) ,ptype))))))

-
-
-(def-type-vops fixnump check-fixnum fixnum object-not-fixnum-error
-  even-fixnum-type odd-fixnum-type)
-
-(def-type-vops functionp check-function function
-  object-not-function-error function-pointer-type)
-
-(def-type-vops listp check-list list object-not-list-error
-  list-pointer-type)
-
-(def-type-vops %instancep check-instance instance object-not-instance-error
-  instance-pointer-type)
-
-(def-type-vops bignump check-bignum bignum
-  object-not-bignum-error bignum-type)
-
-(def-type-vops ratiop check-ratio ratio
-  object-not-ratio-error ratio-type)
-
-(def-type-vops complexp check-complex complex
-  object-not-complex-error complex-type
-  complex-single-float-type complex-double-float-type)
-
-(def-type-vops complex-rational-p check-complex-rational nil
-  object-not-complex-rational-error complex-type)
-
-(def-type-vops complex-float-p check-complex-float nil
-  object-not-complex-float-error
-  complex-single-float-type complex-double-float-type)
-
-(def-type-vops complex-single-float-p check-complex-single-float
-  complex-single-float object-not-complex-single-float-error
-  complex-single-float-type)
-
-(def-type-vops complex-double-float-p check-complex-double-float
-  complex-double-float object-not-complex-double-float-error
-  complex-double-float-type)
-
-(def-type-vops single-float-p check-single-float single-float
-  object-not-single-float-error single-float-type)
-
-(def-type-vops double-float-p check-double-float double-float
-  object-not-double-float-error double-float-type)
-
-(def-type-vops simple-string-p check-simple-string simple-string
-  object-not-simple-string-error simple-string-type)
-
-(def-type-vops simple-bit-vector-p check-simple-bit-vector simple-bit-vector
-  object-not-simple-bit-vector-error simple-bit-vector-type)
-
-(def-type-vops simple-vector-p check-simple-vector simple-vector
-  object-not-simple-vector-error simple-vector-type)
-
-(def-type-vops simple-array-unsigned-byte-2-p
-  check-simple-array-unsigned-byte-2
-  simple-array-unsigned-byte-2
-  object-not-simple-array-unsigned-byte-2-error
-  simple-array-unsigned-byte-2-type)
-
-(def-type-vops simple-array-unsigned-byte-4-p
-  check-simple-array-unsigned-byte-4
-  simple-array-unsigned-byte-4
-  object-not-simple-array-unsigned-byte-4-error
-  simple-array-unsigned-byte-4-type)
-
-(def-type-vops simple-array-unsigned-byte-8-p
-  check-simple-array-unsigned-byte-8
-  simple-array-unsigned-byte-8
-  object-not-simple-array-unsigned-byte-8-error
-  simple-array-unsigned-byte-8-type)
-
-(def-type-vops simple-array-unsigned-byte-16-p
-  check-simple-array-unsigned-byte-16
-  simple-array-unsigned-byte-16
-  object-not-simple-array-unsigned-byte-16-error
-  simple-array-unsigned-byte-16-type)
-
-(def-type-vops simple-array-unsigned-byte-32-p
-  check-simple-array-unsigned-byte-32
-  simple-array-unsigned-byte-32
-  object-not-simple-array-unsigned-byte-32-error
-  simple-array-unsigned-byte-32-type)
-
-(def-type-vops simple-array-signed-byte-8-p
-  check-simple-array-signed-byte-8
-  simple-array-signed-byte-8
-  object-not-simple-array-signed-byte-8-error
-  simple-array-signed-byte-8-type)
-
-(def-type-vops simple-array-signed-byte-16-p
-  check-simple-array-signed-byte-16
-  simple-array-signed-byte-16
-  object-not-simple-array-signed-byte-16-error
-  simple-array-signed-byte-16-type)
-
-(def-type-vops simple-array-signed-byte-30-p
-  check-simple-array-signed-byte-30
-  simple-array-signed-byte-30
-  object-not-simple-array-signed-byte-30-error
-  simple-array-signed-byte-30-type)
-
-(def-type-vops simple-array-signed-byte-32-p
-  check-simple-array-signed-byte-32
-  simple-array-signed-byte-32
-  object-not-simple-array-signed-byte-32-error
-  simple-array-signed-byte-32-type)
-
-(def-type-vops simple-array-single-float-p check-simple-array-single-float
-  simple-array-single-float object-not-simple-array-single-float-error
-  simple-array-single-float-type)
-
-(def-type-vops simple-array-double-float-p check-simple-array-double-float
-  simple-array-double-float object-not-simple-array-double-float-error
-  simple-array-double-float-type)
-
-(def-type-vops simple-array-complex-single-float-p
-  check-simple-array-complex-single-float
-  simple-array-complex-single-float
-  object-not-simple-array-complex-single-float-error
-  simple-array-complex-single-float-type)
-
-(def-type-vops simple-array-complex-double-float-p
-  check-simple-array-complex-double-float
-  simple-array-complex-double-float
-  object-not-simple-array-complex-double-float-error
-  simple-array-complex-double-float-type)
-
-(def-type-vops base-char-p check-base-char base-char
-  object-not-base-char-error base-char-type)
-
-(def-type-vops system-area-pointer-p check-system-area-pointer
-  system-area-pointer object-not-sap-error sap-type)
-
-(def-type-vops weak-pointer-p check-weak-pointer weak-pointer
-  object-not-weak-pointer-error weak-pointer-type)
-
-
-;;; XXX
-#|
-(def-type-vops scavenger-hook-p nil nil nil
-  #-gengc 0 #+gengc scavenger-hook-type)
-|#
-
-(def-type-vops code-component-p nil nil nil
-  code-header-type)
-
-(def-type-vops lra-p nil nil nil
-  #-gengc return-pc-header-type #+gengc 0)
-
-(def-type-vops fdefn-p nil nil nil
-  fdefn-type)
-
-(def-type-vops funcallable-instance-p nil nil nil
-  funcallable-instance-header-type)
-
-(def-type-vops array-header-p nil nil nil
-  simple-array-type complex-string-type complex-bit-vector-type
-  complex-vector-type complex-array-type)
-
-(def-type-vops nil check-function-or-symbol nil
-  object-not-function-or-symbol-error
-  function-pointer-type symbol-header-type)
-
-(def-type-vops stringp check-string nil object-not-string-error
-  simple-string-type complex-string-type)
-
-;;; XXX surely just sticking this in here is not all that's required
-;;; to create the vop?  But I can't find out any other info
-(def-type-vops complex-vector-p check-complex-vector nil
-  object-not-complex-vector-error complex-vector-type)
-
-(def-type-vops bit-vector-p check-bit-vector nil object-not-bit-vector-error
-  simple-bit-vector-type complex-bit-vector-type)
-
-(def-type-vops vectorp check-vector nil object-not-vector-error
-  simple-string-type simple-bit-vector-type simple-vector-type
-  simple-array-unsigned-byte-2-type simple-array-unsigned-byte-4-type
-  simple-array-unsigned-byte-8-type simple-array-unsigned-byte-16-type
-  simple-array-unsigned-byte-32-type
-  simple-array-signed-byte-8-type simple-array-signed-byte-16-type
-  simple-array-signed-byte-30-type simple-array-signed-byte-32-type
-  simple-array-single-float-type simple-array-double-float-type
-  simple-array-complex-single-float-type
-  simple-array-complex-double-float-type
-  complex-string-type complex-bit-vector-type complex-vector-type)
-
-(def-type-vops simple-array-p check-simple-array nil object-not-simple-array-error
-  simple-array-type simple-string-type simple-bit-vector-type
-  simple-vector-type simple-array-unsigned-byte-2-type
-  simple-array-unsigned-byte-4-type simple-array-unsigned-byte-8-type
-  simple-array-unsigned-byte-16-type simple-array-unsigned-byte-32-type
-  simple-array-signed-byte-8-type simple-array-signed-byte-16-type
-  simple-array-signed-byte-30-type simple-array-signed-byte-32-type
-  simple-array-single-float-type simple-array-double-float-type
-  simple-array-complex-single-float-type
-  simple-array-complex-double-float-type)
-
-(def-type-vops arrayp check-array nil object-not-array-error
-  simple-array-type simple-string-type simple-bit-vector-type
-  simple-vector-type simple-array-unsigned-byte-2-type
-  simple-array-unsigned-byte-4-type simple-array-unsigned-byte-8-type
-  simple-array-unsigned-byte-16-type simple-array-unsigned-byte-32-type
-  simple-array-signed-byte-8-type simple-array-signed-byte-16-type
-  simple-array-signed-byte-30-type simple-array-signed-byte-32-type
-  simple-array-single-float-type simple-array-double-float-type
-  simple-array-complex-single-float-type
-  simple-array-complex-double-float-type
-  complex-string-type complex-bit-vector-type complex-vector-type
-  complex-array-type)
-
-(def-type-vops numberp check-number nil object-not-number-error
-  even-fixnum-type odd-fixnum-type bignum-type ratio-type
-  single-float-type double-float-type complex-type
-  complex-single-float-type complex-double-float-type)
-
-(def-type-vops rationalp check-rational nil object-not-rational-error
-  even-fixnum-type odd-fixnum-type ratio-type bignum-type)
-
-(def-type-vops integerp check-integer nil object-not-integer-error
-  even-fixnum-type odd-fixnum-type bignum-type)
-
-(def-type-vops floatp check-float nil object-not-float-error
-  single-float-type double-float-type)
-
-(def-type-vops realp check-real nil object-not-real-error
-  even-fixnum-type odd-fixnum-type ratio-type bignum-type
-  single-float-type double-float-type)
-

 \f
 ;;;; Other integer ranges.
 
 ;;; A (signed-byte 32) can be represented with either fixnum or a bignum with
 ;;; exactly one digit.
 
 \f
 ;;;; Other integer ranges.
 
 ;;; A (signed-byte 32) can be represented with either fixnum or a bignum with
 ;;; exactly one digit.
 

-

 (defun signed-byte-32-test (value temp temp1 not-p target not-target)
   (multiple-value-bind
       (yep nope)
 (defun signed-byte-32-test (value temp temp1 not-p target not-target)
   (multiple-value-bind
       (yep nope)

@@ -473,13 +137,13 @@
          (values not-target target)
          (values target not-target))
     (assemble ()
          (values not-target target)
          (values target not-target))
     (assemble ()

-      (inst and value 3 temp)
+      (inst and value fixnum-tag-mask temp)

       (inst beq temp yep)
       (inst and value lowtag-mask temp)
       (inst beq temp yep)
       (inst and value lowtag-mask temp)

-      (inst xor temp other-pointer-type temp)
+      (inst xor temp other-pointer-lowtag temp)

       (inst bne temp nope)
       (inst bne temp nope)

-      (loadw temp value 0 other-pointer-type)
-      (inst li (+ (ash 1 type-bits) bignum-type) temp1)
+      (loadw temp value 0 other-pointer-lowtag)
+      (inst li (+ (ash 1 n-widetag-bits) bignum-widetag) temp1)

       (inst xor temp temp1 temp)
       (if not-p
          (inst bne temp target)
       (inst xor temp temp1 temp)
       (if not-p
          (inst bne temp target)

@@ -513,35 +177,35 @@
                           (values target not-target))
     (assemble ()
       ;; Is it a fixnum?
                           (values target not-target))
     (assemble ()
       ;; Is it a fixnum?

-      (inst and value 3 temp1)
+      (inst and value fixnum-tag-mask temp1)

       (inst move value temp)
       (inst beq temp1 fixnum)
 
       ;; If not, is it an other pointer?
       (inst and value lowtag-mask temp)
       (inst move value temp)
       (inst beq temp1 fixnum)
 
       ;; If not, is it an other pointer?
       (inst and value lowtag-mask temp)

-      (inst xor temp other-pointer-type temp)
+      (inst xor temp other-pointer-lowtag temp)

       (inst bne temp nope)
       ;; Get the header.
       (inst bne temp nope)
       ;; Get the header.

-      (loadw temp value 0 other-pointer-type)
+      (loadw temp value 0 other-pointer-lowtag)

       ;; Is it one?
       ;; Is it one?

-      (inst li  (+ (ash 1 type-bits) bignum-type) temp1)
+      (inst li  (+ (ash 1 n-widetag-bits) bignum-widetag) temp1)

       (inst xor temp temp1 temp)
       (inst beq temp single-word)
       ;; If it's other than two, we can't be an (unsigned-byte 32)
       (inst xor temp temp1 temp)
       (inst beq temp single-word)
       ;; If it's other than two, we can't be an (unsigned-byte 32)

-      (inst li (logxor (+ (ash 1 type-bits) bignum-type)
-                      (+ (ash 2 type-bits) bignum-type))
+      (inst li (logxor (+ (ash 1 n-widetag-bits) bignum-widetag)
+                      (+ (ash 2 n-widetag-bits) bignum-widetag))

            temp1)
       (inst xor temp temp1 temp)
       (inst bne temp nope)
       ;; Get the second digit.
            temp1)
       (inst xor temp temp1 temp)
       (inst bne temp nope)
       ;; Get the second digit.

-      (loadw temp value (1+ bignum-digits-offset) other-pointer-type)
+      (loadw temp value (1+ bignum-digits-offset) other-pointer-lowtag)

       ;; All zeros, its an (unsigned-byte 32).
       (inst beq temp yep)
       (inst br zero-tn nope)
        
       SINGLE-WORD
       ;; Get the single digit.
       ;; All zeros, its an (unsigned-byte 32).
       (inst beq temp yep)
       (inst br zero-tn nope)
        
       SINGLE-WORD
       ;; Get the single digit.

-      (loadw temp value bignum-digits-offset other-pointer-type)
+      (loadw temp value bignum-digits-offset other-pointer-lowtag)

 
       ;; positive implies (unsigned-byte 32).
       FIXNUM
 
       ;; positive implies (unsigned-byte 32).
       FIXNUM

@@ -579,7 +243,7 @@
   (:generator 12
     (inst cmpeq value null-tn temp)
     (inst bne temp (if not-p drop-thru target))
   (:generator 12
     (inst cmpeq value null-tn temp)
     (inst bne temp (if not-p drop-thru target))

-    (test-type value temp target not-p symbol-header-type)
+    (test-type value target not-p (symbol-header-widetag) :temp temp)

     DROP-THRU))
 
 (define-vop (check-symbol check-type)
     DROP-THRU))
 
 (define-vop (check-symbol check-type)

@@ -588,7 +252,7 @@
     (inst cmpeq value null-tn temp)
     (inst bne temp drop-thru)
     (let ((error (generate-error-code vop object-not-symbol-error value)))
     (inst cmpeq value null-tn temp)
     (inst bne temp drop-thru)
     (let ((error (generate-error-code vop object-not-symbol-error value)))

-      (test-type value temp error t symbol-header-type))
+      (test-type value error t (symbol-header-widetag) :temp temp))

     DROP-THRU
     (move value result)))
   
     DROP-THRU
     (move value result)))
   

@@ -598,7 +262,7 @@
   (:generator 8
     (inst cmpeq value null-tn temp)
     (inst bne temp (if not-p target drop-thru))
   (:generator 8
     (inst cmpeq value null-tn temp)
     (inst bne temp (if not-p target drop-thru))

-    (test-type value temp target not-p list-pointer-type)
+    (test-type value target not-p (list-pointer-lowtag) :temp temp)

     DROP-THRU))
 
 (define-vop (check-cons check-type)
     DROP-THRU))
 
 (define-vop (check-cons check-type)

@@ -607,7 +271,6 @@
     (let ((error (generate-error-code vop object-not-cons-error value)))
       (inst cmpeq value null-tn temp)
       (inst bne temp error)
     (let ((error (generate-error-code vop object-not-cons-error value)))
       (inst cmpeq value null-tn temp)
       (inst bne temp error)

-      (test-type value temp error t list-pointer-type))
+      (test-type value error t (list-pointer-lowtag) :temp temp))

     (move value result)))
 
     (move value result)))
 

-) ; MACROLET
\ No newline at end of file