X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=uffi%2Fclsql-uffi.lisp;h=a6d4af4da61c779dd82932474cc4a374a0d575b6;hb=fce7c4f2a188851c40844cc1b7cface0bf099c6f;hp=a74b75c5fb3ad9606721f679e6dbf9bc6e00bdb6;hpb=50e0a512247d82a6657675a67f5d3caf019a25bb;p=clsql.git

diff --git a/uffi/clsql-uffi.lisp b/uffi/clsql-uffi.lisp
index a74b75c..a6d4af4 100644
--- a/uffi/clsql-uffi.lisp
+++ b/uffi/clsql-uffi.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmers:   Kevin M. Rosenberg
 ;;;; Date Started:  Mar 2002
 ;;;;
-;;;; $Id: clsql-uffi.lisp,v 1.4 2003/03/29 22:31:43 kevin Exp $
+;;;; $Id: clsql-uffi.lisp,v 1.22 2003/05/17 07:45:05 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -83,8 +83,8 @@
 (defmacro split-64-bit-integer (int64)
   `(values (ash ,int64 -32) (logand ,int64 +2^32-1+)))
 
-(defconstant +ascii-N-value+ (char-code #\N))
-(defconstant +ascii-U-value+ (char-code #\U))
+(defvar +ascii-N-value+ (char-code #\N))
+(defvar +ascii-U-value+ (char-code #\U))
 
 (uffi:def-type char-ptr-def (* :unsigned-char))
 
@@ -120,5 +120,71 @@
 		  low32
 		  (make-64-bit-integer high32 low32)))))
 	 (t
+	  ;; Choose optimized routine
+	  #-(or cmu sbcl scl)
+	  (native-to-string char-ptr)
+	  #+(or cmu sbcl scl)
 	  (uffi:convert-from-foreign-string char-ptr)))))))
   
+
+(uffi:def-function "strlen"
+    ((str (* :unsigned-char)))
+  :returning :unsigned-int)
+
+#-allegro
+(defun 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)
+	     (simple-string str))
+    (do ((i 0))
+	((= i len))
+      (declare (fixnum i))
+      (setf (schar str i)
+	(code-char (uffi:deref-array s :unsigned-char i)))
+      (incf i))
+    str))
+
+#+(and allegro ics)
+(defun 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)
+	     (simple-string str))
+    (do ((i 0))
+	((= i len))
+      (declare (fixnum i))
+      (setf (schar str i)
+	(code-char (uffi:deref-array s :unsigned-char i)))
+      (incf i))
+    str))
+
+#-(and allegro ics)
+(defun native-to-string (s)
+  (declare (optimize (speed 3) (space 0) (safety 0) (compilation-speed 0))
+	   (type char-ptr-def s))
+  (let* ((len (strlen s))
+	 (len4 (floor len 4))
+	 (str (make-string len)))
+    (declare (fixnum len)
+	     (type (simple-array (signed-byte 32) (*)) str))
+    (do ((i 0))
+	((= i len4))
+      (declare (fixnum i))
+      (setf (aref (the (simple-array (signed-byte 32) (*)) str) i)
+	(uffi:deref-array s :int i))
+	(incf i))
+    (do ((i (* 4 len4)))
+	((= i len))
+      (declare (fixnum i))
+      (setf (aref (the (simple-array (signed-byte 8) (*)) str) i)
+	(uffi:deref-array s :unsigned-char i))
+      (incf i))
+    str))
+
+
+