;;;; *************************************************************************
;;;; FILE IDENTIFICATION
;;;;
-;;;; Name: primitives.cl
+;;;; Name: primitives.lisp
;;;; Purpose: UFFI source to handle immediate types
;;;; Programmer: Kevin M. Rosenberg
;;;; Date Started: Feb 2002
;;;;
-;;;; $Id: primitives.lisp,v 1.3 2002/10/14 01:51:15 kevin Exp $
+;;;; $Id: primitives.lisp,v 1.10 2003/08/14 21:40:13 kevin Exp $
;;;;
;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
;;;;
;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL.
;;;; *************************************************************************
-(declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0)))
-(in-package :uffi)
+(in-package #:uffi)
#+mcl
(defvar *keyword-package* (find-package "KEYWORD"))
supports takes advantage of this optimization."
#+(or lispworks allegro mcl cormanlisp) (declare (ignore type))
#+(or lispworks allegro mcl cormanlisp) `(deftype ,name () t)
- #+cmu
+ #+(or cmu scl)
`(deftype ,name () '(alien:alien ,(convert-from-uffi-type type :declare)))
#+sbcl
`(deftype ,name () '(sb-alien:alien ,(convert-from-uffi-type type :declare)))
(defmacro def-foreign-type (name type)
#+lispworks `(fli:define-c-typedef ,name ,(convert-from-uffi-type type :type))
#+allegro `(ff:def-foreign-type ,name ,(convert-from-uffi-type type :type))
- #+cmu `(alien:def-alien-type ,name ,(convert-from-uffi-type type :type))
- #+sbcl `(sb-alien:def-alien-type ,name ,(convert-from-uffi-type type :type))
+ #+(or cmu scl) `(alien:def-alien-type ,name ,(convert-from-uffi-type type :type))
+ #+sbcl `(sb-alien:define-alien-type ,name ,(convert-from-uffi-type type :type))
#+cormanlisp `(ct:defctype ,name ,(convert-from-uffi-type type :type))
#+mcl
(let ((mcl-type (convert-from-uffi-type type :type)))
)
(eval-when (:compile-toplevel :load-toplevel :execute)
- (defvar +type-conversion-hash+ (make-hash-table :size 20))
- #+(or cmu sbcl) (defvar *cmu-def-type-hash* (make-hash-table :size 20))
+ (defvar +type-conversion-hash+ (make-hash-table :size 20 :test #'eq))
+ #+(or cmu sbcl scl) (defvar *cmu-def-type-hash*
+ (make-hash-table :size 20 :test #'eq))
+ #+allegro (defvar *allegro-foreign-type-hash*
+ (make-hash-table :size 20 :test #'eq))
)
-#+(or cmu sbcl)
-(defparameter *cmu-sbcl-def-type-list* nil)
+#+(or cmu sbcl scl)
+(defvar *cmu-sbcl-def-type-list* nil)
-#+cmu
-(defparameter *cmu-sbcl-def-type-list*
+#+(or cmu scl)
+(defvar *cmu-sbcl-def-type-list*
'((:char . (alien:signed 8))
(:unsigned-char . (alien:unsigned 8))
(:byte . (alien:signed 8))
)
"Conversions in CMUCL for def-foreign-type are different than in def-function")
#+sbcl
-(defparameter *cmu-sbcl-def-type-list*
+(defvar *cmu-sbcl-def-type-list*
'((:char . (sb-alien:signed 8))
(:unsigned-char . (sb-alien:unsigned 8))
(:byte . (sb-alien:signed 8))
)
"Conversions in SBCL for def-foreign-type are different than in def-function")
-(defparameter *type-conversion-list* nil)
+(defvar *type-conversion-list* nil)
-#+cmu
+#+(or cmu scl)
(setq *type-conversion-list*
'((* . *) (:void . c-call:void)
(:short . c-call:short)
(:pointer-void . (* :void))
(:cstring . (* :unsigned-char))
(:byte . :char)
- (:unsigned-byte . :unsigned-byte)
+ (:unsigned-byte . :unsigned-char)
(:char . :char)
(:unsigned-char . :unsigned-char)
(:int . :int) (:unsigned-int . :unsigned-int)
'((* . :pointer) (:void . :void)
(:short . :short)
(:pointer-void . (:pointer :void))
- (: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))
+ (:cstring . (:reference-pass (:ef-mb-string :external-format
+ (:latin-1 :eol-style :lf))
+ :allow-null t))
+ (:cstring-returning . (:reference (:ef-mb-string :external-format
+ (:latin-1 :eol-style :lf))
+ :allow-null t))
(:byte . :byte)
(:unsigned-byte . (:unsigned :byte))
(:char . :char)
(:float . :single-float) (:double . :double-float)
(:array . :array)))
+#+allegro
+(defvar *allegro-foreign-type-list*
+ '((:char . :signed-byte)
+ (:unsigned-char . :unsigned-byte)
+ (:byte . :signed-byte)
+ (:unsigned-byte . :unsigned-byte)
+ (:short . :signed-word)
+ (:unsigned-short . :unsigned-word)
+ (:int . :signed-long)
+ (:unsigned-int . :unsigned-long32)
+ (:long . :signed-long)
+ (:unsigned-long . :unsigned-long)
+ (:float . :single-float)
+ (:double . :double-float)
+ )
+ "Conversion for Allegro's system:memref function")
+
(dolist (type *type-conversion-list*)
(setf (gethash (car type) +type-conversion-hash+) (cdr type)))
-#+(or cmu sbcl)
+#+(or cmu sbcl scl)
(dolist (type *cmu-sbcl-def-type-list*)
(setf (gethash (car type) *cmu-def-type-hash*) (cdr type)))
+#+allegro
+(dolist (type *allegro-foreign-type-list*)
+ (setf (gethash (car type) *allegro-foreign-type-hash*) (cdr type)))
+
+(defun foreign-var-type-convert (type)
+ #+allegro (gethash type *allegro-foreign-type-hash*))
+
+
(defun basic-convert-from-uffi-type (type)
(let ((found-type (gethash type +type-conversion-hash+)))
(if found-type
((and (or (eq context :routine) (eq context :return))
(eq type :cstring))
(setq type '((* :char) integer)))
- #+(or cmu sbcl)
+ #+(or cmu sbcl scl)
((eq context :type)
(let ((cmu-type (gethash type *cmu-def-type-hash*)))
(if cmu-type
(basic-convert-from-uffi-type :cstring-returning))
#+(and mcl (not openmcl))
((and (eq type :void) (eq context :return)) nil)
+ #+allegro
+ ((eq context :foreign-var)
+ (foreign-var-type-convert type))
(t
(basic-convert-from-uffi-type type)))
(let ((sub-type (car type)))