r5498: *** empty log message ***

[uffi.git] / src / primitives.lisp

diff --git a/src/primitives.lisp b/src/primitives.lisp
index 06dd03058dbf800194cc61084781a60d6e290924..1e860fb5b582979891027899ad9174a0bb15b189 100644 (file)
--- a/src/primitives.lisp
+++ b/src/primitives.lisp
@@ -2,12 +2,12 @@
 ;;;; *************************************************************************
 ;;;; 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.7 2002/12/13 22:49:09 kevin Exp $
+;;;; $Id: primitives.lisp,v 1.11 2003/08/14 21:58:29 kevin Exp $
 ;;;;
 ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -16,8 +16,7 @@
 ;;;; (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"))
@@ -83,15 +82,18 @@ supports takes advantage of this optimization."
   )
 
 (eval-when (:compile-toplevel :load-toplevel :execute)
-  (defvar +type-conversion-hash+ (make-hash-table :size 20))
-  #+(or cmu sbcl scl) (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 scl)
-(defparameter *cmu-sbcl-def-type-list* nil)
+(defvar *cmu-sbcl-def-type-list* nil)
 
 #+(or cmu scl)
-(defparameter *cmu-sbcl-def-type-list*
+(defvar *cmu-sbcl-def-type-list*
     '((:char . (alien:signed 8))
       (:unsigned-char . (alien:unsigned 8))
       (:byte . (alien:signed 8))
@@ -107,7 +109,7 @@ supports takes advantage of this optimization."
       )
   "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))
@@ -123,19 +125,18 @@ supports takes advantage of this optimization."
       )
   "Conversions in SBCL for def-foreign-type are different than in def-function")
 
-(defparameter *type-conversion-list* nil)
+(defvar *type-conversion-list* nil)
 
 #+(or cmu scl)
 (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:signed 8))
       (:unsigned-byte . (alien:unsigned 8))
-      (:short . c-call:unsigned-short) 
+      (:short . c-call: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)
@@ -145,14 +146,13 @@ supports takes advantage of this optimization."
 #+sbcl
 (setq *type-conversion-list*
     '((* . *) (:void . sb-alien:void) 
-      (:short . sb-alien:short)
       (:pointer-void . (* t))
       (:cstring . sb-alien:c-string)
       (:char . sb-alien:char) 
       (:unsigned-char . (sb-alien:unsigned 8))
       (:byte . (sb-alien:signed 8))
       (:unsigned-byte . (sb-alien:unsigned 8))
-      (:short . sb-alien:unsigned-short) 
+      (:short . sb-alien:short)
       (:unsigned-short . sb-alien:unsigned-short)
       (:int . sb-alien:integer) (:unsigned-int . sb-alien:unsigned-int) 
       (:long . sb-alien:long) (:unsigned-long . sb-alien:unsigned-long)
@@ -180,11 +180,11 @@ supports takes advantage of this optimization."
       (:short . :short)
       (:pointer-void . (:pointer :void))
       (:cstring . (:reference-pass (:ef-mb-string :external-format
-                                                 (:latin-1 :eol-style :lf)
-                                                 :allow-null t))
+                                   (:latin-1 :eol-style :lf))
+                  :allow-null t))
       (:cstring-returning . (:reference (:ef-mb-string :external-format
-                                                      (:latin-1 :eol-style :lf)
-                                                      :allow-null t))
+                                        (:latin-1 :eol-style :lf))
+                            :allow-null t))
       (:byte . :byte)
       (:unsigned-byte . (:unsigned :byte))
       (:char . :char)
@@ -223,6 +223,23 @@ supports takes advantage of this optimization."
        (: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)))
 
@@ -230,6 +247,14 @@ supports takes advantage of this optimization."
 (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
@@ -257,6 +282,9 @@ supports takes advantage of this optimization."
        (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)))