X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcode%2Ftarget-c-call.lisp;h=4730dbdb3f34b8ad5eab052413addbc41eae9a08;hb=568214ddf4c8ecc881caec98e20848d017974ec0;hp=d9575b847eeb9d38bd46a308799f0ffc97b75968;hpb=6139c89c89f45c03509e4f3156293ff656716a8c;p=sbcl.git

diff --git a/src/code/target-c-call.lisp b/src/code/target-c-call.lisp
index d9575b8..4730dbd 100644
--- a/src/code/target-c-call.lisp
+++ b/src/code/target-c-call.lisp
@@ -22,12 +22,12 @@
 (define-alien-type char (integer 8))
 (define-alien-type short (integer 16))
 (define-alien-type int (integer 32))
-(define-alien-type long (integer #!-alpha 32 #!+alpha 64))
+(define-alien-type long (integer #.sb!vm::n-machine-word-bits))
 
 (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 #!-alpha 32 #!+alpha 64))
+(define-alien-type unsigned-long (unsigned #.sb!vm::n-machine-word-bits))
 
 (define-alien-type float single-float)
 (define-alien-type double double-float)
@@ -35,13 +35,31 @@
 (define-alien-type-translator void ()
   (parse-alien-type '(values) (sb!kernel:make-null-lexenv)))
 
+;;; FIXME: %NATURALIZE-C-STRING (and the UTF8 siblings below) would
+;;; appear to be vulnerable to the lisp string moving from underneath
+;;; them if the world undergoes a GC, possibly triggered by another
+;;; thread.  Ugh.
 (defun %naturalize-c-string (sap)
   (declare (type system-area-pointer sap))
-  (with-alien ((ptr (* char) sap))
-    (let* ((length (alien-funcall (extern-alien "strlen"
-						(function integer (* char)))
-				  ptr))
-	   (result (make-string length)))
+  (locally
       (declare (optimize (speed 3) (safety 0)))
-      (sb!kernel:%byte-blt sap 0 result 0 length)
-      result)))
+    (let ((length (loop for offset of-type fixnum upfrom 0
+                        until (zerop (sap-ref-8 sap offset))
+                        finally (return offset))))
+      (let ((result (make-string length :element-type 'base-char)))
+	(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))))
+      (handler-bind ((sb!impl::octet-decoding-error #'sb!impl::use-unicode-replacement-char))
+	(sb!impl::utf8->string-sap-ref-8 sap 0 byte-length)))))
+
+(defun %deport-utf8-string (string)
+  (declare (type simple-string string))
+  (sb!impl::string->utf8 string 0 (length string) 1))