comparison src/share/vm/code/nmethod.hpp @ 4562:ef00461e29af

Merge
author Christian Haeubl <christian.haeubl@oracle.com>
date Fri, 10 Feb 2012 10:16:19 -0800
parents 35ca3ade314d 723df37192d6
children 33df1aeaebbf
comparison
equal deleted inserted replaced
4561:35ca3ade314d 4562:ef00461e29af
590 // Return true is the PC is one would expect if the frame is being deopted. 590 // Return true is the PC is one would expect if the frame is being deopted.
591 bool is_deopt_pc (address pc) { return is_deopt_entry(pc) || is_deopt_mh_entry(pc); } 591 bool is_deopt_pc (address pc) { return is_deopt_entry(pc) || is_deopt_mh_entry(pc); }
592 592
593 // (tw) When using graal, the address might be off by 5 (because this is the size of the call instruction. 593 // (tw) When using graal, the address might be off by 5 (because this is the size of the call instruction.
594 // (tw) TODO: Replace this by a more general mechanism. 594 // (tw) TODO: Replace this by a more general mechanism.
595 bool is_deopt_entry (address pc) { return pc == deopt_handler_begin() || (UseGraal && pc == deopt_handler_begin() + 5); } 595 bool is_deopt_entry (address pc) { return pc == deopt_handler_begin() IS_GRAAL( || pc == deopt_handler_begin() + 5); }
596 bool is_deopt_mh_entry(address pc) { return pc == deopt_mh_handler_begin(); } 596 bool is_deopt_mh_entry(address pc) { return pc == deopt_mh_handler_begin(); }
597 // Accessor/mutator for the original pc of a frame before a frame was deopted. 597 // Accessor/mutator for the original pc of a frame before a frame was deopted.
598 address get_original_pc(const frame* fr) { return *orig_pc_addr(fr); } 598 address get_original_pc(const frame* fr) { return *orig_pc_addr(fr); }
599 void set_original_pc(const frame* fr, address pc) { *orig_pc_addr(fr) = pc; } 599 void set_original_pc(const frame* fr, address pc) { *orig_pc_addr(fr) = pc; }
600 600