Changeset 13864

Timestamp:

Jun 21, 2010, 2:43:43 AM (14 years ago)

Author:

Gary Byers

Message:

arm-lapmacros.lisp: define DISCARD-LISP-FRAME.
arm-clos.lisp: *GM-PROTO*, *CM-PROTO*: save lisp frames on cstack during lexpr entry
arm-def.lisp: don't restore lisp frame after .SPspread-lexprz in %APPLY-LEXPR-WITH-METHOD-CONTEXT. (We just need the frame to GC-protect the lr, and .SPspread-lexprz modifies the vsp.)
l1-dcode.lisp: remove the #+arm-target debug trap from %%NO-APPLICABLE-METHOD.

Location:

branches/arm

Files:

• compiler/ARM/arm-lapmacros.lisp (modified) (1 diff)
• level-0/ARM/arm-clos.lisp (modified) (2 diffs)
• level-0/ARM/arm-def.lisp (modified) (1 diff)

branches/arm/compiler/ARM/arm-lapmacros.lisp

@@ -69 +69 @@
   `(ldmia (:! sp) (,marker-reg vsp fn pc)))
 
+(defarmlapmacro discard-lisp-frame ()
+  `(add sp sp (:$ arm::lisp-frame.size)))
+
 
 (defarmlapmacro push1 (src stack)

branches/arm/level-0/ARM/arm-clos.lisp

@@ -181 +181 @@
       (moveq lr (:$ (- arm::nil-value arm::fulltag-nil)))
       (ldreq lr (:@ lr (:$ (arm::%kernel-global 'arm::lexpr-return))))
-      (stmdbeq (:! vsp) (imm0 imm1 fn lr))
+      (stmdbeq (:! sp) (imm0 imm1 fn lr))
       (moveq lr arg_x)
       (movne lr (:$ (- arm::nil-value arm::fulltag-nil)))
@@ -244 +244 @@
       (moveq lr (:$ (- arm::nil-value arm::fulltag-nil)))
       (ldreq lr (:@ lr (:$ (arm::%kernel-global 'arm::lexpr-return))))
-      (stmdbeq (:! vsp) (imm0 imm1 fn lr))
+      (stmdbeq (:! sp) (imm0 imm1 fn lr))
       (moveq lr arg_x)
       (movne lr (:$ (- arm::nil-value arm::fulltag-nil)))

branches/arm/level-0/ARM/arm-def.lisp

@@ -1067 +1067 @@
   (build-lisp-frame)
   (bl .SPspread-lexprz)
-  (restore-lisp-frame)
+  (ldr lr (:@ sp (:$ arm::lisp-frame.savelr)))
+  (discard-lisp-frame)
   (ldr pc (:@ nfn (:$ arm::function.entrypoint))))