projects
/
uffi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r2184: *** empty log message ***
[uffi.git]
/
src
/
primitives.cl
diff --git
a/src/primitives.cl
b/src/primitives.cl
index 294dcdc9b784a35f6efe09bab73cdd790f217cc1..7a57a949aa4c5d7352fd01f472b92977a4f8a354 100644
(file)
--- a/
src/primitives.cl
+++ b/
src/primitives.cl
@@
-1,4
+1,4
@@
-;;;; -*- Mode: L
ISP; Syntax: ANSI-Common-Lisp; Base: 10
-*-
+;;;; -*- Mode: L
isp; Syntax: ANSI-Common-Lisp; Base: 10; Package: UFFI
-*-
;;;; *************************************************************************
;;;; FILE IDENTIFICATION
;;;;
;;;; *************************************************************************
;;;; FILE IDENTIFICATION
;;;;
@@
-7,7
+7,7
@@
;;;; Programmer: Kevin M. Rosenberg
;;;; Date Started: Feb 2002
;;;;
;;;; Programmer: Kevin M. Rosenberg
;;;; Date Started: Feb 2002
;;;;
-;;;; $Id: primitives.cl,v 1.
6 2002/03/15 11:38:13
kevin Exp $
+;;;; $Id: primitives.cl,v 1.
20 2002/06/27 14:35:24
kevin Exp $
;;;;
;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
;;;;
;;;;
;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
;;;;
@@
-23,7
+23,8
@@
"Macro to define a constant and to export it"
`(eval-when (:compile-toplevel :load-toplevel :execute)
(defconstant ,name ,value)
"Macro to define a constant and to export it"
`(eval-when (:compile-toplevel :load-toplevel :execute)
(defconstant ,name ,value)
- ,(if export (list 'export `(quote ,name)) (values))))
+ ,(when export (list 'export `(quote ,name)))
+ ',name))
(defmacro def-type (name type)
"Generates a (deftype) statement for CL. Currently, only CMUCL
(defmacro def-type (name type)
"Generates a (deftype) statement for CL. Currently, only CMUCL
@@
-37,17
+38,8
@@
supports takes advantage of this optimization."
)
(defmacro null-char-p (val)
)
(defmacro null-char-p (val)
- `(if (or (eql ,val 0)
- (eq ,val #\Null))
- t
- nil))
-
-(defmacro ensure-char (val)
- `(etypecase ,val
- (integer
- (code-char ,val))
- (character
- ,val)))
+ "Returns T if character is NULL"
+ `(zerop ,val))
(defmacro def-foreign-type (name type)
#+lispworks `(fli:define-c-typedef ,name ,(convert-from-uffi-type type :type))
(defmacro def-foreign-type (name type)
#+lispworks `(fli:define-c-typedef ,name ,(convert-from-uffi-type type :type))
@@
-64,7
+56,8
@@
supports takes advantage of this optimization."
(defconstant +cmu-def-type-list+
'((:char . (alien:signed 8))
(:unsigned-char . (alien:unsigned 8))
(defconstant +cmu-def-type-list+
'((:char . (alien:signed 8))
(:unsigned-char . (alien:unsigned 8))
- (:byte . (alien:unsigned 8))
+ (:byte . (alien:signed 8))
+ (:unsigned-byte . (alien:unsigned 8))
(:short . (alien:signed 16))
(:unsigned-short . (alien:unsigned 16))
(:int . (alien:signed 32))
(:short . (alien:signed 16))
(:unsigned-short . (alien:unsigned 16))
(:int . (alien:signed 32))
@@
-73,41
+66,52
@@
supports takes advantage of this optimization."
(:unsigned-long . (alien:unsigned 32))
(:float . alien:single-float)
(:double . alien:double-float)
(:unsigned-long . (alien:unsigned 32))
(:float . alien:single-float)
(:double . alien:double-float)
- ))
+ )
+ "Conversions in CMUCL or def-foreign-type are different thatn in def-function")
+
+(defparameter +type-conversion-list+ nil)
#+cmu
#+cmu
-(
defconstant
+type-conversion-list+
+(
setq
+type-conversion-list+
'((* . *) (:void . c-call:void)
(:short . c-call:short)
(:pointer-void . (* t))
(:cstring . c-call:c-string)
(:char . c-call:char)
(:unsigned-char . (alien:unsigned 8))
'((* . *) (:void . c-call:void)
(:short . c-call:short)
(:pointer-void . (* t))
(:cstring . c-call:c-string)
(:char . c-call:char)
(:unsigned-char . (alien:unsigned 8))
- (:byte . (alien:unsigned 8))
+ (:byte . (alien:signed 8))
+ (:unsigned-byte . (alien:unsigned 8))
+ (:short . c-call:unsigned-short)
+ (:unsigned-short . c-call:unsigned-short)
(:int . alien:integer) (:unsigned-int . c-call:unsigned-int)
(:long . c-call:long) (:unsigned-long . c-call:unsigned-long)
(:float . c-call:float) (:double . c-call:double)
(:array . alien:array)))
#+allegro
(:int . alien:integer) (:unsigned-int . c-call:unsigned-int)
(:long . c-call:long) (:unsigned-long . c-call:unsigned-long)
(:float . c-call:float) (:double . c-call:double)
(:array . alien:array)))
#+allegro
-(
defconstant
+type-conversion-list+
+(
setq
+type-conversion-list+
'((* . *) (:void . :void)
(:short . :short)
(:pointer-void . (* :void))
'((* . *) (:void . :void)
(:short . :short)
(:pointer-void . (* :void))
- (:cstring . (* :char))
+ (:cstring . (* :unsigned-char))
+ (:byte . :char)
+ (:unsigned-byte . :unsigned-byte)
(:char . :char)
(:unsigned-char . :unsigned-char)
(:char . :char)
(:unsigned-char . :unsigned-char)
- (:byte . :byte)
(:int . :int) (:unsigned-int . :unsigned-int)
(:long . :long) (:unsigned-long . :unsigned-long)
(:float . :float) (:double . :double)
(:array . :array)))
#+lispworks
(:int . :int) (:unsigned-int . :unsigned-int)
(:long . :long) (:unsigned-long . :unsigned-long)
(:float . :float) (:double . :double)
(:array . :array)))
#+lispworks
-(
defconstant
+type-conversion-list+
+(
setq
+type-conversion-list+
'((* . :pointer) (:void . :void)
(:short . :short)
(:pointer-void . (:pointer :void))
'((* . :pointer) (:void . :void)
(:short . :short)
(:pointer-void . (:pointer :void))
- (:cstring . (:pointer :char))
- (:char . :char)
+ (:cstring . (:reference-pass (:ef-mb-string :external-format :latin-1)
+ :allow-null t))
+ (:cstring-returning . (:reference (:ef-mb-string :external-format :latin-1) :allow-null t))
+ (:byte . :byte)
+ (:unsigned-byte . (:unsigned :byte))
+ (:char . :char)
(:unsigned-char . (:unsigned :char))
(:int . :int) (:unsigned-int . (:unsigned :int))
(:long . :long) (:unsigned-long . (:unsigned :long))
(:unsigned-char . (:unsigned :char))
(:int . :int) (:unsigned-int . (:unsigned :int))
(:long . :long) (:unsigned-long . (:unsigned :long))
@@
-121,8
+125,11
@@
supports takes advantage of this optimization."
(dolist (type +cmu-def-type-list+)
(setf (gethash (car type) +cmu-def-type-hash+) (cdr type)))
(dolist (type +cmu-def-type-list+)
(setf (gethash (car type) +cmu-def-type-hash+) (cdr type)))
-(defmethod ph (&optional (os *standard-output*))
- (maphash #'(lambda (k v) (format os "~&~S => ~S" k v)) +type-conversion-hash+))
+(defun basic-convert-from-uffi-type (type)
+ (let ((found-type (gethash type +type-conversion-hash+)))
+ (if found-type
+ found-type
+ type)))
(defun convert-from-uffi-type (type context)
"Converts from a uffi type to an implementation specific type"
(defun convert-from-uffi-type (type context)
"Converts from a uffi type to an implementation specific type"
@@
-137,17
+144,15
@@
supports takes advantage of this optimization."
(let ((cmu-type (gethash type +cmu-def-type-hash+)))
(if cmu-type
cmu-type
(let ((cmu-type (gethash type +cmu-def-type-hash+)))
(if cmu-type
cmu-type
- (let ((found-type (gethash type +type-conversion-hash+)))
- (if found-type
- found-type
- type)))))
+ (basic-convert-from-uffi-type type))))
+ #+lispworks
+ ((and (eq context :return)
+ (eq type :cstring))
+ (basic-convert-from-uffi-type :cstring-returning))
(t
(t
- (let ((found-type (gethash type +type-conversion-hash+)))
- (if found-type
- found-type
- type))))
- (cons (convert-from-uffi-type (first type) context)
- (convert-from-uffi-type (rest type) context))))
+ (basic-convert-from-uffi-type type)))
+ (cons (convert-from-uffi-type (first type) context)
+ (convert-from-uffi-type (rest type) context))))