lazymio/unicorn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't call hooks if there is already an unhandled exception

Browse Source
This commit is contained in:
lazymio
2022-05-20 13:15:23 +02:00
parent 0d41d4bbb2
commit 5d37e21db5
1 changed files with 32 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
qemu/accel/tcg/cputlb.c
View File

@@ -1441,36 +1441,41 @@ load_helper(CPUArchState *env, target_ulong addr, TCGMemOpIdx oi,
// memory might be still unmapped while reading or fetching // memory might be still unmapped while reading or fetching
if (mr == NULL) { if (mr == NULL) {
handled = false; handled = false;
if (code_read) { // if there is already an unhandled eror, skip callbacks.
// code fetching if (uc->invalid_error == UC_ERR_OK) {
error_code = UC_ERR_FETCH_UNMAPPED; if (code_read) {
HOOK_FOREACH(uc, hook, UC_HOOK_MEM_FETCH_UNMAPPED) { // code fetching
if (hook->to_delete) error_code = UC_ERR_FETCH_UNMAPPED;
continue; HOOK_FOREACH(uc, hook, UC_HOOK_MEM_FETCH_UNMAPPED) {
if (!HOOK_BOUND_CHECK(hook, addr)) if (hook->to_delete)
continue; continue;
if ((handled = ((uc_cb_eventmem_t)hook->callback)(uc, UC_MEM_FETCH_UNMAPPED, addr, size - uc->size_recur_mem, 0, hook->user_data))) if (!HOOK_BOUND_CHECK(hook, addr))
break; continue;
if ((handled = ((uc_cb_eventmem_t)hook->callback)(uc, UC_MEM_FETCH_UNMAPPED, addr, size - uc->size_recur_mem, 0, hook->user_data)))
break;
// the last callback may already asked to stop emulation // the last callback may already asked to stop emulation
if (uc->stop_request) if (uc->stop_request)
break; break;
}
} else {
// data reading
error_code = UC_ERR_READ_UNMAPPED;
HOOK_FOREACH(uc, hook, UC_HOOK_MEM_READ_UNMAPPED) {
if (hook->to_delete)
continue;
if (!HOOK_BOUND_CHECK(hook, addr))
continue;
if ((handled = ((uc_cb_eventmem_t)hook->callback)(uc, UC_MEM_READ_UNMAPPED, addr, size - uc->size_recur_mem, 0, hook->user_data)))
break;
// the last callback may already asked to stop emulation
if (uc->stop_request)
break;
}
} }
} else { } else {
// data reading error_code = uc->invalid_error;
error_code = UC_ERR_READ_UNMAPPED;
HOOK_FOREACH(uc, hook, UC_HOOK_MEM_READ_UNMAPPED) {
if (hook->to_delete)
continue;
if (!HOOK_BOUND_CHECK(hook, addr))
continue;
if ((handled = ((uc_cb_eventmem_t)hook->callback)(uc, UC_MEM_READ_UNMAPPED, addr, size - uc->size_recur_mem, 0, hook->user_data)))
break;
// the last callback may already asked to stop emulation
if (uc->stop_request)
break;
}
} }
if (handled) { if (handled) {