Changeset 9679 for branches

Timestamp:

Jun 5, 2008, 10:23:46 PM (16 years ago)

Author:

R. Matthew Emerson

Message:

%do-ff-call: get it mostly working (still need to handle results returned
in both %eax and %edx).

File:

• branches/ia32/level-0/X86/X8632/x8632-def.lisp (modified) (4 diffs)

branches/ia32/level-0/X86/X8632/x8632-def.lisp

@@ -513 +513 @@
 ;;;     stack and put the value in there for us.
 
-(defx86lapfunction %do-ff-call ((frame arg_y) (entry arg_z))
-  (int ($ 3))
-  (pop (% ra0))
-  (movl (% ebp) (@  (% esp)))
-  (movl (% esp) (% ebp))
-  (movl (% ra0) (@ 4 (% ebp)))
+;;; flags = 0, return value in eax; 1 single-float; 2 double-float
+(defx8632lapfunction %do-ff-call ((flags 4) #|(ra 0)|# (frame arg_y) (entry arg_z))
+  (movl (% ebp) (@ 8 (% esp)))
+  (leal (@ 8 (% esp)) (% ebp))
+  (popl (@ 4 (% ebp)))
+  (push (% arg_y))
+  (push (% arg_z))
   (call-subprim .SPffcall)
-  (movd (@ (% :rcontext) x8664::tcr.foreign-sp) (% mm5))
-  (movd (% mm5) (@ (% frame)))
-  (movl (% frame) (@ (% :rcontext) x8664::tcr.foreign-sp))
+  ;; there might be an fp result on x87 stack, so don't use
+  ;; any mmx instructions until the result has been read.
+  (movd (@ (% :rcontext) x8632::tcr.foreign-sp) (% xmm0))
+  (movd (% xmm0) (@ (% frame)))
+  (movl (% frame) (@ (% :rcontext) x8632::tcr.foreign-sp))
+  (cmpl ($ '1) (@ -4 (% ebp)))
+  (je @single)
+  (jg @double)
   (movl (% eax) (@ 4 (% frame)))
-  ;; .SPffcall will have popped the fp result from the x87 stack
-  ;; and stashed it in fp0.
-  (movq (% fp0) (@ 8 (% frame)))
+  (jmp @done)
+  @single
+  (fstps (@ 4 (% frame)))
+  (jmp @done)
+  @double
+  (fstpl (@ 4 (% frame)))
+  @done
   (movl ($ nil) (% arg_z))
   (restore-simple-frame)
@@ -570 +580 @@
                total-words frame
                (%setf-macptr-to-object argptr frame)
-               (let* ((offset 0))
+               (let* ((offset 4))
                  (do* ((i 0 (1+ i))
                        (specs specs-and-vals (cddr specs))
@@ -606 +616 @@
                           (incf p 4)
                           (incf offset 4))))))
-                 (%do-ff-call frame entry)
+                 (let ((flags (case result-spec
+                                (:single-float 1)
+                                (:double-float 2)
+                                (t 0))))
+                   (%do-ff-call flags frame entry))
                  (ecase result-spec
                    (:void nil)
@@ -618 +632 @@
                    (:unsigned-doubleword (%%get-unsigned-longlong argptr 4))
                    (:signed-doubleword (%%get-signed-longlong argptr 4))
-                   (:single-float (%get-single-float argptr 8))
-                   (:double-float (%get-double-float argptr 8)))))))))))
+                   (:single-float (%get-single-float argptr 4))
+                   (:double-float (%get-double-float argptr 4)))))))))))
 
 ;;; end of x86-def.lisp