Merge

Thu, 24 Mar 2011 23:49:56 -0700

author
jcoomes
date
Thu, 24 Mar 2011 23:49:56 -0700
changeset 2679
f731b22cd52d
parent 2670
006b3750a4d4
parent 2678
b868d9928221
child 2681
b2949bf39900

Merge

src/share/vm/interpreter/bytecodeInterpreter.cpp file | annotate | diff | comparison | revisions
     1.1 --- a/src/share/vm/interpreter/bytecodeInterpreter.cpp	Thu Mar 24 23:06:13 2011 -0700
     1.2 +++ b/src/share/vm/interpreter/bytecodeInterpreter.cpp	Thu Mar 24 23:49:56 2011 -0700
     1.3 @@ -2383,17 +2383,6 @@
     1.4        }
     1.5  
     1.6        DEFAULT:
     1.7 -#ifdef ZERO
     1.8 -          // Some zero configurations use the C++ interpreter as a
     1.9 -          // fallback interpreter and have support for platform
    1.10 -          // specific fast bytecodes which aren't supported here, so
    1.11 -          // redispatch to the equivalent non-fast bytecode when they
    1.12 -          // are encountered.
    1.13 -          if (Bytecodes::is_defined((Bytecodes::Code)opcode)) {
    1.14 -              opcode = (jubyte)Bytecodes::java_code((Bytecodes::Code)opcode);
    1.15 -              goto opcode_switch;
    1.16 -          }
    1.17 -#endif
    1.18            fatal(err_msg("Unimplemented opcode %d = %s", opcode,
    1.19                          Bytecodes::name((Bytecodes::Code)opcode)));
    1.20            goto finish;

mercurial