0.pre7.55:

[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 143863a..b0067e6 100644 (file)
--- a/src/compiler/x86/type-vops.lisp
+++ b/src/compiler/x86/type-vops.lisp
@@ -18,10 +18,10 @@
 (defparameter *immediate-types*
   (list unbound-marker-type base-char-type))
 
-(defparameter *function-header-types*
+(defparameter *fun-header-types*
   (list funcallable-instance-header-type
-       function-header-type
-       closure-function-header-type
+       simple-fun-header-type
+       closure-fun-header-type
        closure-header-type))
 
 (defun canonicalize-headers (headers)
@@ -58,8 +58,8 @@
         (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*)
+        (function-p (if (intersection headers *fun-header-types*)
+                        (if (subsetp headers *fun-header-types*)
                             t
                             (error "can't test for mix of function subtypes ~
                                     and normal header types"))
@@ -163,7 +163,7 @@
 
 (defun %test-headers (value target not-p function-p headers
                            &optional (drop-through (gen-label)) al-loaded)
-  (let ((lowtag (if function-p function-pointer-type other-pointer-type)))
+  (let ((lowtag (if function-p fun-pointer-type other-pointer-type)))
     (multiple-value-bind (equal less-or-equal when-true when-false)
        ;; EQUAL and LESS-OR-EQUAL are the conditions for branching to TARGET.
        ;; WHEN-TRUE and WHEN-FALSE are the labels to branch to when we know
@@ -201,7 +201,7 @@
 #+nil
 (defun %test-headers (value target not-p function-p headers
                            &optional (drop-through (gen-label)) al-loaded)
-  (let ((lowtag (if function-p function-pointer-type other-pointer-type)))
+  (let ((lowtag (if function-p fun-pointer-type other-pointer-type)))
     (multiple-value-bind (equal less-or-equal when-true when-false)
        ;; EQUAL and LESS-OR-EQUAL are the conditions for branching to TARGET.
        ;; WHEN-TRUE and WHEN-FALSE are the labels to branch to when we know
@@ -324,7 +324,7 @@
   even-fixnum-type odd-fixnum-type)
 
 (def-type-vops functionp check-function function
-  object-not-function-error function-pointer-type)
+  object-not-function-error fun-pointer-type)
 
 (def-type-vops listp check-list list object-not-list-error
   list-pointer-type)
@@ -493,10 +493,6 @@
   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)
-
 (def-type-vops stringp check-string nil object-not-string-error
   simple-string-type complex-string-type)