X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=uffi%2Fclsql-uffi.lisp;h=c12f693368887598e3d41852d317cf446b81c288;hp=331db7d3ab795d3f974dc09f834ca180f452532b;hb=d9f41af62750c622945bb17b622a39689ee5b840;hpb=8b42ade98431d9089422974c26d7ec593173d062

diff --git a/uffi/clsql-uffi.lisp b/uffi/clsql-uffi.lisp
index 331db7d..c12f693 100644
--- a/uffi/clsql-uffi.lisp
+++ b/uffi/clsql-uffi.lisp
@@ -28,9 +28,9 @@
        (length-auto-list (length auto-list)))
       ((= i length-auto-list)
        (nreverse new-types))
-    (declaim (fixnum length-types length-auto-list i))
+    (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
@@ -74,13 +74,21 @@
 (uffi:def-function "atol64"
     ((str (* :unsigned-char))
      (high32 (* :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+)))
@@ -90,7 +98,7 @@
 (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,7 +108,7 @@
        (case type
 	 (:double
 	  (atof char-ptr))
-	 ((or :int32 :int)
+	 ((:int32 :int)
 	  (atoi char-ptr))
 	 (:int64
 	  (uffi:with-foreign-object (high32-ptr :int)