Menu
▾
▴
[Sbcl-commits] CVS: sbcl/src/compiler/alpha macros.lisp,1.13,1.14 type-vops.lisp,1.10,1.11
|
From: Christophe R. <cr...@us...> - 2002-09-13 16:28:44
|
Update of /cvsroot/sbcl/sbcl/src/compiler/alpha
In directory usw-pr-cvs1:/tmp/cvs-serv7585/src/compiler/alpha
Modified Files:
macros.lisp type-vops.lisp
Log Message:
0.7.7.23:
Merge backend_cleanup_1_branch
... I hope this is right :-)
Index: macros.lisp
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/compiler/alpha/macros.lisp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- macros.lisp 25 Jun 2002 15:57:14 -0000 1.13
+++ macros.lisp 13 Sep 2002 16:28:41 -0000 1.14
@@ -176,22 +176,6 @@
,@body))
;;;; error code
-
-(defvar *adjustable-vectors* nil)
-
-(defmacro with-adjustable-vector ((var) &rest body)
- `(let ((,var (or (pop *adjustable-vectors*)
- (make-array 16
- :element-type '(unsigned-byte 8)
- :fill-pointer 0
- :adjustable t))))
- (declare (type (vector (unsigned-byte 8) 16) ,var))
- (setf (fill-pointer ,var) 0)
- (unwind-protect
- (progn
- ,@body)
- (push ,var *adjustable-vectors*))))
-
(eval-when (:compile-toplevel :load-toplevel :execute)
(defun emit-error-break (vop kind code values)
(let ((vector (gensym)))
Index: type-vops.lisp
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/compiler/alpha/type-vops.lisp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- type-vops.lisp 18 Mar 2002 19:08:01 -0000 1.10
+++ type-vops.lisp 13 Sep 2002 16:28:41 -0000 1.11
@@ -11,113 +11,22 @@
(in-package "SB!VM")
-;;;; test generation utilities
-
-(eval-when (:compile-toplevel :execute)
-
-(defparameter *immediate-types*
- (list unbound-marker-widetag base-char-widetag))
-
-(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-lowtag other-immediate-0-lowtag)))
- (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-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 *fun-header-widetags*)
- (if (subsetp headers *fun-header-widetags*)
- t
- (error "can't test for mix of function subtypes ~
- and normal header types."))
- nil)))
- (unless type-codes
- (error "must supply at least one type for test-type"))
- (cond
- (fixnump
- (when (remove-if (lambda (x)
- (or (= x even-fixnum-lowtag)
- (= x odd-fixnum-lowtag)))
- 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 ()
(inst and value 3 temp)
(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 ()
(inst and value 3 temp)
(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)
@@ -125,7 +34,7 @@
(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)
@@ -133,14 +42,15 @@
(inst bne temp target)
(inst beq temp target))))
-(defun %test-lowtag-and-headers (value temp target not-p lowtag
- function-p headers)
+(defun %test-lowtag-and-headers (value target not-p lowtag
+ function-p headers &key temp)
(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)))
+ (%test-lowtag value (if not-p drop-through target) nil lowtag :temp temp)
+ (%test-headers value target not-p function-p headers
+ :drop-through drop-through :temp temp)))
-(defun %test-headers (value temp target not-p function-p headers
- &optional (drop-through (gen-label)))
+(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)
@@ -150,7 +60,7 @@
(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)))
@@ -181,8 +91,6 @@
(inst ble temp target))
(inst ble temp when-true))))))))
(emit-label drop-through)))))
-
-
;;;; Type checking and testing:
@@ -200,266 +108,35 @@
(: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)))
-)
-(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
- (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)))
- (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))))))
-
-
-(def-type-vops fixnump check-fixnum fixnum object-not-fixnum-error
- even-fixnum-lowtag odd-fixnum-lowtag)
-
-(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-lowtag)
-
-(def-type-vops %instancep check-instance instance object-not-instance-error
- instance-pointer-lowtag)
-
-(def-type-vops bignump check-bignum bignum
- object-not-bignum-error bignum-widetag)
-
-(def-type-vops ratiop check-ratio ratio
- object-not-ratio-error ratio-widetag)
-
-(def-type-vops complexp check-complex complex
- 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-widetag)
-
-(def-type-vops complex-float-p check-complex-float nil
- object-not-complex-float-error
- 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-widetag)
-
-(def-type-vops complex-double-float-p check-complex-double-float
- complex-double-float object-not-complex-double-float-error
- complex-double-float-widetag)
-
-(def-type-vops single-float-p check-single-float single-float
- 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-widetag)
-
-(def-type-vops simple-string-p check-simple-string simple-string
- 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-widetag)
-
-(def-type-vops simple-vector-p check-simple-vector simple-vector
- 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-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-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-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-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-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-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-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-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-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-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-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-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-widetag)
-
-(def-type-vops base-char-p check-base-char base-char
- 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-widetag)
-
-(def-type-vops weak-pointer-p check-weak-pointer weak-pointer
- object-not-weak-pointer-error weak-pointer-widetag)
-
-
-;;; 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-widetag)
-
-(def-type-vops lra-p nil nil nil
- #!-gengc return-pc-header-widetag #!+gengc 0)
-
-(def-type-vops fdefn-p nil nil nil
- fdefn-widetag)
-
-(def-type-vops funcallable-instance-p nil nil nil
- funcallable-instance-header-widetag)
-
-(def-type-vops array-header-p nil nil nil
- 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-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-widetag)
-
-(def-type-vops bit-vector-p check-bit-vector nil object-not-bit-vector-error
- simple-bit-vector-widetag complex-bit-vector-widetag)
-
-(def-type-vops vectorp check-vector nil object-not-vector-error
- 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-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-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-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-lowtag odd-fixnum-lowtag ratio-widetag bignum-widetag)
-
-(def-type-vops integerp check-integer nil object-not-integer-error
- even-fixnum-lowtag odd-fixnum-lowtag bignum-widetag)
-
-(def-type-vops floatp check-float nil object-not-float-error
- single-float-widetag double-float-widetag)
-
-(def-type-vops realp check-real nil object-not-real-error
- even-fixnum-lowtag odd-fixnum-lowtag ratio-widetag bignum-widetag
- single-float-widetag double-float-widetag)
-
;;;; 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)
@@ -573,7 +250,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-widetag)
+ (test-type value target not-p (symbol-header-widetag) :temp temp)
DROP-THRU))
(define-vop (check-symbol check-type)
@@ -582,7 +259,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-widetag))
+ (test-type value error t (symbol-header-widetag) :temp temp))
DROP-THRU
(move value result)))
@@ -592,7 +269,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-lowtag)
+ (test-type value target not-p (list-pointer-lowtag) :temp temp)
DROP-THRU))
(define-vop (check-cons check-type)
@@ -601,7 +278,6 @@
(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-lowtag))
+ (test-type value error t (list-pointer-lowtag) :temp temp))
(move value result)))
-) ; MACROLET
\ No newline at end of file
|