/hg/icedtea6: cppInterpreter_arm.S (.fast_native_return_dw): Add...

[xranby at icedtea.classpath.org]

changeset f10d5790993d in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=f10d5790993d
author: Xerxes Ranby <xerxes at zafena.se>
date: Fri Dec 16 16:25:26 2011 +0100

	cppInterpreter_arm.S (.fast_native_return_dw): Add a missing PR484
	return 0.

	2011-12-16 Xerxes Ranby <xerxes at zafena.se>

	 * arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S
	(.fast_native_return_dw): Add a missing PR484 return 0.


diffstat:

 ChangeLog                                             |  5 +++++
 arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S |  1 +
 2 files changed, 6 insertions(+), 0 deletions(-)

diffs (23 lines):

diff -r 67df573b0734 -r f10d5790993d ChangeLog
--- a/ChangeLog	Mon Dec 12 18:01:38 2011 -0500
+++ b/ChangeLog	Fri Dec 16 16:25:26 2011 +0100
@@ -1,3 +1,8 @@
+2011-12-16  Xerxes RÃ¥nby  <xerxes at zafena.se>
+
+	* arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S
+	(.fast_native_return_dw): Add a missing PR484 return 0.
+
 2011-12-12  Omair Majid  <omajid at redhat.com>
 
 	S7102369, S7094468: remove java.rmi.server.codebase property parsing from
diff -r 67df573b0734 -r f10d5790993d arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S
--- a/arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S	Mon Dec 12 18:01:38 2011 -0500
+++ b/arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S	Fri Dec 16 16:25:26 2011 +0100
@@ -1318,6 +1318,7 @@
 	str	tmp1, [ip, #JNIHANDLEBLOCK_TOP]
 	str	r1, [r5, #4]
 	str	r5, [r9, #THREAD_JAVA_SP]
+	mov     r0, #0  @ deoptimized_frames = 0
 	ldmfd	arm_sp!, {fast_regset, pc}
 .fast_native_return_byte:
 	mov	r0, r0, lsl #24