X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/clg/blobdiff_plain/112ac1d33aa8f9b7f3d2f9542d15431f152b1d35..5de2b5f6a587aff7590db74f3aa7eb622cd8904c:/glib/ffi.lisp

diff --git a/glib/ffi.lisp b/glib/ffi.lisp
index 5f2fc0c..2d24742 100644
--- a/glib/ffi.lisp
+++ b/glib/ffi.lisp
@@ -20,7 +20,7 @@
 ;; TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 ;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-;; $Id: ffi.lisp,v 1.20 2005-04-23 16:48:50 espen Exp $
+;; $Id: ffi.lisp,v 1.25 2006-02-19 22:25:31 espen Exp $
 
 (in-package "GLIB")
 
@@ -189,7 +189,10 @@ (defun mkbinding (name return-type &rest arg-types)
 	  (%heap-alien
 	   (make-heap-alien-info
 	    :type (parse-alien-type ftype #+sbcl nil)
-	    :sap-form (foreign-symbol-address name))))
+	    :sap-form (let ((address (foreign-symbol-address name)))
+			(etypecase address
+			  (integer (int-sap address))
+			  (system-area-pointer address))))))
 	 (translate-arguments (mapcar #'to-alien-function arg-types))
 	 (translate-return-value (from-alien-function return-type))
 	 (cleanup-arguments (mapcar #'cleanup-function arg-types)))
@@ -202,33 +205,66 @@ (defun mkbinding (name return-type &rest arg-types)
 	  (mapc #'funcall cleanup-arguments args)))))
 
 
-(defmacro defcallback (name (return-type &rest args) &body body)
-  (let ((def-callback #+cmu'alien:def-callback 
-	              #+sbcl'sb-alien:define-alien-function))
-    `(,def-callback ,name 
-         (,(alien-type return-type) 
-	  ,@(mapcar #'(lambda (arg)
-			(destructuring-bind (name type) arg
-			  `(,name ,(alien-type type))))
-		    args))
-       ,(to-alien-form 
-	 `(let (,@(delete nil
-		     (mapcar #'(lambda (arg)
-				 (destructuring-bind (name type) arg
-				   (let ((from-alien 
-					  (from-alien-form name type)))
-				     (unless (eq name from-alien)
-				       `(,name ,from-alien)))))
-		      args)))
-	    ,@body)
-	 return-type))))
 
-#+sbcl
-(defun callback (af)
-  (sb-alien:alien-function-sap af))
+;;;; C callbacks
+
+(defmacro define-callback (name return-type args &body body)
+  (let ((define-callback 
+	  #+cmu'alien:def-callback 	              
+	  #+(and sbcl alien-callbacks)'sb-alien::define-alien-callback
+	  #+(and sbcl (not alien-callbacks))'sb-alien:define-alien-function))
+    (multiple-value-bind (doc declaration body)
+	(cond
+	 ((and (stringp (first body)) (eq (cadr body) 'declare))
+	  (values (first body) (second body) (cddr body)))
+	 ((stringp (first body))
+	  (values (first body) nil (rest body)))
+	 ((eq (caar body) 'declare)
+	  (values nil (first body) (rest body)))
+	 (t (values nil nil body)))
+      `(,define-callback ,name 
+	 #+(and sbcl alien-callbacks),(alien-type return-type) 
+         (#+(or cmu (and sbcl (not alien-callbacks))),(alien-type return-type)
+	 ,@(mapcar #'(lambda (arg)
+		       (destructuring-bind (name type) arg
+			 `(,name ,(alien-type type))))
+		   args))
+	 ,@(when doc (list doc))
+	 ,(to-alien-form 
+	   `(let (,@(loop
+		     for (name type) in args
+		     as from-alien-form = (callback-from-alien-form name type)
+		     collect `(,name ,from-alien-form)))
+	      ,@(when declaration (list declaration))
+	      (unwind-protect
+		  (progn ,@body)	      
+ 	      ,@(loop 
+ 		 for (name type) in args
+ 		 do (callback-cleanup-form name type))))
+
+	 return-type)))))
+
+(defun callback-address (callback)
+  #+cmu(alien::callback-trampoline callback)
+  #+(and sbcl (not alien-callbacks))(sb-alien:alien-function-sap callback)
+  #+(and sbcl alien-callbacks)(sb-alien:alien-sap callback))
 
 #+sbcl
-(deftype callback () 'sb-alien:alien-function)
+(deftype callback () 
+  #-alien-callbacks'sb-alien:alien-function
+  #+alien-callbacks'sb-alien:alien)
+
+
+;;; These are for backward compatibility
+
+(defmacro defcallback (name (return-type &rest args) &body body)
+  `(define-callback ,name ,return-type ,args ,@body))
+
+#-cmu
+(defun callback (callback)
+  (callback-address callback))
+
+
 
 ;;;; Definitons and translations of fundamental types
 
@@ -238,7 +274,7 @@     (defgeneric ,name (,@args type &rest args)
       ,@(when documentation `((:documentation ,documentation))))
     (defmethod ,name (,@args (type symbol) &rest args)
       (let ((class (find-class type nil)))
-	(if class 
+	(if (typep class 'standard-class)
 	    (apply #',name ,@args class args)
 	  (multiple-value-bind (super-type expanded-p)
 	      (type-expand-1 (cons type args))
@@ -256,6 +292,8 @@ (def-type-method to-alien-form (form))
 (def-type-method from-alien-form (form))
 (def-type-method cleanup-form (form)
   "Creates a form to clean up after the alien call has finished.")
+(def-type-method callback-from-alien-form (form))
+(def-type-method callback-cleanup-form (form))
 
 (def-type-method to-alien-function ())
 (def-type-method from-alien-function ())
@@ -327,6 +365,16 @@ (defmethod cleanup-function ((type t) &rest args)
   (declare (ignore type args))
   #'identity)
 
+;; This does not really work as def-type-method is badly broken and
+;; needs a redesign, so we need to add a lots of redundant methods
+(defmethod callback-from-alien-form (form (type t) &rest args)
+;  (apply #'copy-from-alien-form form type args))
+  (apply #'from-alien-form form type args))
+
+(defmethod callback-cleanup-form (form (type t) &rest args)
+  (declare (ignore form type args))
+  nil)
+
 (defmethod destroy-function ((type t) &rest args)
   (declare (ignore type args))
   #'(lambda (location &optional offset)
@@ -344,7 +392,6 @@ (defmethod copy-from-alien-form  (form (type t) &rest args)
 (defmethod copy-from-alien-function  ((type t) &rest args)
   (apply #'from-alien-function type args))
 
-
 (defmethod alien-type ((type (eql 'signed-byte)) &rest args)
   (declare (ignore type))
   (destructuring-bind (&optional (size '*)) args
@@ -386,13 +433,17 @@ (defmethod reader-function ((type (eql 'signed-byte)) &rest args)
   (destructuring-bind (&optional (size '*)) args
     (let ((size (if (eq size '*) +bits-of-int+ size)))
       (ecase size
-	(8 #'(lambda (sap &optional (offset 0)) 
+	(8 #'(lambda (sap &optional (offset 0) weak-p) 
+	       (declare (ignore weak-p))
 	       (signed-sap-ref-8 sap offset)))
-	(16 #'(lambda (sap &optional (offset 0)) 
+	(16 #'(lambda (sap &optional (offset 0) weak-p)
+		(declare (ignore weak-p))
 		(signed-sap-ref-16 sap offset)))
-	(32 #'(lambda (sap &optional (offset 0)) 
+	(32 #'(lambda (sap &optional (offset 0) weak-p) 
+		(declare (ignore weak-p)) 
 		(signed-sap-ref-32 sap offset)))
-	(64 #'(lambda (sap &optional (offset 0))
+	(64 #'(lambda (sap &optional (offset 0) weak-p) 
+		(declare (ignore weak-p))
 		(signed-sap-ref-64 sap offset)))))))
 
 (defmethod alien-type ((type (eql 'unsigned-byte)) &rest args)
@@ -428,13 +479,17 @@ (defmethod reader-function ((type (eql 'unsigned-byte)) &rest args)
   (destructuring-bind (&optional (size '*)) args
     (let ((size (if (eq size '*) +bits-of-int+ size)))
       (ecase size
-	(8 #'(lambda (sap &optional (offset 0)) 
+	(8 #'(lambda (sap &optional (offset 0) weak-p)
+	       (declare (ignore weak-p))
 	       (sap-ref-8 sap offset)))
-	(16 #'(lambda (sap &optional (offset 0)) 
+	(16 #'(lambda (sap &optional (offset 0) weak-p)
+		(declare (ignore weak-p)) 
 		(sap-ref-16 sap offset)))
-	(32 #'(lambda (sap &optional (offset 0)) 
+	(32 #'(lambda (sap &optional (offset 0) weak-p)
+		(declare (ignore weak-p)) 
 		(sap-ref-32 sap offset)))
-	(64 #'(lambda (sap &optional (offset 0))
+	(64 #'(lambda (sap &optional (offset 0) weak-p)
+		(declare (ignore weak-p))
 		(sap-ref-64 sap offset)))))))
   
   
@@ -488,7 +543,8 @@ (defmethod writer-function ((type (eql 'single-float)) &rest args)
 
 (defmethod reader-function ((type (eql 'single-float)) &rest args)
   (declare (ignore type args))
-  #'(lambda (sap &optional (offset 0)) 
+  #'(lambda (sap &optional (offset 0) weak-p)
+      (declare (ignore weak-p))
       (sap-ref-single sap offset)))
 
 
@@ -516,7 +572,8 @@ (defmethod writer-function ((type (eql 'double-float)) &rest args)
 
 (defmethod reader-function ((type (eql 'double-float)) &rest args)
   (declare (ignore type args))
-  #'(lambda (sap &optional (offset 0)) 
+  #'(lambda (sap &optional (offset 0) weak-p)
+      (declare (ignore weak-p))
       (sap-ref-double sap offset)))
 
 
@@ -535,7 +592,8 @@ (defmethod writer-function ((type (eql 'base-char)) &rest args)
 
 (defmethod reader-function ((type (eql 'base-char)) &rest args)
   (declare (ignore type args))
-  #'(lambda (location &optional (offset 0))
+  #'(lambda (location &optional (offset 0) weak-p)
+      (declare (ignore weak-p))
       (code-char (sap-ref-8 location offset))))
 
 
@@ -570,6 +628,9 @@ (defmethod to-alien-function ((type (eql 'string)) &rest args)
       (let ((utf8 (%deport-utf8-string string)))
 	(copy-memory (vector-sap utf8) (length utf8)))))
 
+(defmethod callback-from-alien-form (form (type (eql 'string)) &rest args)
+  (apply #'copy-from-alien-form form type args))
+
 (defmethod from-alien-form (string (type (eql 'string)) &rest args)
   (declare (ignore type args))
   `(let ((string ,string))
@@ -600,6 +661,9 @@ (defmethod cleanup-function ((type (eql 'string)) &rest args)
       (unless (null-pointer-p string)
 	(deallocate-memory string))))
 
+(defmethod callback-from-alien-form (form (type (eql 'string)) &rest args)
+  (apply #'copy-from-alien-form form type args))
+
 (defmethod copy-from-alien-form (string (type (eql 'string)) &rest args)
   (declare (ignore type args))
   `(let ((string ,string))
@@ -629,7 +693,8 @@ (defmethod writer-function ((type (eql 'string)) &rest args)
 
 (defmethod reader-function ((type (eql 'string)) &rest args)
   (declare (ignore type args))
-  #'(lambda (location &optional (offset 0))
+  #'(lambda (location &optional (offset 0) weak-p)
+      (declare (ignore weak-p))
       (unless (null-pointer-p (sap-ref-sap location offset))
 	#+cmu(%naturalize-c-string (sap-ref-sap location offset))
 	#+sbcl(%naturalize-utf8-string (sap-ref-sap location offset)))))
@@ -691,7 +756,8 @@ (defmethod writer-function ((type (eql 'pathname)) &rest args)
 (defmethod reader-function ((type (eql 'pathname)) &rest args)
   (declare (ignore type args))
   (let ((string-reader (reader-function 'string)))
-  #'(lambda (location &optional (offset 0))
+  #'(lambda (location &optional (offset 0) weak-p)
+      (declare (ignore weak-p))
       (let ((string (funcall string-reader location offset)))
 	(when string
 	  (parse-namestring string))))))
@@ -720,6 +786,9 @@ (defmethod to-alien-function ((type (eql 'boolean)) &rest args)
   #'(lambda (boolean)
       (if boolean 1 0)))
 
+(defmethod callback-from-alien-form (form (type (eql 'boolean)) &rest args)
+  (apply #'from-alien-form form type args))
+
 (defmethod from-alien-form (boolean (type (eql 'boolean)) &rest args)
   (declare (ignore type args))
   `(not (zerop ,boolean)))
@@ -738,7 +807,8 @@ (defmethod writer-function ((type (eql 'boolean)) &rest args)
 (defmethod reader-function ((type (eql 'boolean)) &rest args)
   (declare (ignore type))
   (let ((reader (apply #'reader-function 'signed-byte args)))
-  #'(lambda (location &optional (offset 0))
+  #'(lambda (location &optional (offset 0) weak-p)
+      (declare (ignore weak-p))
       (not (zerop (funcall reader location offset))))))
 
 
@@ -790,7 +860,8 @@ (defmethod writer-function ((type (eql 'system-area-pointer)) &rest args)
 
 (defmethod reader-function ((type (eql 'system-area-pointer)) &rest args)
   (declare (ignore type args))
-  #'(lambda (location &optional (offset 0))
+  #'(lambda (location &optional (offset 0) weak-p)
+      (declare (ignore weak-p))
       (sap-ref-sap location offset)))
 
 
@@ -861,20 +932,20 @@ (defmethod alien-type ((type (eql 'callback)) &rest args)
   (declare (ignore type args))
   (alien-type 'pointer))
 
+#+nil
 (defmethod size-of ((type (eql 'callback)) &rest args)
   (declare (ignore type args))
   (size-of 'pointer))
 
 (defmethod to-alien-form (callback (type (eql 'callback)) &rest args)
   (declare (ignore type args))
-  #+cmu `(callback ,callback)
-  #+sbcl `(sb-alien:alien-function-sap ,callback))
+  `(callback-address ,callback))
 
 (defmethod to-alien-function ((type (eql 'callback)) &rest args)
   (declare (ignore type args))
-  #+cmu #'(lambda (callback) (callback callback))
-  #+sbcl #'sb-alien:alien-function-sap)
+  #'callback-address)
 
+#+nil(
 #+cmu
 (defun find-callback (pointer)
   (find pointer alien::*callbacks* :key #'callback-trampoline :test #'sap=))
@@ -900,7 +971,8 @@ (defmethod reader-function ((type (eql 'callback)) &rest args)
   (declare (ignore type args))
   (let ((reader (reader-function 'pointer))
 	(from-alien (from-alien-function 'callback)))
-  #'(lambda (location &optional (offset 0))
+  #'(lambda (location &optional (offset 0) weak-p)
+      (declare (ignore weak-p))
       (let ((pointer (funcall reader location offset)))
 	(unless (null-pointer-p pointer)
 	  (funcall from-alien pointer))))))
@@ -908,3 +980,4 @@ (defmethod reader-function ((type (eql 'callback)) &rest args)
 (defmethod unbound-value ((type (eql 'callback)) &rest args)
   (declare (ignore type args))
   (values t nil))
+)
\ No newline at end of file