Mercurial > hg > release > icedtea6-1.12
changeset 2022:1af407faae6d
2010-04-09 Xerxes R?nby <xerxes@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.
| author | Xerxes R?nby <xerxes@zafena.se> |
|---|---|
| date | Fri, 09 Apr 2010 12:54:33 +0200 |
| parents | 8bb5b3df3dc2 |
| children | cb06ab3e6d36 c4d1a639219e |
| files | ChangeLog Makefile.am patches/zero/6939845.patch patches/zero/cppInterpreter-fast-bytecodes.patch |
| diffstat | 4 files changed, 30 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- 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-09 Xerxes Rånby <xerxes@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@redhat.com> * configure.ac: Move NSS detection to macros
--- 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 @@ 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 \
--- /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;
--- 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;