r5044: *** empty log message ***

[clsql.git] / uffi / clsql-uffi.lisp

diff --git a/uffi/clsql-uffi.lisp b/uffi/clsql-uffi.lisp
index bf275ba8bde10c1763a983b25df2692d1604ae9c..85c15c0a6b721b29e2309e91e9da28b778a17da3 100644 (file)
--- 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.10 2003/05/16 08:07:39 kevin Exp $
+;;;; $Id: clsql-uffi.lisp,v 1.27 2003/05/27 21:40:16 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -95,7 +95,7 @@
   (declare (type char-ptr-def char-ptr))
   (let ((char (uffi:ensure-char-character
               (uffi:deref-pointer char-ptr :char))))
-    (eql char #\N)))
+    (char-equal char #\N)))
     
 (defun convert-raw-field (char-ptr types index)
   (let ((type (if (listp types)
@@ -120,17 +120,15 @@
                  low32
                  (make-64-bit-integer high32 low32)))))
         (t
-         ;; Choose optimized routine
-         #-(or cmu sbcl)
-         (native-to-string char-ptr)
-         #+(or cmu sbcl)
-         (uffi:convert-from-foreign-string char-ptr)))))))
+         #+allegro (native-to-string char-ptr) ;; optimized
+         #-allegro (uffi:convert-from-foreign-string char-ptr)))))))
   
 
 (uffi:def-function "strlen"
     ((str (* :unsigned-char)))
   :returning :unsigned-int)
 
+#+(and allegro ics)
 (defun native-to-string (s)
   (declare (optimize (speed 3) (space 0) (safety 0) (compilation-speed 0))
           (type char-ptr-def s))
@@ -146,50 +144,25 @@
       (incf i))
     str))
 
-#-allegro
+#+(and allegro (not 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)
-            (simple-string str))
+            (type (simple-array (signed-byte 32) (*)) str))
     (do ((i 0))
-       ((= i len))
+       ((= i len4))
       (declare (fixnum i))
-      (setf (schar str i)
-       (code-char (uffi:deref-array s '(:array :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)))
+      (setf (aref (the (simple-array (signed-byte 32) (*)) str) i)
+       (uffi:deref-array s '(:array :int) i))
        (incf i))
-    str)))
- (:-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)
-            (type (simple-array (unsigned-byte 8) (*)) str))
-    (do ((i 0))
+    (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 '(:array :unsigned-char) i))
       (incf i))
-    str))))
+    str))