# HG changeset patch # User chrisphi # Date 1346342007 14400 # Node ID 47a867dd3005126e47469fdd025089dba3f019fb # Parent b41a43560dc844b6a33724d56a2f63e3ec83c071 ARM: Fix trashed thread ptr after recursive re-entry from asm jit. diff -r b41a43560dc8 -r 47a867dd3005 src/cpu/zero/vm/cppInterpreter_arm.S --- a/src/cpu/zero/vm/cppInterpreter_arm.S Wed Jun 06 09:04:45 2012 -0400 +++ b/src/cpu/zero/vm/cppInterpreter_arm.S Thu Aug 30 11:53:27 2012 -0400 @@ -2988,7 +2988,10 @@ // Handler for java.lang.invoke.MethodHandles::invoke ALIGN_CODE method_handle_entry: - b fast_method_handle_entry + stmfd arm_sp!, {thread, lr} + mov thread, r2 + bl fast_method_handle_entry + ldmfd arm_sp!, {thread, pc} ALIGN_CODE fast_method_handle_entry: stmfd arm_sp!, {regset, lr}