Mercurial > hg > graal-compiler

comparison src/share/vm/interpreter/rewriter.cpp @ 4559:723df37192d6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make it possible again to build a real client libjvm, drop the UseGraal flag. Use the --vm option instead of a special -vm option in the bench command
author Gilles Duboscq <duboscq@ssw.jku.at>
date Fri, 10 Feb 2012 17:04:03 +0100
parents 82af018d61db
children 957c266d8bc5
comparison
equal deleted inserted replaced
4558:3706975946e4 4559:723df37192d6
116 void Rewriter::rewrite_Object_init(methodHandle method, TRAPS) { 116 void Rewriter::rewrite_Object_init(methodHandle method, TRAPS) {
117 RawBytecodeStream bcs(method); 117 RawBytecodeStream bcs(method);
118 while (!bcs.is_last_bytecode()) { 118 while (!bcs.is_last_bytecode()) {
119 Bytecodes::Code opcode = bcs.raw_next(); 119 Bytecodes::Code opcode = bcs.raw_next();
120 switch (opcode) { 120 switch (opcode) {
121 case Bytecodes::_return: if (!UseGraal) { *bcs.bcp() = Bytecodes::_return_register_finalizer; } break; 121 case Bytecodes::_return:
122 #ifndef GRAAL
123 *bcs.bcp() = Bytecodes::_return_register_finalizer;
124 #endif
125 break;
122 126
123 case Bytecodes::_istore: 127 case Bytecodes::_istore:
124 case Bytecodes::_lstore: 128 case Bytecodes::_lstore:
125 case Bytecodes::_fstore: 129 case Bytecodes::_fstore:
126 case Bytecodes::_dstore: 130 case Bytecodes::_dstore:
271 assert(bc_length != 0, "impossible bytecode length"); 275 assert(bc_length != 0, "impossible bytecode length");
272 276
273 switch (c) { 277 switch (c) {
274 case Bytecodes::_lookupswitch : { 278 case Bytecodes::_lookupswitch : {
275 #ifndef CC_INTERP 279 #ifndef CC_INTERP
276 if (!UseGraal) { 280 #ifndef GRAAL
277 Bytecode_lookupswitch bc(method, bcp); 281 Bytecode_lookupswitch bc(method, bcp);
278 (*bcp) = ( 282 (*bcp) = (
279 bc.number_of_pairs() < BinarySwitchThreshold 283 bc.number_of_pairs() < BinarySwitchThreshold
280 ? Bytecodes::_fast_linearswitch 284 ? Bytecodes::_fast_linearswitch
281 : Bytecodes::_fast_binaryswitch 285 : Bytecodes::_fast_binaryswitch
282 ); 286 );
283 } 287 #endif
284 #endif 288 #endif
285 break; 289 break;
286 } 290 }
287 case Bytecodes::_fast_linearswitch: 291 case Bytecodes::_fast_linearswitch:
288 case Bytecodes::_fast_binaryswitch: { 292 case Bytecodes::_fast_binaryswitch: {