r2286: *** empty log message ***

diff --git a/uffi/primitives.cl b/uffi/primitives.cl
index 679765648aa14a567c3a3e2e959fc24d83c7c283..0873e3460e0b0b8a05da7c2745273ebeb9502296 100644 (file)
--- a/uffi/primitives.cl
+++ b/uffi/primitives.cl
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: primitives.cl,v 1.1 2002/08/02 14:39:12 kevin Exp $
+;;;; $Id: primitives.cl,v 1.2 2002/08/03 06:34:30 kevin Exp $
 ;;;;
 ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -35,6 +35,8 @@ supports takes advantage of this optimization."
   `(deftype ,name () t)
   #+cmu
   `(deftype ,name () '(alien:alien ,(convert-from-uffi-type type :declare)))
+  #+sbcl
+  `(deftype ,name () '(sb-alien:alien ,(convert-from-uffi-type type :declare)))
   )
 
 (defmacro null-char-p (val)
@@ -45,11 +47,12 @@ supports takes advantage of this optimization."
   #+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))
   )
 
 (eval-when (:compile-toplevel :load-toplevel :execute)
   (defvar +type-conversion-hash+ (make-hash-table :size 20))
-  #+cmu (defvar +cmu-def-type-hash+ (make-hash-table :size 20))
+  #+(or cmu sbcl) (defvar +cmu-def-type-hash+ (make-hash-table :size 20))
   )
 
 #+cmu
@@ -67,7 +70,23 @@ supports takes advantage of this optimization."
       (:float . alien:single-float)
       (:double . alien:double-float)
       )
-  "Conversions in CMUCL or def-foreign-type are different thatn in def-function")
+  "Conversions in CMUCL for def-foreign-type are different than in def-function")
+#+sbcl
+(defconstant +cmu-def-type-list+
+    '((:char . (sb-alien:signed 8))
+      (:unsigned-char . (sb-alien:unsigned 8))
+      (:byte . (sb-alien:signed 8))
+      (:unsigned-byte . (sb-alien:unsigned 8))
+      (:short . (sb-alien:signed 16))
+      (:unsigned-short . (sb-alien:unsigned 16))
+      (:int . (sb-alien:signed 32))
+      (:unsigned-int . (sb-alien:unsigned 32))
+      (:long . (sb-alien:signed 32))
+      (:unsigned-long . (sb-alien:unsigned 32))
+      (:float . sb-alien:single-float)
+      (:double . sb-alien:double-float)
+      )
+  "Conversions in SBCL for def-foreign-type are different than in def-function")
 
 (defparameter +type-conversion-list+ nil)
 
@@ -87,6 +106,24 @@ supports takes advantage of this optimization."
       (:long . c-call:long) (:unsigned-long . c-call:unsigned-long)
       (:float . c-call:float) (:double . c-call:double)
       (:array . alien:array)))
+
+#+sbcl
+(setq +type-conversion-list+
+    '((* . *) (:void . void) 
+      (:short . short)
+      (:pointer-void . (* t))
+      (:cstring . c-string)
+      (:char . char) 
+      (:unsigned-char . (sb-alien:unsigned 8))
+      (:byte . (sb-alien:signed 8))
+      (:unsigned-byte . (sb-alien:unsigned 8))
+      (:short . unsigned-short) 
+      (:unsigned-short . unsigned-short)
+      (:int . integer) (:unsigned-int . unsigned-int) 
+      (:long . long) (:unsigned-long . unsigned-long)
+      (:float . float) (:double . double)
+      (:array . array)))
+
 #+allegro
 (setq +type-conversion-list+
     '((* . *) (:void . :void)
@@ -121,7 +158,7 @@ supports takes advantage of this optimization."
 (dolist (type +type-conversion-list+)
   (setf (gethash (car type) +type-conversion-hash+) (cdr type)))
 
-#+cmu
+#+(or cmu sbcl)
 (dolist (type +cmu-def-type-list+)
   (setf (gethash (car type) +cmu-def-type-hash+) (cdr type)))
 
@@ -139,7 +176,7 @@ supports takes advantage of this optimization."
        ((and (or (eq context :routine) (eq context :return))
             (eq type :cstring))
        (setq type '((* :char) integer)))
-       #+cmu 
+       #+(or cmu sbcl)
        ((eq context :type)
        (let ((cmu-type (gethash type +cmu-def-type-hash+)))
          (if cmu-type