r2385: *** empty log message ***

[uffi.git] / src / primitives.cl

diff --git a/src/primitives.cl b/src/primitives.cl
index d41c75dc8eb40219aeb896840af970527a7c3f0e..c10766416a0ee348599e604e66f4ea2b56abc0c2 100644 (file)
--- a/src/primitives.cl
+++ b/src/primitives.cl
@@ -1,4 +1,4 @@
-;;;; -*- Mode: ANSI-Lisp; Syntax: ANSI-Common-Lisp; Base: 10 -*-
+;;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Base: 10; Package: UFFI -*-
 ;;;; *************************************************************************
 ;;;; FILE IDENTIFICATION
 ;;;;
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: primitives.cl,v 1.14 2002/03/23 16:32:39 kevin Exp $
+;;;; $Id: primitives.cl,v 1.22 2002/08/23 15:28:52 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,18 +47,20 @@ 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
 (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))
@@ -66,46 +70,85 @@ 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)
 
 #+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))
-      (: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)))
+
+#+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
-(defconstant +type-conversion-list+
+(setq +type-conversion-list+
     '((* . *) (:void . :void)
       (:short . :short)
       (:pointer-void . (* :void))
       (:cstring . (* :unsigned-char))
+      (:byte . :char)
+      (:unsigned-byte . :unsigned-byte)
       (: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
-(defconstant +type-conversion-list+
+(setq +type-conversion-list+
     '((* . :pointer) (:void . :void) 
       (:short . :short)
       (:pointer-void . (:pointer :void))
-      (:cstring . (:reference-pass :ef-mb-string :allow-null t))
-      (:cstring-returning . (:reference :ef-mb-string :allow-null t))
+      (: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)
-      (:byte :byte)
       (:unsigned-char . (:unsigned :char))
       (:int . :int) (:unsigned-int . (:unsigned :int))
       (:long . :long) (:unsigned-long . (:unsigned :long))
@@ -115,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)))
 
@@ -133,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