Changeset 14478

Timestamp:

Dec 9, 2010, 1:33:01 PM (14 years ago)

Author:

Gary Byers

Message:

More ARM FFI fixes: fix handling of (single-)FLOAT args/results
in DEFCALLBACK, fix handling of 64-bit integer results in #'%FF-CALL.

Location:

trunk/source

Files:

• level-0/ARM/arm-def.lisp (modified) (1 diff)
• lib/ffi-linuxarm.lisp (modified) (3 diffs)

trunk/source/level-0/ARM/arm-def.lisp

@@ -407 +407 @@
                (:unsigned-fullword (%get-unsigned-long result 0))
                (:signed-fullword (%get-signed-long result 0))
-               (:unsigned-doubleword (%get-natural result 0))
-               (:signed-doubleword (%get-signed-natural result 0))
+               (:unsigned-doubleword (%%get-unsigned-longlong result 0))
+               (:signed-doubleword (%%get-signed-longlong result 0))
                (:single-float (%get-single-float result 0))
                (:double-float (%get-double-float result 0))))))))))

trunk/source/lib/ffi-linuxarm.lisp

@@ -120 +120 @@
                             ((typep argtype 'foreign-single-float-type)
                              (setq nextoffset (+ offset 4))
-                             '%get-single-float-from-double-ptr)
+                             '%get-single-float)
                             ((typep argtype 'foreign-double-float-type)
                              (when (logtest offset 4)
@@ -167 +167 @@
                   (setq offset nextoffset))))))))
 
+
 (defun arm-linux::generate-callback-return-value (stack-ptr fp-args-ptr result return-type struct-return-arg)
   (declare (ignore fp-args-ptr))
@@ -182 +183 @@
                 (:signed-doubleword '%%get-signed-longlong)
                 (:unsigned-doubleword '%%get-unsigned-longlong)
-                ((:double-float :single-float) '%get-double-float)
+                (:double-float '%get-double-float)
+                (:single-float '%get-single-float)
                 (t '%get-long)) ,stack-ptr ,offset) ,result))))