Changeset 13861

Timestamp:

Jun 19, 2010, 3:57:03 AM (14 years ago)

Author:

Gary Byers

Message:

Use NTH-IMMEDIATE to reference fixed constants in GF/FIN trampoline code.

File:

• branches/arm/level-0/ARM/arm-clos.lisp (modified) (5 diffs)

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

@@ -186 +186 @@
       (ldrne lr (:@ lr (:$ (arm::%kernel-global 'arm::lexpr-return1v))))
       (mov arg_z vsp)
-      (svref arg_y gf.dispatch-table nfn) ; dispatch-table
+      (nth-immediate arg_y gf.dispatch-table nfn) ; dispatch-table
       (set-nargs 2)
-      (svref nfn gf.dcode nfn) ; dcode function
+      (nth-immediate nfn gf.dcode nfn) ; dcode function
       (ldr pc (:@ nfn (:$ arm::function.entrypoint)))))))
 
@@ -196 +196 @@
 
 (defarmlapfunction funcallable-trampoline ()
-  (svref nfn gf.dcode nfn)
-  (svref pc 0 nfn))
+  (nth-immediate nfn gf.dcode nfn)
+  (ldr pc (:@ nfn (:$ arm::function.entrypoint))))
 
 ;;; This can't reference any of the function's constants.
@@ -214 +214 @@
 (defarmlapfunction gag-one-arg ((arg arg_z))
   (check-nargs 1)  
-  (svref arg_y gf.dispatch-table nfn) ; mention dt first
+  (nth-immediate arg_y gf.dispatch-table nfn) ; mention dt first
   (set-nargs 2)
-  (svref nfn gf.dcode nfn)
+  (nth-immediate nfn gf.dcode nfn)
   (ldr pc (:@ nfn (:$ arm::function.entrypoint))))
 
@@ -222 +222 @@
 (defarmlapfunction gag-two-arg ((arg0 arg_y) (arg1 arg_z))
   (check-nargs 2)  
-  (svref arg_x gf.dispatch-table nfn) ; mention dt first
-  (set-nargs 3)
-  (svref nfn gf.dcode nfn)
+  (nth-immediate arg_x gf.dispatch-table nfn) ; mention dt first
+  (set-nargs 3)
+  (nth-immediate nfn gf.dcode nfn)
   (ldr pc (:@ nfn (:$ arm::function.entrypoint))))
 
@@ -249 +249 @@
       (ldrne lr (:@ lr (:$ (arm::%kernel-global 'arm::lexpr-return1v))))
       (mov arg_z vsp)
-      (svref arg_y combined-method.thing nfn) ; thing
+      (nth-immediate arg_y combined-method.thing nfn) ; thing
       (set-nargs 2)
-      (svref nfn combined-method.dcode nfn) ; dcode function
+      (nth-immediate nfn combined-method.dcode nfn) ; dcode function
       (ldr pc (:@ nfn (:$ arm::function.entrypoint)))))))