0.pre7.50:

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

diff --git a/src/compiler/x86/type-vops.lisp b/src/compiler/x86/type-vops.lisp
index d00cd22..143863a 100644 (file)
--- a/src/compiler/x86/type-vops.lisp
+++ b/src/compiler/x86/type-vops.lisp
@@ -15,13 +15,13 @@
 
 (eval-when (:compile-toplevel :execute)
 
-(defparameter immediate-types
+(defparameter *immediate-types*
   (list unbound-marker-type base-char-type))
 
-(defparameter function-header-types
+(defparameter *function-header-types*
   (list funcallable-instance-header-type
-       byte-code-function-type byte-code-closure-type
-       function-header-type closure-function-header-type
+       function-header-type
+       closure-function-header-type
        closure-header-type))
 
 (defun canonicalize-headers (headers)
@@ -56,10 +56,10 @@
                       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 *function-header-types*)
+                        (if (subsetp headers *function-header-types*)
                             t
                             (error "can't test for mix of function subtypes ~
                                     and normal header types"))
@@ -620,7 +620,6 @@
 ;;; An (unsigned-byte 32) can be represented with either a positive
 ;;; fixnum, a bignum with exactly one positive digit, or a bignum with
 ;;; exactly two digits and the second digit all zeros.
-
 (define-vop (unsigned-byte-32-p type-predicate)
   (:translate unsigned-byte-32-p)
   (:generator 45