X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcode%2Fcross-misc.lisp;h=868d3f69fabe71094ff893216c3de6012056974d;hb=e5e1b41799b814bca18e5f6e5c10b12d06c35c46;hp=18f7fbb258fe1a7ca2202530a00d61918a9b6935;hpb=416152f084604094445a758ff399871132dff2bd;p=sbcl.git

diff --git a/src/code/cross-misc.lisp b/src/code/cross-misc.lisp
index 18f7fbb..868d3f6 100644
--- a/src/code/cross-misc.lisp
+++ b/src/code/cross-misc.lisp
@@ -41,10 +41,10 @@
 (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,10 +68,11 @@
     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
 ;;; implementation of these is reasonably efficient by virtue of its
@@ -97,7 +98,7 @@
   (let ((result 0))
     (declare (type fixnum result))
     (do-external-symbols (i package)
-      (declare (ignore i))
+      (declare (ignorable i))
       (incf result))
     result))
 
@@ -118,3 +119,35 @@
 (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))
+
+#!-alpha
+(defun sb!vm::ash-left-mod32 (integer amount)
+  (ldb (byte 32 0) (ash integer amount)))
+#!+alpha
+(defun sb!vm::ash-left-mod64 (integer amount)
+  (ldb (byte 64 0) (ash integer amount)))