X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Fprimitives.lisp;h=6eafe7ffcd68a83b1c48641802f36fbc8bab0e33;hb=e481082fa36a5660e2d4191dcd5a8da2aecc41ca;hp=1e860fb5b582979891027899ad9174a0bb15b189;hpb=7612015bdcfa851374a4e8c6f3ff68a8dd8b9a9a;p=uffi.git diff --git a/src/primitives.lisp b/src/primitives.lisp index 1e860fb..6eafe7f 100644 --- a/src/primitives.lisp +++ b/src/primitives.lisp @@ -7,13 +7,10 @@ ;;;; Programmer: Kevin M. Rosenberg ;;;; Date Started: Feb 2002 ;;;; -;;;; $Id: primitives.lisp,v 1.11 2003/08/14 21:58:29 kevin Exp $ +;;;; $Id$ ;;;; -;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg +;;;; This file, part of UFFI, is Copyright (c) 2002-2005 by Kevin M. Rosenberg ;;;; -;;;; UFFI users are granted the rights to distribute and use this software -;;;; as governed by the terms of the Lisp Lesser GNU Public License -;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL. ;;;; ************************************************************************* (in-package #:uffi) @@ -85,13 +82,8 @@ supports takes advantage of this optimization." (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) -(defvar *cmu-sbcl-def-type-list* nil) - #+(or cmu scl) (defvar *cmu-sbcl-def-type-list* '((:char . (alien:signed 8)) @@ -102,12 +94,16 @@ supports takes advantage of this optimization." (:unsigned-short . (alien:unsigned 16)) (:int . (alien:signed 32)) (:unsigned-int . (alien:unsigned 32)) - (:long . (alien:signed 32)) - (:unsigned-long . (alien:unsigned 32)) + #-x86-64 (:long . (alien:signed 32)) + #-x86-64 (:unsigned-long . (alien:unsigned 32)) + #+x86-64 (:long . (alien:signed 64)) + #+x86-64 (:unsigned-long . (alien:unsigned 64)) (:float . alien:single-float) (:double . alien:double-float) + (:void . t) ) "Conversions in CMUCL for def-foreign-type are different than in def-function") + #+sbcl (defvar *cmu-sbcl-def-type-list* '((:char . (sb-alien:signed 8)) @@ -118,10 +114,13 @@ supports takes advantage of this optimization." (: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)) + #-x86-64 (:long . (sb-alien:signed 32)) + #-x86-64 (:unsigned-long . (sb-alien:unsigned 32)) + #+x86-64 (:long . (sb-alien:signed 64)) + #+x86-64 (:unsigned-long . (sb-alien:unsigned 64)) (:float . sb-alien:single-float) (:double . sb-alien:double-float) + (:void . t) ) "Conversions in SBCL for def-foreign-type are different than in def-function") @@ -147,14 +146,15 @@ supports takes advantage of this optimization." (setq *type-conversion-list* '((* . *) (:void . sb-alien:void) (:pointer-void . (* t)) - (:cstring . sb-alien:c-string) + #-sb-unicode(:cstring . sb-alien:c-string) + #+sb-unicode(:cstring . sb-alien:utf8-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:short) (:unsigned-short . sb-alien:unsigned-short) - (:int . sb-alien:integer) (:unsigned-int . sb-alien:unsigned-int) + (:int . sb-alien:int) (:unsigned-int . sb-alien:unsigned-int) (:long . sb-alien:long) (:unsigned-long . sb-alien:unsigned-long) (:float . sb-alien:float) (:double . sb-alien:double) (:array . sb-alien:array))) @@ -223,23 +223,6 @@ 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))) @@ -247,14 +230,6 @@ 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 @@ -282,9 +257,6 @@ 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))) @@ -299,9 +271,13 @@ supports takes advantage of this optimization." #+mcl `(:struct ,(%convert-from-uffi-type (cadr type) :struct)) #-mcl (%convert-from-uffi-type (cadr type) :struct) ) - (t - (cons (%convert-from-uffi-type (first type) context) - (%convert-from-uffi-type (rest type) context))))))) + (:union + #+mcl `(:union ,(%convert-from-uffi-type (cadr type) :union)) + #-mcl (%convert-from-uffi-type (cadr type) :union) + ) + (t + (cons (%convert-from-uffi-type (first type) context) + (%convert-from-uffi-type (rest type) context))))))) (defun convert-from-uffi-type (type context) (let ((result (%convert-from-uffi-type type context))) @@ -316,3 +292,20 @@ supports takes advantage of this optimization." ((and (eq (car result) :pointer) (eq context :allocation) :pointer)) (t result)))) +(eval-when (:compile-toplevel :load-toplevel :execute) + (when (char= #\a (schar (symbol-name '#:a) 0)) + (pushnew :uffi-lowercase-reader *features*)) + (when (not (string= (symbol-name '#:a) + (symbol-name '#:A))) + (pushnew :uffi-case-sensitive *features*))) + +(defun make-lisp-name (name) + (let ((converted (substitute #\- #\_ name))) + (intern + #+uffi-case-sensitive converted + #+(and (not uffi-lowercase-reader) (not uffi-case-sensitive)) (string-upcase converted) + #+(and uffi-lowercase-reader (not uffi-case-sensitive)) (string-downcase converted)))) + +(eval-when (:compile-toplevel :load-toplevel :execute) + (setq cl:*features* (delete :uffi-lowercase-reader *features*)) + (setq cl:*features* (delete :uffi-case-sensitive *features*)))