/hg/release/icedtea7-forest-2.1/hotspot: ARM: Fix trashed thread...

[chrisphi at icedtea.classpath.org]

changeset 47a867dd3005 in /hg/release/icedtea7-forest-2.1/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/hotspot?cmd=changeset;node=47a867dd3005
author: chrisphi
date: Thu Aug 30 11:53:27 2012 -0400

	ARM: Fix trashed thread ptr after recursive re-entry from
		asm jit.


diffstat:

 src/cpu/zero/vm/cppInterpreter_arm.S |  5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diffs (15 lines):

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}