r10387: support new sbcl

diff --git a/byte-stream.lisp b/byte-stream.lisp
index 6bea1f167a360ecafa16233d05141c256758ce2d..79ce9df449d930637e5a0464a6ca273afc688850 100644 (file)
--- a/byte-stream.lisp
+++ b/byte-stream.lisp
@@ -85,11 +85,24 @@ Make-Byte-Array-Output-Stream since the last call to this function."
 ) ; progn
 
 
 ) ; progn
 
 

+#+sbcl
+(sb-ext:without-package-locks
+ (defvar *system-copy-fn* (if (fboundp (intern "COPY-SYSTEM-AREA" "SB-KERNEL"))
+                             (intern "COPY-SYSTEM-AREA" "SB-KERNEL")
+                           (intern "COPY-SYSTEM-UB8-AREA" "SB-KERNEL")))
+ (defconstant *system-copy-offset* (if (fboundp (intern "COPY-FROM-SYSTEM-AREA" "SB-KERNEL"))
+                                      (* sb-vm:vector-data-offset sb-vm:n-word-bits)
+                                    0))
+ (defconstant *system-copy-multiplier* (if (fboundp (intern "COPY-FROM-SYSTEM-AREA" "SB-KERNEL"))
+                                          sb-vm:n-byte-bits
+                                        1)))
+

 #+(or cmu sbcl)
 (progn
   (defstruct (byte-array-input-stream
             (:include #+cmu system:lisp-stream
 #+(or cmu sbcl)
 (progn
   (defstruct (byte-array-input-stream
             (:include #+cmu system:lisp-stream

-                      #+sbcl sb-impl::file-stream
+                      ;;#+sbcl sb-impl::file-stream
+                      #+sbcl sb-sys:fd-stream

                       (in #'byte-array-inch)
                       (bin #'byte-array-binch)
                       (n-bin #'byte-array-stream-read-n-bytes)
                       (in #'byte-array-inch)
                       (bin #'byte-array-binch)
                       (n-bin #'byte-array-stream-read-n-bytes)


@@ -102,10 +115,11 @@ Make-Byte-Array-Output-Stream since the last call to this function."
   (current nil)
   (end nil))
 
   (current nil)
   (end nil))
 

+  

 (defun %print-byte-array-input-stream (s stream d)
   (declare (ignore s d))
   (write-string "#<Byte-Array-Input Stream>" stream))
 (defun %print-byte-array-input-stream (s stream d)
   (declare (ignore s d))
   (write-string "#<Byte-Array-Input Stream>" stream))

-  
+

 (defun byte-array-inch (stream eof-errorp eof-value)
   (let ((byte-array (byte-array-input-stream-byte-array stream))
        (index (byte-array-input-stream-current stream)))
 (defun byte-array-inch (stream eof-errorp eof-value)
   (let ((byte-array (byte-array-input-stream-byte-array stream))
        (index (byte-array-input-stream-current stream)))


@@ -152,13 +166,13 @@ Make-Byte-Array-Output-Stream since the last call to this function."
                         (* copy vm:byte-bits)))
       #+sbcl
       (sb-sys:without-gcing
                         (* copy vm:byte-bits)))
       #+sbcl
       (sb-sys:without-gcing

-       (sb-kernel:system-area-copy (sb-sys:vector-sap byte-array)
-                        (* index sb-vm:n-byte-bits)
+       (funcall *system-copy-fn* (sb-sys:vector-sap byte-array)
+                        (* index *system-copy-multiplier*)

                         (if (typep buffer 'sb-sys::system-area-pointer)
                             buffer
                             (sb-sys:vector-sap buffer))
                         (if (typep buffer 'sb-sys::system-area-pointer)
                             buffer
                             (sb-sys:vector-sap buffer))

-                        (* start sb-vm:n-byte-bits)
-                        (* copy sb-vm:n-byte-bits))))
+                        (* start *system-copy-multiplier*)
+                        (* copy *system-copy-multiplier*))))

     (if (and (> requested copy) eof-errorp)
        (error 'end-of-file :stream stream)
        copy)))
     (if (and (> requested copy) eof-errorp)
        (error 'end-of-file :stream stream)
        copy)))