X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Fstrings.lisp;h=a8cbf8bdcd3937707cf90f2119a0c14612680dc3;hb=65e2a75247b894d1f562102ef1df77c7060b5048;hp=02ae84bfa1758412f690918d6290633bba04ae1b;hpb=caf4972e7f7d2562fe4a9977cf20d38bbf0e320f;p=uffi.git

diff --git a/src/strings.lisp b/src/strings.lisp
index 02ae84b..a8cbf8b 100644
--- a/src/strings.lisp
+++ b/src/strings.lisp
@@ -2,12 +2,12 @@
 ;;;; *************************************************************************
 ;;;; FILE IDENTIFICATION
 ;;;;
-;;;; Name:          strings.cl
+;;;; Name:          strings.lisp
 ;;;; Purpose:       UFFI source to handle strings, cstring and foreigns
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: strings.lisp,v 1.4 2002/10/16 11:56:43 kevin Exp $
+;;;; $Id: strings.lisp,v 1.10 2003/07/18 21:33:26 kevin Exp $
 ;;;;
 ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -16,8 +16,7 @@
 ;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL.
 ;;;; *************************************************************************
 
-(declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0)))
-(in-package :uffi)
+(in-package #:uffi)
 
 
 (defvar +null-cstring-pointer+
@@ -55,14 +54,14 @@ that LW/CMU automatically converts strings from c-calls."
   `(if (null ,obj)
     +null-cstring-pointer+
     (let ((ptr (new-ptr (1+ (length ,obj)))))
-      (ccl:%put-cstring ptr ,obj)
+      (ccl::%put-cstring ptr ,obj)
       ptr))
   )
 
 (defmacro free-cstring (obj)
   #+(or cmu sbcl scl lispworks) (declare (ignore obj))
   #+allegro
-  `(unless (zerop obj)
+  `(unless (zerop ,obj)
      (ff:free-fobject ,obj))
   #+mcl
   `(unless (ccl:%null-ptr-p ,obj)
@@ -97,8 +96,8 @@ that LW/CMU automatically converts strings from c-calls."
 (defmacro convert-to-foreign-string (obj)
   #+lispworks
   `(if (null ,obj)
-       +null-cstring-pointer+
-    (fli:convert-to-foreign-string ,obj))
+    +null-cstring-pointer+
+    (fli:convert-to-foreign-string ,obj :external-format '(:latin-1 :eol-style :lf)))
   #+allegro
   `(if (null ,obj)
        0
@@ -143,7 +142,7 @@ that LW/CMU automatically converts strings from c-calls."
   `(if (null ,obj)
        +null-cstring-pointer+
      (let ((ptr (new-ptr (1+ (length ,obj)))))
-       (ccl:%put-cstring ptr ,obj)
+       (ccl::%put-cstring ptr ,obj)
        ptr))
   )
 
@@ -151,22 +150,27 @@ that LW/CMU automatically converts strings from c-calls."
 ;; Either length or null-terminated-p must be non-nil
 (defmacro convert-from-foreign-string (obj &key
 					   length
+					   (locale :default)
 					   (null-terminated-p t))
   #+allegro
   `(if (zerop ,obj)
        nil
-     (values (excl:native-to-string
-	      ,obj 
-	      ,@(if length (list :length length) (values))
-	      :truncate (not ,null-terminated-p))))
+     (if (eq ,locale :none)
+	 (fast-native-to-string ,obj)
+       (excl:native-to-string
+	,obj 
+	,@(when length (list :length length))
+	:truncate (not ,null-terminated-p))))
   #+lispworks
   `(if (fli:null-pointer-p ,obj)
        nil
-     (fli:convert-from-foreign-string 
-      ,obj
-      ,@(if length (list :length length) (values))
-      :null-terminated-p ,null-terminated-p
-      :external-format '(:latin-1 :eol-style :lf)))      
+     (if (eq ,locale :none)
+	 (fast-native-to-string ,obj)
+       (fli:convert-from-foreign-string 
+	,obj
+	,@(when length (list :length length))
+	:null-terminated-p ,null-terminated-p
+	:external-format '(:latin-1 :eol-style :lf))))
   #+(or cmu scl)
   `(if (null-pointer-p ,obj)
     nil
@@ -188,7 +192,6 @@ that LW/CMU automatically converts strings from c-calls."
   )
 
 
-
 (defmacro allocate-foreign-string (size &key (unsigned t))
   #+(or cmu scl)
   (let ((array-def (gensym)))
@@ -299,3 +302,54 @@ that LW/CMU automatically converts strings from c-calls."
 					      sb-vm:n-word-bits)
 				    (* length sb-vm:n-byte-bits))
       result)))
+
+
+(def-function "strlen"
+    ((str (* :unsigned-char)))
+  :returning :unsigned-int)
+
+(def-type char-ptr-def (* :unsigned-char))
+
+#+(or lispworks (and allegro (not ics)))
+(defun fast-native-to-string (s)
+  (declare (optimize (speed 3) (space 0) (safety 0) (compilation-speed 0))
+	   (type char-ptr-def s))
+  (let* ((len (strlen s))
+	 (str (make-string len)))
+    (declare (fixnum len)
+	     (type (simple-array (signed-byte 8) (*)) str))
+    (dotimes (i len str)
+      (setf (aref str i) (uffi:deref-array s '(:array :char) i)))))
+
+#+(and allegro ics)
+(defun fast-native-to-string (s)
+  (declare (optimize (speed 3) (space 0) (safety 0) (compilation-speed 0))
+	   (type char-ptr-def s))
+  (let* ((len (strlen s))
+	 (str (make-string len)))
+    (declare (fixnum len))
+    (dotimes (i len str)
+      (setf (schar str i) (ensure-char-character
+			  (uffi:deref-array s '(:array :char) i))))))
+
+#+ignore
+(defun fast-native-to-string (s)
+  (declare (optimize (speed 3) (space 0) (safety 0) (compilation-speed 0) (debug 0))
+	   (type char-ptr-def s))
+  (let* ((len (strlen s))
+	 (len4 (the fixnum (ash (the fixnum len) -2)))
+	 (end4 (the fixnum (ash (the fixnum len4) 2)))
+	 (remainder (the fixnum (- len end4)))
+	 (str (make-string len))
+	 (str4 str))
+    (declare (type fixnum len len4 end4 remainder)
+	     (type (simple-array (signed-byte 32) (*)) str4)
+	     (type (simple-array (signed-byte 8) (*)) str))
+    (dotimes (i len4)
+      (declare (fixnum i))
+      (setf (aref str4 i) (uffi:deref-array s '(:array :int) i)))
+    (dotimes (i remainder)
+      (declare (fixnum i))
+      (setf (aref str end4) (uffi:deref-array s '(:array :char) end4))
+      (incf end4))
+    str))