1.1.13: will be tagged as "sbcl-1.1.13"

[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 4730dbd..c978ac8 100644 (file)
--- a/src/code/target-c-call.lisp
+++ b/src/code/target-c-call.lisp
@@ -22,23 +22,48 @@
 (define-alien-type char (integer 8))
 (define-alien-type short (integer 16))
 (define-alien-type int (integer 32))
+#!-(and win32 x86-64)
 (define-alien-type long (integer #.sb!vm::n-machine-word-bits))
+#!+(and win32 x86-64)
+(define-alien-type long (integer 32))
+
+(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))
+#!-(and win32 x86-64)
 (define-alien-type unsigned-long (unsigned #.sb!vm::n-machine-word-bits))
+#!+(and win32 x86-64)
+(define-alien-type unsigned-long (unsigned 32))
+(define-alien-type unsigned-long-long (unsigned 64))
 
 (define-alien-type float single-float)
 (define-alien-type double double-float)
 
+(define-alien-type utf8-string (c-string :external-format :utf8))
+
 (define-alien-type-translator void ()
   (parse-alien-type '(values) (sb!kernel:make-null-lexenv)))
 \f
+
+(defun default-c-string-external-format ()
+  #!+sb-xc
+  :latin-1
+  #!-sb-xc
+  (or *default-c-string-external-format*
+      (setf *default-c-string-external-format*
+            (sb!impl::default-external-format))))
+
 ;;; 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
@@ -47,19 +72,19 @@
                         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))))
+        (sb!kernel:copy-ub8-from-system-area sap 0 result 0 length)
+        result))))
 
-(defun %naturalize-utf8-string (sap)
-  (declare (type system-area-pointer sap))
+(defun string-to-c-string (string external-format)
+  (declare (type simple-string string))
   (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)))))
+      (declare (optimize (speed 3) (safety 0)))
+    (let ((external-format (sb!impl::get-external-format-or-lose external-format)))
+      (funcall (sb!impl::ef-write-c-string-fun external-format) string))))
 
-(defun %deport-utf8-string (string)
-  (declare (type simple-string string))
-  (sb!impl::string->utf8 string 0 (length string) 1))
+(defun c-string-to-string (sap external-format element-type)
+  (declare (type system-area-pointer sap))
+  (locally
+      (declare (optimize (speed 3) (safety 0)))
+    (let ((external-format (sb!impl::get-external-format-or-lose external-format)))
+      (funcall (sb!impl::ef-read-c-string-fun external-format) sap element-type))))