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

diff --git a/uffi/clsql-uffi.lisp b/uffi/clsql-uffi.lisp
index 10f9a02..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.15 2003/05/16 09:16:25 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
 ;;;;
@@ -121,9 +121,9 @@
 		  (make-64-bit-integer high32 low32)))))
 	 (t
 	  ;; Choose optimized routine
-	  #-(or cmu sbcl)
+	  #-(or cmu sbcl scl)
 	  (native-to-string char-ptr)
-	  #+(or cmu sbcl)
+	  #+(or cmu sbcl scl)
 	  (uffi:convert-from-foreign-string char-ptr)))))))
   
 
@@ -131,6 +131,7 @@
     ((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))
@@ -142,11 +143,11 @@
 	((= i len))
       (declare (fixnum i))
       (setf (schar str i)
-	(code-char (uffi:deref-array s '(:array :unsigned-char) i)))
+	(code-char (uffi:deref-array s :unsigned-char i)))
       (incf i))
     str))
 
-#-allegro
+#+(and allegro ics)
 (defun native-to-string (s)
   (declare (optimize (speed 3) (space 0) (safety 0) (compilation-speed 0))
 	   (type char-ptr-def s))
@@ -158,45 +159,32 @@
 	((= i len))
       (declare (fixnum i))
       (setf (schar str i)
-	(code-char (uffi:deref-array s '(:array :unsigned-char) i)))
+	(code-char (uffi:deref-array s :unsigned-char i)))
       (incf i))
     str))
 
-#+allegro
-(excl:ics-target-case
- (:+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 '(:array :unsigned-char) i)))
-	(incf i))
-    str)))
- (:-ics
-  (defun native-to-string (s)
+#-(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 (unsigned-byte 8) (*)) str))
-    #+ignore
+	     (type (simple-array (signed-byte 32) (*)) str))
     (do ((i 0))
 	((= i len4))
       (declare (fixnum i))
-      (setf (aref (the (simple-array (unsigned-byte 32) (*)) str) i)
-	    (uffi:deref-array s '(:array :unsigned-int) i))
-      (incf i))
-    (do ((i 0))
+      (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 str i) (uffi:deref-array s '(:array :unsigned-char) i))
+      (setf (aref (the (simple-array (signed-byte 8) (*)) str) i)
+	(uffi:deref-array s :unsigned-char i))
       (incf i))
-    str))))
+    str))
+
+
+