Mercurial > hg > truffle
diff src/share/vm/runtime/sharedRuntime.cpp @ 4559:723df37192d6
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 | 04b9a2566eec |
| children | f9811bcf3402 |
line wrap: on
line diff
--- a/src/share/vm/runtime/sharedRuntime.cpp Fri Feb 10 02:22:23 2012 +0100 +++ b/src/share/vm/runtime/sharedRuntime.cpp Fri Feb 10 17:04:03 2012 +0100 @@ -714,15 +714,15 @@ #ifdef COMPILER1 if (t == NULL && nm->is_compiled_by_c1()) { - if (UseGraal) { - nm->make_not_entrant(); - JavaThread::current()->set_exception_pc(ret_pc); - JavaThread::current()->set_exception_oop(exception()); - return SharedRuntime::deopt_blob()->unpack_with_exception_in_tls(); - } else { - assert(nm->unwind_handler_begin() != NULL, ""); - return nm->unwind_handler_begin(); - } +#ifdef GRAAL + nm->make_not_entrant(); + JavaThread::current()->set_exception_pc(ret_pc); + JavaThread::current()->set_exception_oop(exception()); + return SharedRuntime::deopt_blob()->unpack_with_exception_in_tls(); +#else + assert(nm->unwind_handler_begin() != NULL, ""); + return nm->unwind_handler_begin(); +#endif } #endif @@ -877,11 +877,11 @@ #ifndef PRODUCT _implicit_null_throws++; #endif - if (UseGraal) { - target_pc = deoptimization_continuation(thread, pc, nm); - } else { - target_pc = nm->continuation_for_implicit_exception(pc); - } +#ifdef GRAAL + target_pc = deoptimization_continuation(thread, pc, nm); +#else + target_pc = nm->continuation_for_implicit_exception(pc); +#endif // If there's an unexpected fault, target_pc might be NULL, // in which case we want to fall through into the normal // error handling code. @@ -897,14 +897,14 @@ #ifndef PRODUCT _implicit_div0_throws++; #endif - if (UseGraal) { - if (TraceSignals) { - tty->print_cr("graal implicit div0"); - } - target_pc = deoptimization_continuation(thread, pc, nm); - } else { - target_pc = nm->continuation_for_implicit_exception(pc); +#ifdef GRAAL + if (TraceSignals) { + tty->print_cr("graal implicit div0"); } + target_pc = deoptimization_continuation(thread, pc, nm); +#else + target_pc = nm->continuation_for_implicit_exception(pc); +#endif // If there's an unexpected fault, target_pc might be NULL, // in which case we want to fall through into the normal // error handling code.