# HG changeset patch # User aph # Date 1339088007 -3600 # Node ID 883fc064689b454e3470a4d373889b4a1499b5e5 # Parent 51380f2370a7c982f09dc1070c6c1c66218b5600# Parent 421a8b72633bd4e945f3b897fb0743885426678d merge diff -r 51380f2370a7 -r 883fc064689b src/cpu/zero/vm/cppInterpreter_arm.S --- a/src/cpu/zero/vm/cppInterpreter_arm.S Wed Jun 06 10:09:22 2012 -0400 +++ b/src/cpu/zero/vm/cppInterpreter_arm.S Thu Jun 07 17:53:27 2012 +0100 @@ -2992,6 +2992,7 @@ ALIGN_CODE fast_method_handle_entry: stmfd arm_sp!, {regset, lr} + mov r2, thread bl _ZN14CppInterpreter19method_handle_entryEP13methodOopDesciP6Thread ldmia sp!, {regset, pc}