Changeset 9405

Timestamp:

May 7, 2008, 9:32:40 PM (17 years ago)

Author:

R. Matthew Emerson

Message:

generate-callback-bindings: try looking for callback args in the right place
on the stack.

File:

• branches/ia32/lib/ffi-darwinx8632.lisp (modified) (4 diffs)

branches/ia32/lib/ffi-darwinx8632.lisp

@@ -106 +106 @@
       (do* ((argvars argvars (cdr argvars))
             (argspecs argspecs (cdr argspecs))
-            (delta 4 4)
-            (offset -4 (decf offset delta)))
+            (offset 8 (incf offset 4)))
            ((null argvars)
             (values (rlets) (lets) (dynamic-extent-names) (inits) rtype nil 4))
@@ -113 +112 @@
                (spec (car argspecs))
                (argtype (parse-foreign-type spec))
-               (bits (require-foreign-type-bits argtype)))
+               (bits (require-foreign-type-bits argtype))
+               (double nil))
           (if (typep argtype 'foreign-record-type)
             (progn
@@ -121 +121 @@
                           (ecase (foreign-type-to-representation-type argtype)
                             (:single-float '%get-single-float)
-                            (:double-float (incf offset 4)
-                                           '%get-double-float)
-                            (:signed-doubleword (incf offset 4)
+                            (:double-float (setq double t) '%get-double-float)
+                            (:signed-doubleword (setq double t)
                                                 '%%get-signed-longlong)
                             (:signed-fullword '%get-signed-long)
                             (:signed-halfword '%get-signed-word)
                             (:signed-byte '%get-signed-byte)
-                            (:unsigned-doubleword (incf offset 4)
+                            (:unsigned-doubleword (setq double t)
                                                   '%%get-unsigned-longlong)
                             (:unsigned-fullword '%get-unsigned-long)
@@ -135 +134 @@
                             (:address '%get-ptr))
                           ,stack-ptr
-                          ,offset)))))))))
+                          ,offset))))
+          (when double (incf offset 4)))))))
 
 (defun x86-darwin32::generate-callback-return-value (stack-ptr fp-args-ptr result return-type struct-return-arg)