0.8.21.17:
[sbcl.git] / src / compiler / ppc / type-vops.lisp
index ccb2f07..9a82f52 100644 (file)
 \f
 (defun %test-fixnum (value target not-p &key temp)
   (assemble ()
-    ;; FIXME: again, this 3 should be FIXNUM-MASK
-    (inst andi. temp value 3)
+    (inst andi. temp value fixnum-tag-mask)
     (inst b? (if not-p :ne :eq) target)))
 
 (defun %test-fixnum-and-headers (value target not-p headers &key temp)
   (let ((drop-through (gen-label)))
     (assemble ()
-      (inst andi. temp value 3)
+      (inst andi. temp value fixnum-tag-mask)
       (inst beq (if not-p drop-through target)))
     (%test-headers value target not-p nil headers
                   :drop-through drop-through :temp temp)))
     (inst cmpwi temp lowtag)
     (inst b? (if not-p :ne :eq) target)))
 
-(defun %test-lowtag-and-headers (value target not-p lowtag function-p headers
-                                 &key temp)
-  (let ((drop-through (gen-label)))
-    (%test-lowtag value (if not-p drop-through target) not-p lowtag
-                  :temp temp)
-    (%test-headers value target not-p function-p headers
-                   :temp temp :drop-through drop-through)))
-
 (defun %test-headers (value target not-p function-p headers
                      &key temp (drop-through (gen-label)))
     (let ((lowtag (if function-p fun-pointer-lowtag other-pointer-lowtag)))
                 (last (null (cdr remaining))))
             (cond
               ((atom header)
-              (inst cmpwi temp header)
-               (if last
-                   (inst b? (if not-p :ne :eq) target)
-                   (inst beq when-true)))
+              (cond
+                ((and (not last) (null (cddr remaining))
+                      (atom (cadr remaining))
+                      (= (logcount (logxor header (cadr remaining))) 1))
+                 (inst andi. temp temp (ldb (byte 8 0) (logeqv header (cadr remaining))))
+                 (inst cmpwi temp (ldb (byte 8 0) (logand header (cadr remaining))))
+                 (inst b? (if not-p :ne :eq) target)
+                 (return))
+                (t
+                 (inst cmpwi temp header)
+                 (if last
+                     (inst b? (if not-p :ne :eq) target)
+                     (inst beq when-true)))))
               (t
                (let ((start (car header))
                      (end (cdr header)))
-                 (unless (= start bignum-widetag)
-                   (inst cmpwi temp start)
-                   (inst blt when-false))
-                 (inst cmpwi temp end)
-                 (if last
-                     (inst b? (if not-p :gt :le) target)
-                     (inst ble when-true)))))))
+                (cond
+                  ((and last (not (= start bignum-widetag))
+                        (= (+ start 4) end) 
+                        (= (logcount (logxor start end)) 1))
+                   (inst andi. temp temp (ldb (byte 8 0) (logeqv start end)))
+                   (inst cmpwi temp (ldb (byte 8 0) (logand start end)))
+                   (inst b? (if not-p :ne :eq) target))
+                  ((and (not last) (null (cddr remaining))
+                        (= (+ start 4) end) (= (logcount (logxor start end)) 1)
+                        (listp (cadr remaining))
+                        (= (+ (caadr remaining) 4) (cdadr remaining))
+                        (= (logcount (logxor (caadr remaining) (cdadr remaining))) 1)
+                        (= (logcount (logxor (caadr remaining) start)) 1))
+                   (inst andi. temp temp (ldb (byte 8 0) (logeqv start (cdadr remaining))))
+                   (inst cmpwi temp (ldb (byte 8 0) (logand start (cdadr remaining))))
+                   (inst b? (if not-p :ne :eq) target)
+                   (return))
+                  (t
+                   (unless (= start bignum-widetag)
+                     (inst cmpwi temp start)
+                     (if (= end complex-array-widetag)
+                         (progn
+                           (aver last)
+                           (inst b? (if not-p :lt :ge) target))
+                         (inst blt when-false)))
+                   (unless (= end complex-array-widetag)
+                     (inst cmpwi temp end)
+                     (if last
+                         (inst b? (if not-p :gt :le) target)
+                         (inst ble when-true))))))))))
         (emit-label drop-through)))))
 
 ;;; Simple type checking and testing:
                 ,@(if mask
                       `((inst andi. temp value ,mask)
                         (inst twi 0 value (error-number-or-lose ',error-code))
-                        (inst twi :ne temp ,@(if ;; KLUDGE: At
-                                                 ;; present, MASK is
-                                                 ;; 3 or LOWTAG-MASK
-                                                 (eql mask 3)
-                                                 ;; KLUDGE
-                                                 `(0)
-                                                 type-codes))
+                        (inst twi :ne temp ,@(ecase mask
+                                               ((fixnum-tag-mask) `(0))
+                                               ((lowtag-mask) type-codes)))
                         (move result value))
                       `((let ((err-lab
                                (generate-error-code vop ,error-code value)))
                           (move result value))))))))
        ,@(when ptype
           `((primitive-type-vop ,check-name (:check) ,ptype))))))
-
-#|
-  (def-type-vops fixnump nil nil object-not-fixnum-error
-                sb!vm:even-fixnum-lowtag sb!vm:odd-fixnum-lowtag)
-  (define-vop (check-fixnum check-type)
-      (:generator 3
-                 (inst andi. temp value 3)
-                 (inst twi 0 value (error-number-or-lose 'object-not-fixnum-error))
-                 (inst twi :ne temp 0)
-                 (move result value)))
-  (primitive-type-vop check-fixnum (:check) fixnum)
-  (def-type-vops functionp nil nil
-                object-not-fun-error sb!vm:fun-pointer-lowtag)
-  
-  (define-vop (check-fun check-type)
-      (:generator 3
-                 (inst andi. temp value 7)
-                 (inst twi 0 value (error-number-or-lose 'object-not-fun-error))
-                 (inst twi :ne temp sb!vm:fun-pointer-lowtag)
-                 (move result value)))
-  (primitive-type-vop check-fun (:check) function)
-  
-  (def-type-vops listp nil nil
-                object-not-list-error sb!vm:list-pointer-lowtag)
-  (define-vop (check-list check-type)
-      (:generator 3
-                 (inst andi. temp value 7)
-                 (inst twi 0 value (error-number-or-lose 'object-not-list-error))
-                 (inst twi :ne temp sb!vm:list-pointer-lowtag)
-                 (move result value)))
-  (primitive-type-vop check-list (:check) list)
-  
-  (def-type-vops %instancep nil nil
-                object-not-instance-error sb!vm:instance-pointer-lowtag)
-  (define-vop (check-instance check-type)
-      (:generator 3
-                 (inst andi. temp value 7)
-                 (inst twi 0 value (error-number-or-lose 'object-not-instance-error))
-                 (inst twi :ne temp sb!vm:instance-pointer-lowtag)
-                 (move result value)))
-  (primitive-type-vop check-instance (:check) instance)
-  
-  
-  (def-type-vops bignump check-bignum bignum
-                object-not-bignum-error sb!vm:bignum-widetag)
-  
-  (def-type-vops ratiop check-ratio ratio
-                object-not-ratio-error sb!vm:ratio-widetag)
-  
-  (def-type-vops complexp check-complex complex
-                object-not-complex-error sb!vm: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 sb!vm:single-float-widetag)
-
-(def-type-vops double-float-p check-double-float double-float
-  object-not-double-float-error sb!vm:double-float-widetag)
-
-(def-type-vops simple-string-p check-simple-string simple-string
-  object-not-simple-string-error sb!vm: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 sb!vm: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
-  sb!vm: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
-  sb!vm: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
-  sb!vm: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
-  sb!vm: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
-  sb!vm: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
-  sb!vm: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
-  sb!vm: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 sb!vm:base-char-widetag)
-
-(def-type-vops system-area-pointer-p check-system-area-pointer
-  system-area-pointer object-not-sap-error sb!vm:sap-widetag)
-
-(def-type-vops weak-pointer-p check-weak-pointer weak-pointer
-  object-not-weak-pointer-error sb!vm:weak-pointer-widetag)
-
-(def-type-vops code-component-p nil nil nil
-  sb!vm:code-header-widetag)
-
-(def-type-vops lra-p nil nil nil
-  sb!vm:return-pc-header-widetag)
-
-(def-type-vops fdefn-p nil nil nil
-  sb!vm:fdefn-widetag)
-
-(def-type-vops funcallable-instance-p nil nil nil
-  sb!vm:funcallable-instance-header-widetag)
-
-(def-type-vops array-header-p nil nil nil
-  sb!vm:simple-array-widetag sb!vm:complex-string-widetag sb!vm:complex-bit-vector-widetag
-  sb!vm:complex-vector-widetag sb!vm:complex-array-widetag)
-
-(def-type-vops nil check-function-or-symbol nil object-not-function-or-symbol-error
-  sb!vm:fun-pointer-lowtag sb!vm:symbol-header-widetag)
-
-(def-type-vops stringp check-string nil object-not-string-error
-  sb!vm:simple-string-widetag sb!vm:complex-string-widetag)
-
-(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
-  sb!vm:simple-bit-vector-widetag sb!vm: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
-  sb!vm:even-fixnum-lowtag sb!vm:odd-fixnum-lowtag sb!vm:ratio-widetag sb!vm:bignum-widetag)
-
-(def-type-vops integerp check-integer nil object-not-integer-error
-  sb!vm:even-fixnum-lowtag sb!vm:odd-fixnum-lowtag sb!vm:bignum-widetag)
-
-(def-type-vops floatp check-float nil object-not-float-error
-  sb!vm:single-float-widetag sb!vm:double-float-widetag)
-
-(def-type-vops realp check-real nil object-not-real-error
-  sb!vm:even-fixnum-lowtag sb!vm:odd-fixnum-lowtag sb!vm:ratio-widetag sb!vm:bignum-widetag
-  sb!vm:single-float-widetag sb!vm:double-float-widetag))
-|#
 \f
 ;;;; Other integer ranges.