changeset in /hg/icedtea6: 2009-04-15 Gary Benson <gbenson at red...

[Gary Benson]

changeset 03be2128639f in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=03be2128639f
description:
	2009-04-15  Gary Benson  <gbenson at redhat.com>
		    Xerxes R?nby <xerxes at zafena.se>

		* patches/icedtea-zero.patch (BytecodeInterpreter::run):
		Skip a bad assertion on IA32 with Zero.

diffstat:

2 files changed, 17 insertions(+)
ChangeLog                  |    6 ++++++
patches/icedtea-zero.patch |   11 +++++++++++

diffs (34 lines):

diff -r 3ebbbd651177 -r 03be2128639f ChangeLog
--- a/ChangeLog	Tue Apr 14 13:58:42 2009 -0400
+++ b/ChangeLog	Wed Apr 15 12:47:36 2009 +0100
@@ -1,3 +1,9 @@ 2009-04-10 Deepak Bhole <dbhole at redhat.c
+2009-04-15  Gary Benson  <gbenson at redhat.com>
+	    Xerxes RÃ¥nby <xerxes at zafena.se>
+
+	* patches/icedtea-zero.patch (BytecodeInterpreter::run):
+	Skip a bad assertion on IA32 with Zero.
+
 2009-04-10 Deepak Bhole <dbhole at redhat.com>
 
 	* IcedTeaPlugin.cc: Fix rhbz478561 (freeze with empty string return from
diff -r 3ebbbd651177 -r 03be2128639f patches/icedtea-zero.patch
--- a/patches/icedtea-zero.patch	Tue Apr 14 13:58:42 2009 -0400
+++ b/patches/icedtea-zero.patch	Wed Apr 15 12:47:36 2009 +0100
@@ -77,6 +77,17 @@
      if (fp) {
 --- openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp.orig	2008-07-27 08:37:03.000000000 +0000
 +++ openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp	2008-07-27 08:38:13.000000000 +0000
+@@ -424,7 +421,9 @@
+ #ifdef ASSERT
+   if (istate->_msg != initialize) {
+     assert(abs(istate->_stack_base - istate->_stack_limit) == (istate->_method->max_stack() + 1), "bad stack limit");
+-   IA32_ONLY(assert(istate->_stack_limit == istate->_thread->last_Java_sp() + 1, "wrong"));
++#if defined(IA32) && !defined(ZERO)
++    assert(istate->_stack_limit == istate->_thread->last_Java_sp() + 1, "wrong");
++#endif // IA32 && !ZERO
+   }
+   // Verify linkages.
+   interpreterState l = istate;
 @@ -3030,9 +3030,9 @@
    tty->print_cr("&native_fresult: " INTPTR_FORMAT, (uintptr_t) &this->_native_fresult);
    tty->print_cr("native_lresult: " INTPTR_FORMAT, (uintptr_t) this->_native_lresult);