X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Fprimitives.lisp;h=ac4116ae8fd0ad9f0556d3ed4beb6db2f408cea4;hb=3f02f80ce6909ada82d9791172821756f967a844;hp=dc91044d8cead83512ae03def4157a43fa98f23c;hpb=caf4972e7f7d2562fe4a9977cf20d38bbf0e320f;p=uffi.git diff --git a/src/primitives.lisp b/src/primitives.lisp index dc91044..ac4116a 100644 --- 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.5 2002/10/16 11:56:43 kevin Exp $ +;;;; $Id$ ;;;; ;;;; 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,13 @@ 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)) ) -#+(or cmu sbcl scl) -(defparameter *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)) @@ -100,14 +97,18 @@ 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 -(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)) @@ -116,26 +117,28 @@ 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") -(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,16 +148,16 @@ 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) + #-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:unsigned-short) + (: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))) @@ -166,7 +169,7 @@ supports takes advantage of this optimization." (: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) @@ -179,9 +182,12 @@ supports takes advantage of this optimization." '((* . :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) @@ -268,9 +274,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))) @@ -285,3 +295,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*)))