0.9.2.43:

[sbcl.git] / src / code / cross-misc.lisp

diff --git a/src/code/cross-misc.lisp b/src/code/cross-misc.lisp
index e2fb124..e57a563 100644 (file)
--- a/src/code/cross-misc.lisp
+++ b/src/code/cross-misc.lisp
@@ -31,15 +31,6 @@
 (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 ANSI-STREAMs (streams which aren't extended
 ;;; Gray streams). In ANSI Common Lisp, an ANSI-STREAM is just a
@@ -72,7 +63,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
@@ -89,10 +80,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))
@@ -123,7 +114,7 @@
 ;;; These functions are needed for constant-folding.
 (defun sb!kernel:simple-array-nil-p (object)
   (when (typep object 'array)
-    (aver (not (null (array-element-type object)))))
+    (assert (not (eq (array-element-type object) nil))))
   nil)
 
 (defun sb!kernel:%negate (number)
@@ -137,3 +128,37 @@
 
 (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))