Changeset 11587

Timestamp:

Jan 6, 2009, 9:15:03 AM (11 years ago)

Author:

gb

Message:

Stop pretending to support :MONITOR-EXCEPTION-PORTS in the runtime %FF-CALL.

File:

• trunk/source/level-0/PPC/ppc-def.lisp (modified) (8 diffs)

trunk/source/level-0/PPC/ppc-def.lisp

@@ -651 +651 @@
       (declare (dynamic-extent specs-and-vals))
       (let* ((len (length specs-and-vals))
-             (total-words 0)
-             (monitor (eq (car specs-and-vals) :monitor-exception-ports)))
+             (total-words 0))
         (declare (fixnum len total-words))
-        (when monitor
-          (decf len)
-          (setq specs-and-vals (cdr specs-and-vals)))
         (unless (oddp len)
           (error "Length of ~s is even.  Missing result ?" specs-and-vals))
@@ -729 +725 @@
               
               (%%ff-call
-               monitor
                fpr-reload-sizes
                fpr-reload-offsets
@@ -751 +746 @@
 
 
-    (defppclapfunction %%ff-call ((monitor-exception-ports 12)
-                                  (reload-sizes 8)
+    (defppclapfunction %%ff-call ((reload-sizes 8)
                                   (reload-offsets 4)
                                   (frame-size 0)                             
@@ -758 +752 @@
                                   (buf arg_y)
                                   (entry arg_z))
-      (check-nargs 7)
-      (la imm0 16 vsp)
+      (check-nargs 6)
+      (la imm0 12 vsp)
       (save-lisp-context imm0)
       (lwz imm0 frame-size vsp)
       (stwux sp sp imm0)
       (stw sp ppc32::c-frame.savelr sp)
-      (lwz imm2 monitor-exception-ports vsp)
-      (cmpwi cr1 imm2 nil)
       (macptr-ptr imm2 buf)
       (mr imm1 imm2)
@@ -924 +916 @@
       @loaded
       (vpush buf)
-      (bne cr1 @callX)
       (bla .SPpoweropen-ffcall)
-      (b @called)
-      @callX
-      (bla .SPpoweropen-ffcallX)
       @called
       (vpop buf)
@@ -1006 +994 @@
 
   ;;; This is just here so that we can jump to a subprim from lisp.
-    (defppclapfunction %do-ff-call ((monitor arg_x) (regbuf arg_y) (entry arg_z))
+    (defppclapfunction %do-ff-call ((regbuf arg_y) (entry arg_z))
       (cmpdi cr0 regbuf nil)
-      (cmpdi cr1 monitor nil)
       (bnea cr0 .SPpoweropen-ffcall-return-registers)
-      (beqa cr1 .SPpoweropen-ffcall)
-      (ba .SPpoweropen-ffcallx))
+      (ba .SPpoweropen-ffcall))
   
     (defun %ff-call (entry &rest specs-and-vals)
@@ -1017 +1003 @@
       (let* ((len (length specs-and-vals))
              (total-words 0)
-             (monitor (eq (car specs-and-vals) :monitor-exception-ports))
              (registers nil))
         (declare (fixnum len total-words))
-        (when monitor
-          (decf len)
-          (setq specs-and-vals (cdr specs-and-vals)))
         (let* ((result-spec (or (car (last specs-and-vals)) :void))
                (nargs (ash (the fixnum (1- len)) -1)))
@@ -1124 +1106 @@
                                 (incf offset 8))))))
                        (%load-fp-arg-regs n-fp-args fp-args)
-                       (%do-ff-call monitor registers entry)
+                       (%do-ff-call registers entry)
                        (values (%%ff-result result-spec)))))))))))