X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fx86%2Ftype-vops.lisp;h=62f09a30b9ac3d81fbad1b0026867ace9947dc7e;hb=ba38798a5ca26b90647a1993f348806cb32f2d1b;hp=f780568da280dcb3a086681941b8f05bf9ed78a3;hpb=3c65762b927af861c9c8bc416e4cbac9a14ec0c3;p=sbcl.git

diff --git a/src/compiler/x86/type-vops.lisp b/src/compiler/x86/type-vops.lisp
index f780568..62f09a3 100644
--- a/src/compiler/x86/type-vops.lisp
+++ b/src/compiler/x86/type-vops.lisp
@@ -68,9 +68,9 @@
       (error "At least one type must be supplied for TEST-TYPE."))
     (cond
      (fixnump
-      (when (remove-if #'(lambda (x)
-			   (or (= x even-fixnum-lowtag)
-			       (= x odd-fixnum-lowtag)))
+      (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
@@ -118,7 +118,7 @@
 		 3))
 	  ((sc-is value control-stack)
 	   (inst test (make-ea :byte :base ebp-tn
-			       :disp (- (* (1+ offset) sb!vm:word-bytes)))
+			       :disp (- (* (1+ offset) n-word-bytes)))
 		 3))
 	  (t
 	   (inst test value 3)))))
@@ -323,8 +323,8 @@
 (def-simple-type-vops fixnump check-fixnum fixnum object-not-fixnum-error
   even-fixnum-lowtag odd-fixnum-lowtag)
 
-(def-type-vops functionp check-function function
-  object-not-function-error fun-pointer-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)