X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Falpha%2Ftype-vops.lisp;h=010d84e26fb0296d491939fc3b9b0b8a17657f44;hb=104ee7ee303efa16e415f5e75df635ac54dba733;hp=c4395eac39a0925c6571b6d8f08b313cb3d71548;hpb=dfa55a883f94470267b626dae77ce7e7dfac3df6;p=sbcl.git

diff --git a/src/compiler/alpha/type-vops.lisp b/src/compiler/alpha/type-vops.lisp
index c4395ea..010d84e 100644
--- a/src/compiler/alpha/type-vops.lisp
+++ b/src/compiler/alpha/type-vops.lisp
@@ -10,27 +10,25 @@
 ;;;; files for more information.
 
 (in-package "SB!VM")
-
-
 
-;;;; Test generation utilities.
+;;;; test generation utilities
 
 (eval-when (:compile-toplevel :execute)
 
-(defparameter immediate-types
-  (list unbound-marker-type base-char-type))
+(defparameter *immediate-types*
+  (list unbound-marker-widetag base-char-widetag))
 
-(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))
+(defparameter *fun-header-widetags*
+  (list funcallable-instance-header-widetag
+	simple-fun-header-widetag
+	closure-fun-header-widetag
+	closure-header-widetag))
 
 (defun canonicalize-headers (headers)
   (collect ((results))
     (let ((start nil)
 	  (prev nil)
-	  (delta (- other-immediate-1-type other-immediate-0-type)))
+	  (delta (- other-immediate-1-lowtag other-immediate-0-lowtag)))
       (flet ((emit-test ()
 	       (results (if (= start prev)
 			    start
@@ -53,47 +51,47 @@
 (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)
+	 (fixnump (and (member even-fixnum-lowtag type-codes)
+		       (member odd-fixnum-lowtag 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)
+	 (immediates (intersection extended *immediate-types* :test #'eql))
+	 (headers (set-difference extended *immediate-types* :test #'eql))
+	 (function-p (if (intersection headers *fun-header-widetags*)
+			 (if (subsetp headers *fun-header-widetags*)
 			     t
-			     (error "Can't test for mix of function subtypes ~
+			     (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."))
+      (error "must supply at least one type for test-type"))
     (cond
      (fixnump
-      (when (remove-if #'(lambda (x)
-			   (or (= x even-fixnum-type)
-			       (= x odd-fixnum-type)))
+      (when (remove-if (lambda (x)
+			 (or (= x even-fixnum-lowtag)
+			     (= x odd-fixnum-lowtag)))
 		       lowtags)
-	(error "Can't mix fixnum testing with other lowtags."))
+	(error "can't mix fixnum testing with other lowtags"))
       (when function-p
-	(error "Can't mix fixnum testing with function subtype testing."))
+	(error "can't mix fixnum testing with function subtype testing"))
       (when immediates
-	(error "Can't mix fixnum testing with other 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."))
+	(error "can't mix testing of immediates with testing of headers"))
       (when lowtags
-	(error "Can't mix testing of immediates with testing of 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."))
+	(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."))
+	(error "can't test multiple lowtags at the same time"))
       (if headers
 	  `(%test-lowtag-and-headers
 	    ,value ,temp ,target ,not-p ,(car lowtags)
@@ -103,7 +101,7 @@
       `(%test-headers ,value ,temp ,target ,not-p ,function-p
 		      ',(canonicalize-headers headers)))
      (t
-      (error "Nothing to test?"))))))
+      (error "nothing to test?"))))))
 
 (defun %test-fixnum (value temp target not-p)
   (assemble ()
@@ -143,7 +141,7 @@
 
 (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)))
+  (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
@@ -171,7 +169,7 @@
 	       (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))
@@ -233,139 +231,139 @@
 
 
 (def-type-vops fixnump check-fixnum fixnum object-not-fixnum-error
-  even-fixnum-type odd-fixnum-type)
+  even-fixnum-lowtag odd-fixnum-lowtag)
 
-(def-type-vops functionp check-function function
-  object-not-function-error function-pointer-type)
+(def-type-vops functionp check-fun function
+  object-not-fun-error fun-pointer-lowtag)
 
 (def-type-vops listp check-list list object-not-list-error
-  list-pointer-type)
+  list-pointer-lowtag)
 
 (def-type-vops %instancep check-instance instance object-not-instance-error
-  instance-pointer-type)
+  instance-pointer-lowtag)
 
 (def-type-vops bignump check-bignum bignum
-  object-not-bignum-error bignum-type)
+  object-not-bignum-error bignum-widetag)
 
 (def-type-vops ratiop check-ratio ratio
-  object-not-ratio-error ratio-type)
+  object-not-ratio-error ratio-widetag)
 
 (def-type-vops complexp check-complex complex
-  object-not-complex-error complex-type
-  complex-single-float-type complex-double-float-type)
+  object-not-complex-error complex-widetag
+  complex-single-float-widetag complex-double-float-widetag)
 
 (def-type-vops complex-rational-p check-complex-rational nil
-  object-not-complex-rational-error complex-type)
+  object-not-complex-rational-error complex-widetag)
 
 (def-type-vops complex-float-p check-complex-float nil
   object-not-complex-float-error
-  complex-single-float-type complex-double-float-type)
+  complex-single-float-widetag complex-double-float-widetag)
 
 (def-type-vops complex-single-float-p check-complex-single-float
   complex-single-float object-not-complex-single-float-error
-  complex-single-float-type)
+  complex-single-float-widetag)
 
 (def-type-vops complex-double-float-p check-complex-double-float
   complex-double-float object-not-complex-double-float-error
-  complex-double-float-type)
+  complex-double-float-widetag)
 
 (def-type-vops single-float-p check-single-float single-float
-  object-not-single-float-error single-float-type)
+  object-not-single-float-error single-float-widetag)
 
 (def-type-vops double-float-p check-double-float double-float
-  object-not-double-float-error double-float-type)
+  object-not-double-float-error double-float-widetag)
 
 (def-type-vops simple-string-p check-simple-string simple-string
-  object-not-simple-string-error simple-string-type)
+  object-not-simple-string-error simple-string-widetag)
 
 (def-type-vops simple-bit-vector-p check-simple-bit-vector simple-bit-vector
-  object-not-simple-bit-vector-error simple-bit-vector-type)
+  object-not-simple-bit-vector-error simple-bit-vector-widetag)
 
 (def-type-vops simple-vector-p check-simple-vector simple-vector
-  object-not-simple-vector-error simple-vector-type)
+  object-not-simple-vector-error simple-vector-widetag)
 
 (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)
+  simple-array-unsigned-byte-2-widetag)
 
 (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)
+  simple-array-unsigned-byte-4-widetag)
 
 (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)
+  simple-array-unsigned-byte-8-widetag)
 
 (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)
+  simple-array-unsigned-byte-16-widetag)
 
 (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)
+  simple-array-unsigned-byte-32-widetag)
 
 (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)
+  simple-array-signed-byte-8-widetag)
 
 (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)
+  simple-array-signed-byte-16-widetag)
 
 (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)
+  simple-array-signed-byte-30-widetag)
 
 (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)
+  simple-array-signed-byte-32-widetag)
 
 (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)
+  simple-array-single-float-widetag)
 
 (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)
+  simple-array-double-float-widetag)
 
 (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)
+  simple-array-complex-single-float-widetag)
 
 (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)
+  simple-array-complex-double-float-widetag)
 
 (def-type-vops base-char-p check-base-char base-char
-  object-not-base-char-error base-char-type)
+  object-not-base-char-error base-char-widetag)
 
 (def-type-vops system-area-pointer-p check-system-area-pointer
-  system-area-pointer object-not-sap-error sap-type)
+  system-area-pointer object-not-sap-error sap-widetag)
 
 (def-type-vops weak-pointer-p check-weak-pointer weak-pointer
-  object-not-weak-pointer-error weak-pointer-type)
+  object-not-weak-pointer-error weak-pointer-widetag)
 
 
 ;;; XXX
@@ -375,89 +373,85 @@
 |#
 
 (def-type-vops code-component-p nil nil nil
-  code-header-type)
+  code-header-widetag)
 
 (def-type-vops lra-p nil nil nil
-  #-gengc return-pc-header-type #+gengc 0)
+  #-gengc return-pc-header-widetag #+gengc 0)
 
 (def-type-vops fdefn-p nil nil nil
-  fdefn-type)
+  fdefn-widetag)
 
 (def-type-vops funcallable-instance-p nil nil nil
-  funcallable-instance-header-type)
+  funcallable-instance-header-widetag)
 
 (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)
+  simple-array-widetag complex-string-widetag complex-bit-vector-widetag
+  complex-vector-widetag complex-array-widetag)
 
 (def-type-vops stringp check-string nil object-not-string-error
-  simple-string-type complex-string-type)
+  simple-string-widetag complex-string-widetag)
 
 ;;; 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)
+  object-not-complex-vector-error complex-vector-widetag)
 
 (def-type-vops bit-vector-p check-bit-vector nil object-not-bit-vector-error
-  simple-bit-vector-type complex-bit-vector-type)
+  simple-bit-vector-widetag complex-bit-vector-widetag)
 
 (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)
+  simple-string-widetag simple-bit-vector-widetag simple-vector-widetag
+  simple-array-unsigned-byte-2-widetag simple-array-unsigned-byte-4-widetag
+  simple-array-unsigned-byte-8-widetag simple-array-unsigned-byte-16-widetag
+  simple-array-unsigned-byte-32-widetag
+  simple-array-signed-byte-8-widetag simple-array-signed-byte-16-widetag
+  simple-array-signed-byte-30-widetag simple-array-signed-byte-32-widetag
+  simple-array-single-float-widetag simple-array-double-float-widetag
+  simple-array-complex-single-float-widetag
+  simple-array-complex-double-float-widetag
+  complex-string-widetag complex-bit-vector-widetag complex-vector-widetag)
 
 (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)
+  simple-array-widetag simple-string-widetag simple-bit-vector-widetag
+  simple-vector-widetag simple-array-unsigned-byte-2-widetag
+  simple-array-unsigned-byte-4-widetag simple-array-unsigned-byte-8-widetag
+  simple-array-unsigned-byte-16-widetag simple-array-unsigned-byte-32-widetag
+  simple-array-signed-byte-8-widetag simple-array-signed-byte-16-widetag
+  simple-array-signed-byte-30-widetag simple-array-signed-byte-32-widetag
+  simple-array-single-float-widetag simple-array-double-float-widetag
+  simple-array-complex-single-float-widetag
+  simple-array-complex-double-float-widetag)
 
 (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)
+  simple-array-widetag simple-string-widetag simple-bit-vector-widetag
+  simple-vector-widetag simple-array-unsigned-byte-2-widetag
+  simple-array-unsigned-byte-4-widetag simple-array-unsigned-byte-8-widetag
+  simple-array-unsigned-byte-16-widetag simple-array-unsigned-byte-32-widetag
+  simple-array-signed-byte-8-widetag simple-array-signed-byte-16-widetag
+  simple-array-signed-byte-30-widetag simple-array-signed-byte-32-widetag
+  simple-array-single-float-widetag simple-array-double-float-widetag
+  simple-array-complex-single-float-widetag
+  simple-array-complex-double-float-widetag
+  complex-string-widetag complex-bit-vector-widetag complex-vector-widetag
+  complex-array-widetag)
 
 (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)
+  even-fixnum-lowtag odd-fixnum-lowtag bignum-widetag ratio-widetag
+  single-float-widetag double-float-widetag complex-widetag
+  complex-single-float-widetag complex-double-float-widetag)
 
 (def-type-vops rationalp check-rational nil object-not-rational-error
-  even-fixnum-type odd-fixnum-type ratio-type bignum-type)
+  even-fixnum-lowtag odd-fixnum-lowtag ratio-widetag bignum-widetag)
 
 (def-type-vops integerp check-integer nil object-not-integer-error
-  even-fixnum-type odd-fixnum-type bignum-type)
+  even-fixnum-lowtag odd-fixnum-lowtag bignum-widetag)
 
 (def-type-vops floatp check-float nil object-not-float-error
-  single-float-type double-float-type)
+  single-float-widetag double-float-widetag)
 
 (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)
+  even-fixnum-lowtag odd-fixnum-lowtag ratio-widetag bignum-widetag
+  single-float-widetag double-float-widetag)
 
 
 ;;;; Other integer ranges.
@@ -476,10 +470,10 @@
       (inst and value 3 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)
-      (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)
@@ -519,29 +513,29 @@
 
       ;; 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.
-      (loadw temp value 0 other-pointer-type)
+      (loadw temp value 0 other-pointer-lowtag)
       ;; 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 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.
-      (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.
-      (loadw temp value bignum-digits-offset other-pointer-type)
+      (loadw temp value bignum-digits-offset other-pointer-lowtag)
 
       ;; positive implies (unsigned-byte 32).
       FIXNUM
@@ -579,7 +573,7 @@
   (: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 temp target not-p symbol-header-widetag)
     DROP-THRU))
 
 (define-vop (check-symbol check-type)
@@ -588,7 +582,7 @@
     (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 temp error t symbol-header-widetag))
     DROP-THRU
     (move value result)))
   
@@ -598,7 +592,7 @@
   (: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 temp target not-p list-pointer-lowtag)
     DROP-THRU))
 
 (define-vop (check-cons check-type)
@@ -607,7 +601,7 @@
     (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 temp error t list-pointer-lowtag))
     (move value result)))
 
 ) ; MACROLET
\ No newline at end of file