/hg/icedtea6: Fix ARM SIGILL crash during BLX call to thumb comp...

[xranby at icedtea.classpath.org]

changeset b8d810f20366 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=b8d810f20366
author: Xerxes Ranby <xerxes at zafena.se>
date: Fri Mar 02 16:08:50 2012 +0100

	Fix ARM SIGILL crash during BLX call to thumb compiled StrictMath intrinsics.

	2012-03-02  Xerxes Ranby  <xerxes at zafena.se>
	            Andrew Haley  <aph at redhat.com>

	        * arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp:
	        (handle_special_method): Fix a off by one byte SIGILL crash
	        during BLX call to thumb compiled StrictMath intrinsics for
	        --with-float=hard --with-mode=thumb ARM builds.


diffstat:

 ChangeLog                                   |  8 ++++++++
 arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp |  3 ++-
 2 files changed, 10 insertions(+), 1 deletions(-)

diffs (28 lines):

diff -r 54ceda20a02c -r b8d810f20366 ChangeLog
--- a/ChangeLog	Mon Feb 27 14:40:52 2012 +0100
+++ b/ChangeLog	Fri Mar 02 16:08:50 2012 +0100
@@ -1,3 +1,11 @@
+2012-03-02  Xerxes RÃ¥nby  <xerxes at zafena.se>
+	    Andrew Haley  <aph at redhat.com>
+
+	* arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp:
+	(handle_special_method): Fix a off by one byte SIGILL crash
+	during BLX call to thumb compiled StrictMath intrinsics for
+	--with-float=hard --with-mode=thumb ARM builds.
+
 2012-02-27  Pavel Tisnovsky  <ptisnovs at redhat.com>
 
 	* Makefile.am: Add new patch.
diff -r 54ceda20a02c -r b8d810f20366 arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp
--- a/arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp	Mon Feb 27 14:40:52 2012 +0100
+++ b/arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp	Fri Mar 02 16:08:50 2012 +0100
@@ -5099,7 +5099,8 @@
   // FIXME: The JNI StrictMath routines don't use the JNIEnv *env
   // parameter, so it's arguably pointless to pass it here.
   add_imm(jinfo->codebuf, ARM_R0, Rthread, THREAD_JNI_ENVIRONMENT);
-  blx(jinfo->codebuf, (unsigned)entry_point);
+  mov_imm(jinfo->codebuf, ARM_IP, (unsigned)entry_point);
+  blx_reg(jinfo->codebuf, ARM_IP);
   vfp_to_jstack(jinfo, VFP_D0);
 
   return true;