Mercurial > hg > truffle
diff src/share/vm/code/nmethod.hpp @ 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 | ef00461e29af |
line wrap: on
line diff
--- a/src/share/vm/code/nmethod.hpp Fri Feb 10 02:22:23 2012 +0100 +++ b/src/share/vm/code/nmethod.hpp Fri Feb 10 17:04:03 2012 +0100 @@ -592,7 +592,7 @@ // (tw) When using graal, the address might be off by 5 (because this is the size of the call instruction. // (tw) TODO: Replace this by a more general mechanism. - bool is_deopt_entry (address pc) { return pc == deopt_handler_begin() || (UseGraal && pc == deopt_handler_begin() + 5); } + bool is_deopt_entry (address pc) { return pc == deopt_handler_begin() IS_GRAAL( || pc == deopt_handler_begin() + 5); } bool is_deopt_mh_entry(address pc) { return pc == deopt_mh_handler_begin(); } // Accessor/mutator for the original pc of a frame before a frame was deopted. address get_original_pc(const frame* fr) { return *orig_pc_addr(fr); }