Mercurial > hg > release > icedtea6-1.12
changeset 2046:bc942c2695f5
Merge
| author | Andrew John Hughes <ahughes@redhat.com> |
|---|---|
| date | Tue, 30 Mar 2010 19:02:36 +0100 |
| parents | 3d6ec111052e (current diff) 906953e7c9af (diff) |
| children | c467335ab509 |
| files | ChangeLog Makefile.am |
| diffstat | 3 files changed, 21 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Tue Mar 30 13:42:04 2010 +0100 +++ b/ChangeLog Tue Mar 30 19:02:36 2010 +0100 @@ -1,3 +1,8 @@ +2010-03-30 Edward Nevill <ed@camswl.com> + + * bytecodeInterpreter.cpp + Fix to support fast bytecodes + 2010-03-30 Andrew John Hughes <ahughes@redhat.com> * patches/openjdk/annotation-tests.patch:
--- a/Makefile.am Tue Mar 30 13:42:04 2010 +0100 +++ b/Makefile.am Tue Mar 30 19:02:36 2010 +0100 @@ -228,6 +228,7 @@ patches/zero/6909153.patch \ patches/zero/6913869.patch \ patches/zero/6914622.patch \ + patches/zero/cppInterpreter-fast-bytecodes.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/cppInterpreter-fast-bytecodes.patch Tue Mar 30 19:02:36 2010 +0100 @@ -0,0 +1,15 @@ +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;