X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fcross-misc.lisp;h=12d9312a633bf222bb3f53f1d2c0efb37f600ca8;hb=69ef68ba7393e3492c1b4a756d1140f71c2922bc;hp=c44584adb989e4d95aa4583b4ca7d4baf6611bc7;hpb=a40c4adfd7837230109cdb1f054b44fe0b15371a;p=sbcl.git

diff --git a/src/code/cross-misc.lisp b/src/code/cross-misc.lisp
index c44584a..12d9312 100644
--- a/src/code/cross-misc.lisp
+++ b/src/code/cross-misc.lisp
@@ -31,20 +31,11 @@
 (defmacro without-interrupts (&rest forms)
   `(progn ,@forms))
 
-;;; When we're running as a cross-compiler in an arbitrary host ANSI
-;;; Lisp, we shouldn't be doing anything which is sensitive to GC.
-;;; KLUDGE: I (WHN 19990131) think the proper long-term solution would
-;;; be to remove any operations from cross-compiler source files
-;;; (putting them in target-only source files) if they refer to these
-;;; hooks. This is a short-term hack.
-(defvar *before-gc-hooks* nil)
-(defvar *after-gc-hooks* nil)
-
 ;;; The GENESIS function works with fasl code which would, in the
-;;; target SBCL, work on LISP-STREAMs. A true LISP-STREAM doesn't seem
-;;; to be a meaningful concept in ANSI Common Lisp, but we can fake it
-;;; acceptably well using a standard STREAM.
-(deftype lisp-stream () 'stream)
+;;; target SBCL, work on ANSI-STREAMs (streams which aren't extended
+;;; Gray streams). In ANSI Common Lisp, an ANSI-STREAM is just a
+;;; 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
@@ -68,12 +59,13 @@
     nil))
 
 ;;; This seems to be the portable Common Lisp type test which
-;;; corresponds to the effect of the target SBCL implementation test..
+;;; corresponds to the effect of the target SBCL implementation test...
 (defun sb!kernel:array-header-p (x)
-  (and (typep x 'simple-array)
-       (= 1 (array-rank x))))
+  (and (typep x 'array)
+       (or (not (typep x 'simple-array))
+	   (/= (array-rank x) 1))))
 
-;;; Genesis needs these at cross-compile time. The target
+;;; GENESIS needs these at cross-compile time. The target
 ;;; implementation of these is reasonably efficient by virtue of its
 ;;; ability to peek into the internals of the package implementation;
 ;;; this reimplementation is portable but slow.
@@ -97,7 +89,7 @@
   (let ((result 0))
     (declare (type fixnum result))
     (do-external-symbols (i package)
-      (declare (ignore i))
+      (declare (ignorable i))
       (incf result))
     result))
 
@@ -118,3 +110,55 @@
 (defun symbol-hash (symbol)
   (declare (type symbol symbol))
   (sxhash symbol))
+
+;;; These functions are needed for constant-folding.
+(defun sb!kernel:simple-array-nil-p (object)
+  (when (typep object 'array)
+    (assert (not (eq (array-element-type object) nil))))
+  nil)
+
+(defun sb!kernel:%negate (number)
+  (- number))
+
+(defun sb!kernel:%single-float (number)
+  (coerce number 'single-float))
+
+(defun sb!kernel:%double-float (number)
+  (coerce number 'double-float))
+
+(defun sb!kernel:%ldb (size posn integer)
+  (ldb (byte size posn) integer))
+
+(defun sb!kernel:%dpb (newbyte size posn integer)
+  (dpb newbyte (byte size posn) integer))
+
+(defun sb!kernel:%with-array-data (array start end)
+  (assert (typep array '(simple-array * (*))))
+  (values array start end 0))
+
+(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)
+  (declare (ignore kind thing format))
+  `(progn ,@body))
+
+(defun compiler-assert-symbol-home-package-unlocked (symbol control)
+  (declare (ignore control))
+  symbol)
+
+(defun assert-package-unlocked (package &optional control &rest args)
+  (declare (ignore control args))
+  package)
+
+(defun assert-symbol-home-package-unlocked (name format &key continuablep)
+  (declare (ignore format continuablep))
+  name)
+
+(declaim (declaration enable-package-locks disable-package-locks))