X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=uffi%2Fclsql-uffi.lisp;h=76e63eb95ebbc7f43ebc50a742e7dde6d0ae6aae;hb=2b89a1b56dfb8c1cdfaae36b2d4ff7382cff8b40;hp=63267022dc7ce8c7710b36edee0c395907ce35d8;hpb=f1ff5842ce264fbe47e8ef98e33e4aca3b71d863;p=clsql.git

diff --git a/uffi/clsql-uffi.lisp b/uffi/clsql-uffi.lisp
index 6326702..76e63eb 100644
--- a/uffi/clsql-uffi.lisp
+++ b/uffi/clsql-uffi.lisp
@@ -30,7 +30,7 @@
        (nreverse new-types))
     (declare (fixnum length-types length-auto-list i))
     (if (>= i length-types)
-	(push t new-types) ;; types is shorted than num-fields
+	(push t new-types) ;; types is shorter than num-fields
 	(push
 	 (case (nth i types)
 	   (:int
@@ -54,7 +54,11 @@
 	   (:int64
 	    (if (eq :int64 (nth i auto-list))
 		:int64
-		t))
+	      t))
+	   (:blob
+	    :blob)
+	   (:uint
+	    :uint)
 	   (t
 	    t))
 	 new-types))))
@@ -63,6 +67,12 @@
     ((str (* :unsigned-char)))
   :returning :int)
 
+(uffi:def-function ("strtoul" c-strtoul)
+    ((str (* :unsigned-char))
+     (endptr (* :unsigned-char))
+     (radix :int))
+  :returning :unsigned-long)
+
 (uffi:def-function "atol"
     ((str (* :unsigned-char)))
   :returning :long)
@@ -73,24 +83,37 @@
 
 (uffi:def-function "atol64"
     ((str (* :unsigned-char))
-     (high32 (* :int)))
+     (high32 (* :unsigned-int)))
+  :module "clsql-uffi"
   :returning :unsigned-int)
 
 (uffi:def-constant +2^32+ 4294967296)
+(uffi:def-constant +2^64+ 18446744073709551616)
 (uffi:def-constant +2^32-1+ (1- +2^32+))
 
 (defmacro make-64-bit-integer (high32 low32)
-  `(+ ,low32 (ash ,high32 32)))
+  `(if (zerop (ldb (byte 1 31) ,high32))
+       (+ ,low32 (ash ,high32 32))
+     (- (+ ,low32 (ash ,high32 32)) +2^64+)))
+
+;; From high to low ints
+(defmacro make-128-bit-integer (a b c d)
+  `(+ ,d (ash ,c 32) (ash ,b 64) (ash ,a 96)))
 
 (defmacro split-64-bit-integer (int64)
   `(values (ash ,int64 -32) (logand ,int64 +2^32-1+)))
 
 (uffi:def-type char-ptr-def (* :unsigned-char))
 
+(defun strtoul (char-ptr)
+  (declare (optimize (speed 3) (safety 0) (space 0))
+ 	   (type char-ptr-def char-ptr))
+  (c-strtoul char-ptr uffi:+null-cstring-pointer+ 10))
+
 (defun convert-raw-field (char-ptr types index &optional length)
   (declare (optimize (speed 3) (safety 0) (space 0))
  	   (type char-ptr-def char-ptr))
-  (let ((type (if (listp types)
+  (let ((type (if (consp types)
 		  (nth index types)
 		  types)))
     (cond
@@ -100,16 +123,31 @@
        (case type
 	 (:double
 	  (atof char-ptr))
-	 ((or :int32 :int)
+	 (:int
+	  (atol char-ptr))
+	 (:int32
 	  (atoi char-ptr))
-	 (:int64
-	  (uffi:with-foreign-object (high32-ptr :int)
+	 (:uint32
+	  (strtoul char-ptr))
+	 (:uint
+	  (strtoul char-ptr))
+	 ((:int64 :uint64)
+	  (uffi:with-foreign-object (high32-ptr :unsigned-int)
 	    (let ((low32 (atol64 char-ptr high32-ptr))
-		  (high32 (uffi:deref-pointer high32-ptr :int)))
+		  (high32 (uffi:deref-pointer high32-ptr :unsigned-int)))
 	      (if (zerop high32)
 		  low32
-		  (make-64-bit-integer high32 low32)))))
+		(make-64-bit-integer high32 low32)))))
+	 (:blob
+	  (if length
+	      (uffi:convert-from-foreign-usb8 char-ptr length)
+	    (error "Can't return blob since length is not specified.")))
 	 (t
+	  ;; sb-unicode still broken with converting with length, assume
+	  ;; that string is null terminated
+	  #+sb-unicode
+	  (uffi:convert-from-foreign-string char-ptr :locale :none)
+	  #-sb-unicode
           (if length
 	      (uffi:convert-from-foreign-string char-ptr :locale :none
                                                 :null-terminated-p nil