/hg/release/icedtea6-1.11: 3 new changesets

[aph at icedtea.classpath.org]

changeset 291ada80cdd9 in /hg/release/icedtea6-1.11
details: http://icedtea.classpath.org/hg/release/icedtea6-1.11?cmd=changeset;node=291ada80cdd9
author: aph
date: Tue Jan 31 07:17:17 2012 -0500

	2012-01-27 Andrew Haley <aph at redhat.com>

	 * arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp (class Hsdis):
	Set decode_instructions = NULL.


changeset 6dea1be8ccc3 in /hg/release/icedtea6-1.11
details: http://icedtea.classpath.org/hg/release/icedtea6-1.11?cmd=changeset;node=6dea1be8ccc3
author: aph
date: Tue Jan 31 07:19:24 2012 -0500

	DECACHE_JPC in return_check_monitors 2012-01-31 Andrew Haley
	<aph at redhat.com>

	 * arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S
	(return_check_monitors): DECACHE_JPC so that the saved bytecode
	pointer is correct for the GC.


changeset a5c946d5f4bc in /hg/release/icedtea6-1.11
details: http://icedtea.classpath.org/hg/release/icedtea6-1.11?cmd=changeset;node=a5c946d5f4bc
author: aph
date: Tue Jan 31 12:36:36 2012 +0000

	Fix order of patches in ChangeLog so that it's clear when the
	release happened.


diffstat:

 ChangeLog                                             |  11 +++++++++++
 arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S |   1 +
 arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp           |   2 ++
 3 files changed, 14 insertions(+), 0 deletions(-)

diffs (41 lines):

diff -r 2f6cd79ca154 -r a5c946d5f4bc ChangeLog
--- a/ChangeLog	Tue Jan 31 00:18:57 2012 -0500
+++ b/ChangeLog	Tue Jan 31 12:36:36 2012 +0000
@@ -1,3 +1,14 @@
+2012-01-31  Andrew Haley  <aph at redhat.com>
+
+	* arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S
+	(return_check_monitors): DECACHE_JPC so that the saved bytecode
+	pointer is correct for the GC.
+
+2012-01-31  Andrew Haley  <aph at redhat.com>
+
+	* arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp (class Hsdis): Set
+	decode_instructions = NULL.
+
 2012-01-31  Omair Majid  <omajid at redhat.com>
 
 	* NEWS: Add a section for 1.11.1.
diff -r 2f6cd79ca154 -r a5c946d5f4bc arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S
--- a/arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S	Tue Jan 31 00:18:57 2012 -0500
+++ b/arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S	Tue Jan 31 12:36:36 2012 +0000
@@ -3576,6 +3576,7 @@
 return_check_monitors:
 	stmdb	arm_sp!, {r4, lr}
 
+	DECACHE_JPC
 	ldr	r2, [istate, #ISTATE_METHOD]
 	ldr	r4, [r2, #METHOD_ACCESSFLAGS]
 	tst	r4, #1<<5
diff -r 2f6cd79ca154 -r a5c946d5f4bc arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp
--- a/arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp	Tue Jan 31 00:18:57 2012 -0500
+++ b/arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp	Tue Jan 31 12:36:36 2012 +0000
@@ -736,6 +736,8 @@
   // Load hsdis-arm.so lazily.
   Hsdis()
   {
+    decode_instructions = NULL;
+
     if (PrintAssembly) {
       if (lib = dlopen("hsdis-arm.so", RTLD_NOW)) {
 	decode_instructions