Changeset 11587


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/source/level-0/PPC/ppc-def.lisp

    r10959 r11587  
    651651      (declare (dynamic-extent specs-and-vals))
    652652      (let* ((len (length specs-and-vals))
    653              (total-words 0)
    654              (monitor (eq (car specs-and-vals) :monitor-exception-ports)))
     653             (total-words 0))
    655654        (declare (fixnum len total-words))
    656         (when monitor
    657           (decf len)
    658           (setq specs-and-vals (cdr specs-and-vals)))
    659655        (unless (oddp len)
    660656          (error "Length of ~s is even.  Missing result ?" specs-and-vals))
     
    729725             
    730726              (%%ff-call
    731                monitor
    732727               fpr-reload-sizes
    733728               fpr-reload-offsets
     
    751746
    752747
    753     (defppclapfunction %%ff-call ((monitor-exception-ports 12)
    754                                   (reload-sizes 8)
     748    (defppclapfunction %%ff-call ((reload-sizes 8)
    755749                                  (reload-offsets 4)
    756750                                  (frame-size 0)                             
     
    758752                                  (buf arg_y)
    759753                                  (entry arg_z))
    760       (check-nargs 7)
    761       (la imm0 16 vsp)
     754      (check-nargs 6)
     755      (la imm0 12 vsp)
    762756      (save-lisp-context imm0)
    763757      (lwz imm0 frame-size vsp)
    764758      (stwux sp sp imm0)
    765759      (stw sp ppc32::c-frame.savelr sp)
    766       (lwz imm2 monitor-exception-ports vsp)
    767       (cmpwi cr1 imm2 nil)
    768760      (macptr-ptr imm2 buf)
    769761      (mr imm1 imm2)
     
    924916      @loaded
    925917      (vpush buf)
    926       (bne cr1 @callX)
    927918      (bla .SPpoweropen-ffcall)
    928       (b @called)
    929       @callX
    930       (bla .SPpoweropen-ffcallX)
    931919      @called
    932920      (vpop buf)
     
    1006994
    1007995  ;;; This is just here so that we can jump to a subprim from lisp.
    1008     (defppclapfunction %do-ff-call ((monitor arg_x) (regbuf arg_y) (entry arg_z))
     996    (defppclapfunction %do-ff-call ((regbuf arg_y) (entry arg_z))
    1009997      (cmpdi cr0 regbuf nil)
    1010       (cmpdi cr1 monitor nil)
    1011998      (bnea cr0 .SPpoweropen-ffcall-return-registers)
    1012       (beqa cr1 .SPpoweropen-ffcall)
    1013       (ba .SPpoweropen-ffcallx))
     999      (ba .SPpoweropen-ffcall))
    10141000 
    10151001    (defun %ff-call (entry &rest specs-and-vals)
     
    10171003      (let* ((len (length specs-and-vals))
    10181004             (total-words 0)
    1019              (monitor (eq (car specs-and-vals) :monitor-exception-ports))
    10201005             (registers nil))
    10211006        (declare (fixnum len total-words))
    1022         (when monitor
    1023           (decf len)
    1024           (setq specs-and-vals (cdr specs-and-vals)))
    10251007        (let* ((result-spec (or (car (last specs-and-vals)) :void))
    10261008               (nargs (ash (the fixnum (1- len)) -1)))
     
    11241106                                (incf offset 8))))))
    11251107                       (%load-fp-arg-regs n-fp-args fp-args)
    1126                        (%do-ff-call monitor registers entry)
     1108                       (%do-ff-call registers entry)
    11271109                       (values (%%ff-result result-spec)))))))))))
    11281110
Note: See TracChangeset for help on using the changeset viewer.