0.9.2.40:

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

diff --git a/src/compiler/generic/early-type-vops.lisp b/src/compiler/generic/early-type-vops.lisp
index 4aa4fa3..8f289da 100644 (file)
--- a/src/compiler/generic/early-type-vops.lisp
+++ b/src/compiler/generic/early-type-vops.lisp
@@ -1,12 +1,23 @@
-(in-package "SB!VM")
+;;;; generic type testing and checking apparatus
 
+;;;; This software is part of the SBCL system. See the README file for
+;;;; more information.
+;;;;
+;;;; This software is derived from the CMU CL system, which was
+;;;; written at Carnegie Mellon University and released into the
+;;;; public domain. The software is in the public domain and is
+;;;; provided with absolutely no warranty. See the COPYING and CREDITS
+;;;; files for more information.
+(in-package "SB!VM")
+\f
 (defparameter *immediate-types*
-  (list unbound-marker-widetag base-char-widetag))
+  (list* unbound-marker-widetag character-widetag
+        (when (= sb!vm::n-word-bits 64)
+          (list single-float-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)
@@ -48,7 +59,7 @@
                         (if (subsetp headers *fun-header-widetags*)
                             t
                             (error "can't test for mix of function subtypes ~
-                                    and normal header types"))
+                                     and normal header types"))
                         nil)))
     (unless type-codes
       (error "At least one type must be supplied for TEST-TYPE."))
@@ -61,33 +72,48 @@
         (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 ,target ,not-p
-            ',(canonicalize-headers headers)
-            ,@other-args)
-          `(%test-fixnum ,value ,target ,not-p
-            ,@other-args)))
+       (cond
+        ((and (= sb!vm:n-word-bits 64) immediates headers)
+         `(%test-fixnum-immediate-and-headers ,value ,target ,not-p
+                                              ,(car immediates)
+                                              ',(canonicalize-headers
+                                                 headers)
+                                              ,@other-args))
+        (immediates
+         (if (= sb!vm:n-word-bits 64)
+             `(%test-fixnum-and-immediate ,value ,target ,not-p
+                                          ,(car immediates)
+                                          ,@other-args)
+             (error "can't mix fixnum testing with other immediates")))
+        (headers
+         `(%test-fixnum-and-headers ,value ,target ,not-p
+                                    ',(canonicalize-headers headers)
+                                    ,@other-args))
+        (t
+         `(%test-fixnum ,value ,target ,not-p
+                        ,@other-args))))
       (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 ,target ,not-p ,(car immediates)
-        ,@other-args))
+       (cond
+        (headers
+         (if (= sb!vm:n-word-bits 64)
+             `(%test-immediate-and-headers ,value ,target ,not-p
+                                           ,(car immediates)
+                                           ',(canonicalize-headers headers)
+                                           ,@other-args)
+             (error "can't mix testing of immediates with testing of headers")))
+        (lowtags
+         (error "can't mix testing of immediates with testing of lowtags"))
+        ((cdr immediates)
+         (error "can't test multiple immediates at the same time"))
+        (t
+         `(%test-immediate ,value ,target ,not-p ,(car immediates)
+                           ,@other-args))))
       (lowtags
        (when (cdr lowtags)
         (error "can't test multiple lowtags at the same time"))
-       (if headers
-          `(%test-lowtag-and-headers
-            ,value ,target ,not-p ,(car lowtags)
-            ,function-p ',(canonicalize-headers headers)
-            ,@other-args)
-          `(%test-lowtag ,value ,target ,not-p ,(car lowtags)
-            ,@other-args)))
+       (when headers
+        (error "can't test non-fixnum lowtags and headers at the same time"))
+       `(%test-lowtag ,value ,target ,not-p ,(car lowtags) ,@other-args))
       (headers
        `(%test-headers ,value ,target ,not-p ,function-p
         ',(canonicalize-headers headers)