/hg/icedtea6: 2010-04-09 Xerxes R?nby <xerxes at zafena.se>

[xranby at icedtea.classpath.org]

changeset 1af407faae6d in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=1af407faae6d
author: Xerxes R?nby <xerxes at zafena.se>
date: Fri Apr 09 12:54:33 2010 +0200

	2010-04-09 Xerxes R?nby <xerxes at zafena.se>

	 * Makefile.am (ICEDTEA_PATCHES): Replaced
	cppInterpreter-fast-bytecodes.patch with 6939845.patch from
	OpenJDK upstream. The new patch are conditionalized for ZERO
	builds.
		* patches/zero/6939845.patch: added from upstream.
		* patches/zero/cppInterpreter-fast-bytecodes.patch: removed.


diffstat:

4 files changed, 30 insertions(+), 16 deletions(-)
ChangeLog                                        |    9 +++++++++
Makefile.am                                      |    2 +-
patches/zero/6939845.patch                       |   20 ++++++++++++++++++++
patches/zero/cppInterpreter-fast-bytecodes.patch |   15 ---------------

diffs (71 lines):

diff -r 8bb5b3df3dc2 -r 1af407faae6d ChangeLog
--- a/ChangeLog	Fri Apr 09 01:26:42 2010 +0100
+++ b/ChangeLog	Fri Apr 09 12:54:33 2010 +0200
@@ -1,3 +1,12 @@ 2010-04-08  Andrew John Hughes  <ahughes
+2010-04-09  Xerxes RÃ¥nby  <xerxes at zafena.se>
+
+	* Makefile.am (ICEDTEA_PATCHES):
+	Replaced cppInterpreter-fast-bytecodes.patch with
+	6939845.patch from OpenJDK upstream.
+	The new patch are conditionalized for ZERO builds.
+	* patches/zero/6939845.patch: added from upstream.
+	* patches/zero/cppInterpreter-fast-bytecodes.patch: removed.
+
 2010-04-08  Andrew John Hughes  <ahughes at redhat.com>
 
 	* configure.ac: Move NSS detection to macros
diff -r 8bb5b3df3dc2 -r 1af407faae6d Makefile.am
--- a/Makefile.am	Fri Apr 09 01:26:42 2010 +0100
+++ b/Makefile.am	Fri Apr 09 12:54:33 2010 +0200
@@ -231,7 +231,7 @@ ICEDTEA_PATCHES = \
 	patches/zero/6909153.patch \
 	patches/zero/6913869.patch \
 	patches/zero/6914622.patch \
-	patches/zero/cppInterpreter-fast-bytecodes.patch \
+	patches/zero/6939845.patch \
 	patches/icedtea-notice-safepoints.patch \
 	patches/icedtea-parisc-opt.patch \
 	patches/icedtea-lucene-crash.patch \
diff -r 8bb5b3df3dc2 -r 1af407faae6d patches/zero/6939845.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/zero/6939845.patch	Fri Apr 09 12:54:33 2010 +0200
@@ -0,0 +1,20 @@
+--- openjdk.old/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp	Wed Mar 31 11:55:22 2010
++++ openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp	Wed Mar 31 11:55:22 2010
+@@ -2328,6 +2328,17 @@
+       }
+ 
+       DEFAULT:
++#ifdef ZERO
++          // Some zero configurations use the C++ interpreter as a
++          // fallback interpreter and have support for platform
++          // specific fast bytecodes which aren't supported here, so
++          // redispatch to the equivalent non-fast bytecode when they
++          // are encountered.
++          if (Bytecodes::is_defined((Bytecodes::Code)opcode)) {
++              opcode = (jubyte)Bytecodes::java_code((Bytecodes::Code)opcode);
++              goto opcode_switch;
++          }
++#endif
+           fatal2("\t*** Unimplemented opcode: %d = %s\n",
+                  opcode, Bytecodes::name((Bytecodes::Code)opcode));
+           goto finish;
diff -r 8bb5b3df3dc2 -r 1af407faae6d patches/zero/cppInterpreter-fast-bytecodes.patch
--- a/patches/zero/cppInterpreter-fast-bytecodes.patch	Fri Apr 09 01:26:42 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-Index: openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp
-===================================================================
---- openjdk.orig/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp	2010-03-19 10:35:14.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp	2010-03-19 10:39:01.000000000 +0100
-@@ -2328,6 +2328,10 @@
-       }
- 
-       DEFAULT:
-+         if (Bytecodes::is_defined((Bytecodes::Code)opcode)) {
-+           opcode = (jubyte)Bytecodes::java_code((Bytecodes::Code)opcode);
-+           goto opcode_switch;
-+         }
-           fatal2("\t*** Unimplemented opcode: %d = %s\n",
-                  opcode, Bytecodes::name((Bytecodes::Code)opcode));
-           goto finish;