Changeset 13800

Timestamp:

Jun 9, 2010, 9:15:49 PM (14 years ago)

Author:

Gary Byers

Message:

D'oh: jump_nfn(), call_nfn(): jump to/call the entrypoint, not the
code vector.
New slots in catch_frames.

File:

• branches/arm/lisp-kernel/arm-macros.s (modified) (3 diffs)

branches/arm/lisp-kernel/arm-macros.s

@@ -279 +279 @@
 /* "jump" to the code-vector of the function in nfn. */
 define(`jump_nfn',`
-        __(ldr pc,[nfn,#_function.codevector])
+        __(ldr pc,[nfn,#_function.entrypoint])
 ')
 
 /* "call the code-vector of the function in nfn. */
 define(`call_nfn',`
-        __(ldr lr,[nfn,#_function.codevector])
+        __(ldr lr,[nfn,#_function.entrypoint])
         __(blx lr)
 ')
@@ -314 +314 @@
 
 define(`mkcatch',`
+        new_macro_labels()
         __(build_lisp_frame(imm0))
         __(movc16(imm0,make_header(catch_frame.element_count,subtag_u32_vector)))
+        __(movs temp2,fn)
+        __(ldrne temp2,[temp2,_function.codevector])
+        __(ldr temp1,[rcontext,#tcr.last_lisp_frame])
         __(ldr imm1,[rcontext,#tcr.catch_top])
         /* imm2 is mvflag */
@@ -321 +325 @@
         __(ldr arg_x,[rcontext,#tcr.db_link])
         __(ldr temp0,[rcontext,#tcr.xframe])
-        __(stmdb sp!,{imm0,imm1,imm2,arg_z,arg_x,temp0})
+        __(stmdb sp!,{imm0,imm1,imm2,arg_z,arg_x,temp0,temp1,temp2})
         __(add imm0,sp,#fulltag_misc)
         __(str imm0,[rcontext,#tcr.catch_top])