0.9.8.14:

[sbcl.git] / src / code / target-c-call.lisp

diff --git a/src/code/target-c-call.lisp b/src/code/target-c-call.lisp
index ccbdc53..cc3eef7 100644 (file)
--- a/src/code/target-c-call.lisp
+++ b/src/code/target-c-call.lisp
@@ -23,11 +23,13 @@
 (define-alien-type short (integer 16))
 (define-alien-type int (integer 32))
 (define-alien-type long (integer #.sb!vm::n-machine-word-bits))
+(define-alien-type long-long (integer 64))
 
 (define-alien-type unsigned-char (unsigned 8))
 (define-alien-type unsigned-short (unsigned 16))
 (define-alien-type unsigned-int (unsigned 32))
 (define-alien-type unsigned-long (unsigned #.sb!vm::n-machine-word-bits))
+(define-alien-type unsigned-long-long (unsigned 64))
 
 (define-alien-type float single-float)
 (define-alien-type double double-float)
@@ -47,21 +49,18 @@
                         until (zerop (sap-ref-8 sap offset))
                         finally (return offset))))
       (let ((result (make-string length :element-type 'base-char)))
-       (sb!kernel:copy-from-system-area sap 0
-                                         result (* sb!vm:vector-data-offset
-                                                   sb!vm:n-word-bits)
-                                         (* length sb!vm:n-byte-bits))
-       result))))
+        (sb!kernel:copy-ub8-from-system-area sap 0 result 0 length)
+        result))))
 
 (defun %naturalize-utf8-string (sap)
   (declare (type system-area-pointer sap))
   (locally
     (declare (optimize (speed 3) (safety 0)))
     (let ((byte-length (do* ((offset 0 (1+ offset))
-                            (byte #1=(sap-ref-8 sap offset) #1#))
-                           ((zerop byte) offset))))
+                             (byte #1=(sap-ref-8 sap offset) #1#))
+                            ((zerop byte) offset))))
       (handler-bind ((sb!impl::octet-decoding-error #'sb!impl::use-unicode-replacement-char))
-       (sb!impl::utf8->string-sap-ref-8 sap 0 byte-length)))))
+        (sb!impl::utf8->string-sap-ref-8 sap 0 byte-length)))))
 
 (defun %deport-utf8-string (string)
   (declare (type simple-string string))