# HG changeset patch
# User twisti
# Date 1301033080 25200
# Node ID b868d9928221476e8b25be159a3c0571e8c0aa5b
# Parent  151da0c145a8e4de263740273ec10c0eb46b30d0# Parent  0a5d9566b8a49977c2305e26cf99e9d42376a4a2
Merge

diff -r 0a5d9566b8a4 -r b868d9928221 src/share/vm/interpreter/bytecodeInterpreter.cpp
--- a/src/share/vm/interpreter/bytecodeInterpreter.cpp	Wed Mar 23 04:19:16 2011 -0700
+++ b/src/share/vm/interpreter/bytecodeInterpreter.cpp	Thu Mar 24 23:04:40 2011 -0700
@@ -2383,17 +2383,6 @@
       }
 
       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
           fatal(err_msg("Unimplemented opcode %d = %s", opcode,
                         Bytecodes::name((Bytecodes::Code)opcode)));
           goto finish;