Changed to use of settable FOREIGN-LOCATION

[clg] / glib / ffi.lisp

diff --git a/glib/ffi.lisp b/glib/ffi.lisp
index 5f2fc0cd5ecbab4ca2e1bf264602965174dacae2..e024d422e6ced014cf4cfe3ea7def7d66c0a4168 100644 (file)
--- 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.
 
 ;; 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.23 2006-02-06 18:12:19 espen Exp $

 
 (in-package "GLIB")
 
 
 (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)
          (%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)))
         (translate-arguments (mapcar #'to-alien-function arg-types))
         (translate-return-value (from-alien-function return-type))
         (cleanup-arguments (mapcar #'cleanup-function arg-types)))


@@ -344,7 +347,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 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
 (defmethod alien-type ((type (eql 'signed-byte)) &rest args)
   (declare (ignore type))
   (destructuring-bind (&optional (size '*)) args


@@ -386,13 +388,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
   (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)))
               (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)))
                (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)))
                (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)
                (signed-sap-ref-64 sap offset)))))))
 
 (defmethod alien-type ((type (eql 'unsigned-byte)) &rest args)


@@ -428,13 +434,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
   (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)))
               (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)))
                (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)))
                (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)))))))
   
   
                (sap-ref-64 sap offset)))))))
   
   


@@ -488,7 +498,8 @@ (defmethod writer-function ((type (eql 'single-float)) &rest args)
 
 (defmethod reader-function ((type (eql 'single-float)) &rest args)
   (declare (ignore type 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)))
 
 
       (sap-ref-single sap offset)))
 
 


@@ -516,7 +527,8 @@ (defmethod writer-function ((type (eql 'double-float)) &rest args)
 
 (defmethod reader-function ((type (eql 'double-float)) &rest args)
   (declare (ignore type 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)))
 
 
       (sap-ref-double sap offset)))
 
 


@@ -535,7 +547,8 @@ (defmethod writer-function ((type (eql 'base-char)) &rest args)
 
 (defmethod reader-function ((type (eql 'base-char)) &rest args)
   (declare (ignore type 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))))
 
 
       (code-char (sap-ref-8 location offset))))
 
 


@@ -629,7 +642,8 @@ (defmethod writer-function ((type (eql 'string)) &rest args)
 
 (defmethod reader-function ((type (eql 'string)) &rest args)
   (declare (ignore type 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)))))
       (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 +705,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)))
 (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))))))
       (let ((string (funcall string-reader location offset)))
        (when string
          (parse-namestring string))))))


@@ -738,7 +753,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)))
 (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))))))
 
 
       (not (zerop (funcall reader location offset))))))
 
 


@@ -790,7 +806,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))
 
 (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)))
 
 
       (sap-ref-sap location offset)))
 
 


@@ -900,7 +917,8 @@ (defmethod reader-function ((type (eql 'callback)) &rest args)
   (declare (ignore type args))
   (let ((reader (reader-function 'pointer))
        (from-alien (from-alien-function 'callback)))
   (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))))))
       (let ((pointer (funcall reader location offset)))
        (unless (null-pointer-p pointer)
          (funcall from-alien pointer))))))