archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-26 22:34:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8209626: [JVMCI] Use implicit exception table for dispatch and printing

Browse source 
Reviewed-by: kvn
This commit is contained in:
Tom Rodriguez 2019-06-07 10:26:21 -07:00
parent f28e32dbe3
commit 38204f9c65
17 changed files with 192 additions and 97 deletions
Download patch file Download diff file Expand all files Collapse all files

96
src/hotspot/share/code/nmethod.cpp
View file

@ -923,6 +923,7 @@ void nmethod::print_nmethod(bool printmethod) {
ttyLocker ttyl; // keep the following output all in one block
if (xtty != NULL) {
xtty->begin_head("print_nmethod");
log_identity(xtty);
xtty->stamp();
xtty->end_head();
}
@ -2093,34 +2094,6 @@ bool nmethod::is_patchable_at(address instr_addr) {
}
address nmethod::continuation_for_implicit_exception(address pc) {
// Exception happened outside inline-cache check code => we are inside
// an active nmethod => use cpc to determine a return address
int exception_offset = pc - code_begin();
int cont_offset = ImplicitExceptionTable(this).at( exception_offset );
#ifdef ASSERT
if (cont_offset == 0) {
Thread* thread = Thread::current();
ResetNoHandleMark rnm; // Might be called from LEAF/QUICK ENTRY
HandleMark hm(thread);
ResourceMark rm(thread);
CodeBlob* cb = CodeCache::find_blob(pc);
assert(cb != NULL && cb == this, "");
ttyLocker ttyl;
tty->print_cr("implicit exception happened at " INTPTR_FORMAT, p2i(pc));
// Print all available nmethod info.
print_nmethod(true);
method()->print_codes();
}
#endif
if (cont_offset == 0) {
// Let the normal error handling report the exception
return NULL;
}
return code_begin() + cont_offset;
}
void nmethod_init() {
// make sure you didn't forget to adjust the filler fields
assert(sizeof(nmethod) % oopSize == 0, "nmethod size must be multiple of a word");
@ -2213,6 +2186,30 @@ void nmethod::verify() {
}
}
#ifdef ASSERT
#if INCLUDE_JVMCI
{
// Verify that implicit exceptions that deoptimize have a PcDesc and OopMap
ImmutableOopMapSet* oms = oop_maps();
ImplicitExceptionTable implicit_table(this);
for (uint i = 0; i < implicit_table.len(); i++) {
int exec_offset = (int) implicit_table.get_exec_offset(i);
if (implicit_table.get_exec_offset(i) == implicit_table.get_cont_offset(i)) {
assert(pc_desc_at(code_begin() + exec_offset) != NULL, "missing PcDesc");
bool found = false;
for (int i = 0, imax = oms->count(); i < imax; i++) {
if (oms->pair_at(i)->pc_offset() == exec_offset) {
found = true;
break;
}
}
assert(found, "missing oopmap");
}
}
}
#endif
#endif
VerifyOopsClosure voc(this);
oops_do(&voc);
assert(voc.ok(), "embedded oops must be OK");
@ -3012,16 +3009,32 @@ bool nmethod::has_code_comment(address begin, address end) {
if (str != NULL) return true;
// implicit exceptions?
int cont_offset = ImplicitExceptionTable(this).at(begin - code_begin());
int cont_offset = ImplicitExceptionTable(this).continuation_offset(begin - code_begin());
if (cont_offset != 0) return true;
return false;
}
void nmethod::print_code_comment_on(outputStream* st, int column, address begin, address end) {
// First, find an oopmap in (begin, end].
// We use the odd half-closed interval so that oop maps and scope descs
// which are tied to the byte after a call are printed with the call itself.
ImplicitExceptionTable implicit_table(this);
int pc_offset = begin - code_begin();
int cont_offset = implicit_table.continuation_offset(pc_offset);
bool oop_map_required = false;
if (cont_offset != 0) {
st->move_to(column, 6, 0);
if (pc_offset == cont_offset) {
st->print("; implicit exception: deoptimizes");
oop_map_required = true;
} else {
st->print("; implicit exception: dispatches to " INTPTR_FORMAT, p2i(code_begin() + cont_offset));
}
}
// Find an oopmap in (begin, end]. We use the odd half-closed
// interval so that oop maps and scope descs which are tied to the
// byte after a call are printed with the call itself. OopMaps
// associated with implicit exceptions are printed with the implicit
// instruction.
address base = code_begin();
ImmutableOopMapSet* oms = oop_maps();
if (oms != NULL) {
@ -3029,16 +3042,25 @@ void nmethod::print_code_comment_on(outputStream* st, int column, address begin,
const ImmutableOopMapPair* pair = oms->pair_at(i);
const ImmutableOopMap* om = pair->get_from(oms);
address pc = base + pair->pc_offset();
if (pc > begin) {
if (pc <= end) {
if (pc >= begin) {
#if INCLUDE_JVMCI
bool is_implicit_deopt = implicit_table.continuation_offset(pair->pc_offset()) == (uint) pair->pc_offset();
#else
bool is_implicit_deopt = false;
#endif
if (is_implicit_deopt ? pc == begin : pc > begin && pc <= end) {
st->move_to(column, 6, 0);
st->print("; ");
om->print_on(st);
oop_map_required = false;
}
}
if (pc > end) {
break;
}
}
}
assert(!oop_map_required, "missed oopmap");
// Print any debug info present at this pc.
ScopeDesc* sd = scope_desc_in(begin, end);
@ -3128,12 +3150,6 @@ void nmethod::print_code_comment_on(outputStream* st, int column, address begin,
st->move_to(column, 6, 0);
st->print("; {%s}", str);
}
int cont_offset = ImplicitExceptionTable(this).at(begin - code_begin());
if (cont_offset != 0) {
st->move_to(column, 6, 0);
st->print("; implicit exception: dispatches to " INTPTR_FORMAT, p2i(code_begin() + cont_offset));
}
}
#endif