X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fcross-misc.lisp;h=67e730b71e993f980d43b9ab9263f926493504e9;hb=25fe91bf63fd473d9316675b0e0ca9be0079e9eb;hp=440c0373f2fc9f3a60aadc1f21d9d57f9c75d8a3;hpb=fd526bc66c53616a2e757323cbda0271c72b3d54;p=sbcl.git

diff --git a/src/code/cross-misc.lisp b/src/code/cross-misc.lisp
index 440c037..67e730b 100644
--- a/src/code/cross-misc.lisp
+++ b/src/code/cross-misc.lisp
@@ -37,13 +37,19 @@
 ;;; CL:STREAM.
 (deftype ansi-stream () 'stream)
 
-;;; In the target SBCL, the INSTANCE type refers to a base
-;;; implementation for compound types. There's no way to express
-;;; exactly that concept portably, but we can get essentially the same
-;;; effect by testing for any of the standard types which would, in
-;;; the target SBCL, be derived from INSTANCE:
 (deftype sb!kernel:instance ()
-  '(or condition standard-object structure-object))
+  '(or condition structure-object standard-object))
+(deftype sb!kernel:funcallable-instance ()
+  (error "not clear how to represent FUNCALLABLE-INSTANCE type"))
+
+;;; In the target SBCL, the INSTANCE type refers to a base
+;;; implementation for compound types with lowtag
+;;; INSTANCE-POINTER-LOWTAG. There's no way to express exactly that
+;;; concept portably, but we can get essentially the same effect by
+;;; testing for any of the standard types which would, in the target
+;;; SBCL, be derived from INSTANCE:
+(defun %instancep (x)
+  (typep x '(or condition structure-object standard-object)))
 
 ;;; There aren't any FUNCALLABLE-INSTANCEs in the cross-compilation
 ;;; host Common Lisp.
@@ -63,7 +69,7 @@
 (defun sb!kernel:array-header-p (x)
   (and (typep x 'array)
        (or (not (typep x 'simple-array))
-	   (/= (array-rank x) 1))))
+           (/= (array-rank x) 1))))
 
 ;;; GENESIS needs these at cross-compile time. The target
 ;;; implementation of these is reasonably efficient by virtue of its
@@ -80,10 +86,10 @@
       ;; of this function at cross-compile time don't really care if
       ;; the count is a little too high.) -- WHN 19990826
       (multiple-value-bind (symbol status)
-	  (find-symbol (symbol-name i) package)
-	(declare (ignore symbol))
-	(when (member status '(:internal :inherited))
-	  (incf result))))
+          (find-symbol (symbol-name i) package)
+        (declare (ignore symbol))
+        (when (member status '(:internal :inherited))
+          (incf result))))
     result))
 (defun package-external-symbol-count (package)
   (let ((result 0))
@@ -136,30 +142,21 @@
   (assert (typep array '(simple-array * (*))))
   (values array start end 0))
 
-#!-(or alpha x86-64)
-(progn
-  (defun sb!vm::ash-left-mod32 (integer amount)
-    (ldb (byte 32 0) (ash integer amount)))
-  (defun sb!vm::logxor-mod32 (x y)
-    (ldb (byte 32 0) (logxor x y)))
-  (defun sb!vm::lognot-mod32 (x)
-    (ldb (byte 32 0) (lognot x))))
-#!+(or alpha x86-64)
-(defun sb!vm::ash-left-mod64 (integer amount)
-  (ldb (byte 64 0) (ash integer amount)))
+(defun sb!kernel:signed-byte-32-p (number)
+  (typep number '(signed-byte 32)))
 
 ;;; package locking nops for the cross-compiler
 
 (defmacro without-package-locks (&body body)
   `(progn ,@body))
 
-(defmacro with-single-package-locked-error ((&optional kind thing &rest format) 
-					    &body body)
+(defmacro with-single-package-locked-error ((&optional kind thing &rest format)
+                                            &body body)
   (declare (ignore kind thing format))
   `(progn ,@body))
 
-(defun compiler-assert-symbol-home-package-unlocked (symbol control)
-  (declare (ignore control))
+(defun program-assert-symbol-home-package-unlocked (context symbol control)
+  (declare (ignore context control))
   symbol)
 
 (defun assert-package-unlocked (package &optional control &rest args)