r2908: *** empty log message ***

[uffi.git] / src / objects.cl

diff --git a/src/objects.cl b/src/objects.cl
index fd5ac67d55c6497deb05f29adef20c7d52747748..0323da9232f24db7763a23abe3b398e0087c894b 100644 (file)
--- a/src/objects.cl
+++ b/src/objects.cl
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: objects.cl,v 1.19 2002/06/28 21:08:00 kevin Exp $
+;;;; $Id: objects.cl,v 1.26 2002/09/30 09:08:48 kevin Exp $
 ;;;;
 ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -19,6 +19,20 @@
 (declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0)))
 (in-package :uffi)
 
+(defun size-of-foreign-type (type)
+  #+lispworks (fli:size-of type)
+  #+allegro (ff:sizeof-fobject type)
+  #+cmu  (ash (eval `(alien:alien-size ,type)) -3) ;; convert from bits to bytes
+  #+clisp (values (ffi:size-of type))
+  #+(and mcl (not openmcl))
+  (let ((mcl-type (ccl:find-mactype type nil t)))
+    (if mcl-type 
+       (ccl::mactype-record-size mcl-type)
+      (ccl::record-descriptor-length (ccl:find-record-descriptor type t t)))) ;error if not a record
+  #+openmcl (ccl::%foreign-type-or-record-size type :bytes)
+  )
+
+
 (defmacro allocate-foreign-object (type &optional (size :unspecified))
   "Allocates an instance of TYPE. If size is specified, then allocate
 an array of TYPE with size SIZE. The TYPE parameter is evaluated."
@@ -29,7 +43,10 @@ an array of TYPE with size SIZE. The TYPE parameter is evaluated."
        #+lispworks
        `(fli:allocate-foreign-object :type ',(convert-from-uffi-type type :allocate))
        #+allegro
-       `(ff:allocate-fobject ,(convert-from-uffi-type type :allocate) :c))
+       `(ff:allocate-fobject ,(convert-from-uffi-type type :allocate) :c)
+       #+mcl
+       `(new-ptr ,(size-of-foreign-type (convert-from-uffi-type type :allocation)))
+       )
       (progn
        #+cmu
        `(alien:make-alien ,(convert-from-uffi-type (eval type) :allocation) ,size)
@@ -37,8 +54,9 @@ an array of TYPE with size SIZE. The TYPE parameter is evaluated."
        `(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)
-      )
-  ))
+       #+mcl
+       `(new-ptr (* ,size ,(size-of-foreign-type (convert-from-uffi-type type :allocation))))
+       )))
 
 (defmacro free-foreign-object (obj)
   #+cmu
@@ -47,27 +65,24 @@ an array of TYPE with size SIZE. The TYPE parameter is evaluated."
   `(fli:free-foreign-object ,obj)
   #+allegro
   `(ff:free-fobject ,obj)
+  #+mcl
+  `(dispose-ptr ,obj)
   )
 
 (defmacro null-pointer-p (obj)
   #+lispworks `(fli:null-pointer-p ,obj)
   #+allegro `(zerop ,obj)
   #+cmu   `(alien:null-alien ,obj)
+  #+mcl   `(ccl:%null-ptr-p ,obj)
   )
 
-(defmacro size-of-foreign-type (type)
-  #+lispworks `(fli:size-of ,type)
-  #+allegro `(ff:sizeof-fobject ,type)
-  #+cmu   `(alien:alien-size ,type)
-  )
-
-
 (defmacro make-null-pointer (type)
-  #+(or allegro cmu) (declare (ignore type))
+  #+(or allegro cmu mcl) (declare (ignore type))
   
   #+cmu `(system:int-sap 0)
   #+allegro 0
   #+lispworks `(fli:make-pointer :address 0 :type ,type)
+  #+mcl `(ccl:%null-ptr)
   )
 
 (defmacro char-array-to-pointer (obj)
@@ -75,6 +90,7 @@ an array of TYPE with size SIZE. The TYPE parameter is evaluated."
   #+lispworks `(fli:make-pointer :type '(:unsigned :char)
                                :address (fli:pointer-address ,obj))
   #+allegro obj
+  #+mcl obj
   )
 
 (defmacro deref-pointer (ptr type)
@@ -83,26 +99,31 @@ an array of TYPE with size SIZE. The TYPE parameter is evaluated."
   #+cmu  `(alien:deref ,ptr)
   #+lispworks `(fli:dereference ,ptr)
   #+allegro `(ff:fslot-value-typed ,(convert-from-uffi-type type :deref) :c ,ptr)
-)
+  #+mcl `(ccl:pref ,ptr ,(convert-from-uffi-type type :deref))
+  )
+
+#+mcl
+(defmacro deref-pointer-set (ptr type value)
+  `(setf (ccl:pref ,ptr ,(convert-from-uffi-type type :deref)) ,value))
+
+#+mcl
+(defsetf deref-pointer deref-pointer-set)
 
-#+lispworks ;; with LW, deref is a character
+#+(or lispworks (and mcl (not openmcl))) ;; with LW, deref is a character
 (defmacro ensure-char-character (obj)
-  obj
-  )
+  obj)
 
-#+(or allegro cmu)
+#+(or allegro cmu openmcl)
 (defmacro ensure-char-character (obj)
-  `(code-char ,obj)
-  )
+  `(code-char ,obj))
   
-#+lispworks
+#+(or lispworks (and mcl (not openmcl)))
 (defmacro ensure-char-integer (obj)
  `(char-code ,obj))
 
-#+(or allegro cmu)
+#+(or allegro cmu openmcl)
 (defmacro ensure-char-integer (obj)
-  obj
-  ) ;; (* :char) dereference is already an integer
+  obj)
 
 (defmacro pointer-address (obj)
   #+cmu
@@ -111,9 +132,12 @@ an array of TYPE with size SIZE. The TYPE parameter is evaluated."
   `(fli:pointer-address ,obj)
   #+allegro
   obj
+  #+mcl
+  `(ccl:%ptr-to-int ,obj)  
   )
 
 ;; TYPE is evaluated.
+#-mcl
 (defmacro with-foreign-object ((var type) &rest body)
   #-(or cmu lispworks) ; default version
   `(let ((,var (allocate-foreign-object ,type)))
@@ -131,7 +155,7 @@ an array of TYPE with size SIZE. The TYPE parameter is evaluated."
     ,@body)
   )
 
-
+#-mcl
 (defmacro with-foreign-objects (bindings &rest body)
   (if bindings
       `(with-foreign-object ,(car bindings)
@@ -139,5 +163,21 @@ an array of TYPE with size SIZE. The TYPE parameter is evaluated."
          ,@body))
       `(progn ,@body)))
 
-           
+#+mcl
+(defmacro with-foreign-objects (bindings &rest body)
+  (let ((params nil) type count)
+    (dolist (spec (reverse bindings)) ;keep order - macroexpands to let*
+      (setf type (convert-from-uffi-type (eval (nth 1 spec)) :allocate))
+      (setf count 1)
+      (when (and (listp type) (eq (first type) :array))
+        (setf count (nth 2 type))
+        (unless (integerp count) (error "Invalid size for array: ~a" type))
+        (setf type (nth 1 type)))
+      (push (list (first spec) (* count (size-of-foreign-type type))) params))
+    `(ccl:%stack-block ,params ,@body)))
                                 
+#+mcl
+(defmacro with-foreign-object ((var type) &rest body)
+  `(with-foreign-objects ((,var ,type)) 
+     ,@body))
+