projects
/
clsql.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r10078: fix typo from manual patch application
[clsql.git]
/
uffi
/
clsql-uffi.lisp
diff --git
a/uffi/clsql-uffi.lisp
b/uffi/clsql-uffi.lisp
index da5276afaba79926e8da8a89fc13091bd45e5041..c12f693368887598e3d41852d317cf446b81c288 100644
(file)
--- a/
uffi/clsql-uffi.lisp
+++ b/
uffi/clsql-uffi.lisp
@@
-21,16
+21,16
@@
(defun canonicalize-type-list (types auto-list)
"Ensure a field type list meets expectations"
(defun canonicalize-type-list (types auto-list)
"Ensure a field type list meets expectations"
- (decla
im
(optimize (speed 3) (safety 0)))
+ (decla
re
(optimize (speed 3) (safety 0)))
(do ((i 0 (1+ i))
(new-types '())
(length-types (length types))
(length-auto-list (length auto-list)))
((= i length-auto-list)
(nreverse new-types))
(do ((i 0 (1+ i))
(new-types '())
(length-types (length types))
(length-auto-list (length auto-list)))
((= i length-auto-list)
(nreverse new-types))
- (decla
im
(fixnum length-types length-auto-list i))
+ (decla
re
(fixnum length-types length-auto-list i))
(if (>= i length-types)
(if (>= i length-types)
- (push t new-types) ;; types is shorte
d
than num-fields
+ (push t new-types) ;; types is shorte
r
than num-fields
(push
(case (nth i types)
(:int
(push
(case (nth i types)
(:int
@@
-74,23
+74,31
@@
(uffi:def-function "atol64"
((str (* :unsigned-char))
(high32 (* :int)))
(uffi:def-function "atol64"
((str (* :unsigned-char))
(high32 (* :int)))
+ :module "clsql-uffi"
:returning :unsigned-int)
(uffi:def-constant +2^32+ 4294967296)
: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)
(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))
(defmacro split-64-bit-integer (int64)
`(values (ash ,int64 -32) (logand ,int64 +2^32-1+)))
(uffi:def-type char-ptr-def (* :unsigned-char))
-(defun convert-raw-field (char-ptr types index)
+(defun convert-raw-field (char-ptr types index
&optional length
)
(declare (optimize (speed 3) (safety 0) (space 0))
(declare (optimize (speed 3) (safety 0) (space 0))
- (type char-ptr-def char-ptr))
- (let ((type (if (
list
p types)
+ (type char-ptr-def char-ptr))
+ (let ((type (if (
cons
p types)
(nth index types)
types)))
(cond
(nth index types)
types)))
(cond
@@
-100,7
+108,7
@@
(case type
(:double
(atof char-ptr))
(case type
(:double
(atof char-ptr))
- ((
or
:int32 :int)
+ ((:int32 :int)
(atoi char-ptr))
(:int64
(uffi:with-foreign-object (high32-ptr :int)
(atoi char-ptr))
(:int64
(uffi:with-foreign-object (high32-ptr :int)
@@
-110,5
+118,9
@@
low32
(make-64-bit-integer high32 low32)))))
(t
low32
(make-64-bit-integer high32 low32)))))
(t
- (uffi:convert-from-foreign-string char-ptr :locale :none)))))))
-
+ (if length
+ (uffi:convert-from-foreign-string char-ptr :locale :none
+ :null-terminated-p nil
+ :length length)
+ (uffi:convert-from-foreign-string char-ptr :locale :none))))))))
+