projects
/
clsql.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r9552: Automated commit for Debian build of clsql upstream-version-2.11.5
[clsql.git]
/
uffi
/
clsql-uffi.lisp
diff --git
a/uffi/clsql-uffi.lisp
b/uffi/clsql-uffi.lisp
index 331db7d3ab795d3f974dc09f834ca180f452532b..1bb9a1a90d0b6085b4d5f3d6d754fb5b4f5e2e80 100644
(file)
--- a/
uffi/clsql-uffi.lisp
+++ b/
uffi/clsql-uffi.lisp
@@
-28,7
+28,7
@@
(length-auto-list (length auto-list)))
((= i length-auto-list)
(nreverse new-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)
(push t new-types) ;; types is shorted than num-fields
(push
(if (>= i length-types)
(push t new-types) ;; types is shorted than num-fields
(push
@@
-77,10
+77,17
@@
: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+)))
(defmacro split-64-bit-integer (int64)
`(values (ash ,int64 -32) (logand ,int64 +2^32-1+)))