X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Fobjects.lisp;h=cb6cd7f95c9c81bd92e1ae409b4023576eb511c4;hb=778b73f612acda97b1b9ff6d870ed3315a96239f;hp=eca0c8f57403f485a3094fee64885482a5e7bff6;hpb=4b044499e8537c1a0fe6251421b8d82b2a89b384;p=uffi.git diff --git a/src/objects.lisp b/src/objects.lisp index eca0c8f..cb6cd7f 100644 --- a/src/objects.lisp +++ b/src/objects.lisp @@ -2,12 +2,12 @@ ;;;; ************************************************************************* ;;;; FILE IDENTIFICATION ;;;; -;;;; Name: objects.cl +;;;; Name: objects.lisp ;;;; Purpose: UFFI source to handle objects and pointers ;;;; Programmer: Kevin M. Rosenberg ;;;; Date Started: Feb 2002 ;;;; -;;;; $Id: objects.lisp,v 1.5 2002/11/14 22:11:07 kevin Exp $ +;;;; $Id: objects.lisp,v 1.13 2003/06/06 21:59:18 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) (defun size-of-foreign-type (type) #+lispworks (fli:size-of type) @@ -58,7 +57,7 @@ an array of TYPE with size SIZE. The TYPE parameter is evaluated." #+lispworks `(fli:allocate-foreign-object :type ',(convert-from-uffi-type type :allocate) :nelems ,size) #+allegro - `(ff:allocate-fobject '(:array ,(convert-from-uffi-type (eval type) :allocate) ,(eval size)) :c) + `(ff:allocate-fobject (list :array (quote ,(convert-from-uffi-type type :allocate)) ,size) :c) #+mcl `(new-ptr (* ,size ,(size-of-foreign-type (convert-from-uffi-type type :allocation)))) ))) @@ -108,7 +107,7 @@ an array of TYPE with size SIZE. The TYPE parameter is evaluated." #+(or cmu scl) `(alien:deref ,ptr) #+sbcl `(sb-alien:deref ,ptr) #+lispworks `(fli:dereference ,ptr) - #+allegro `(ff:fslot-value-typed ,(convert-from-uffi-type type :deref) :c ,ptr) + #+allegro `(ff:fslot-value-typed (quote ,(convert-from-uffi-type type :deref)) :c ,ptr) #+mcl `(ccl:pref ,ptr ,(convert-from-uffi-type type :deref)) ) @@ -119,11 +118,11 @@ an array of TYPE with size SIZE. The TYPE parameter is evaluated." #+mcl (defsetf deref-pointer deref-pointer-set) -#+(or lispworks (and mcl (not openmcl))) ;; with LW, deref is a character +#+(or (and mcl (not openmcl))) ;; with LW, deref is a character (defmacro ensure-char-character (obj) obj) -#+(or allegro cmu sbcl scl openmcl) +#+(or allegro lispworks cmu sbcl scl openmcl) (defmacro ensure-char-character (obj) `(code-char ,obj)) @@ -135,6 +134,11 @@ an array of TYPE with size SIZE. The TYPE parameter is evaluated." (defmacro ensure-char-integer (obj) obj) +;; Returns the numeric value of a byte at a pointer +;; Highly optimized +(defmacro byte-value-at-pointer (ptr) + ) + (defmacro pointer-address (obj) #+(or cmu scl) `(system:sap-int (alien:alien-sap ,obj))