0.9.16.6: better circularity detection in fasl dumper

[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 3292453..df7fa8c 100644 (file)
--- a/src/code/target-c-call.lisp
+++ b/src/code/target-c-call.lisp
@@ -22,12 +22,14 @@
 (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 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 #!-alpha 32 #!+alpha 64))
+(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)
@@ -35,6 +37,15 @@
 (define-alien-type-translator void ()
   (parse-alien-type '(values) (sb!kernel:make-null-lexenv)))
 \f
+;;; 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.
+;;;
+;;; Actually the above shouldn't happen; x86 and x86-64 use GENCGC,
+;;; so the string can't move by virtue of pointers to it from
+;;; outside the heap. Other platforms will access the lisp string
+;;; through the GC-safe interior pointer. -- JES, 2006-01-13
 (defun %naturalize-c-string (sap)
   (declare (type system-area-pointer sap))
   (locally
@@ -43,8 +54,19 @@
                         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))))
+      (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))