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

rename memory_mapping() to find_memory_region() and simplify mem_map()

Browse Source
This commit is contained in:
Nguyen Anh Quynh
2023-02-06 17:59:16 +08:00
parent 7ca4769f2a
commit eb118528b1
3 changed files with 23 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1436,7 +1436,7 @@ load_helper(CPUArchState *env, target_ulong addr, TCGMemOpIdx oi,
bool handled;
HOOK_FOREACH_VAR_DECLARE;
struct uc_struct *uc = env->uc;
MemoryRegion *mr = memory_mapping(uc, addr);
MemoryRegion *mr = find_memory_region(uc, addr);
// memory might be still unmapped while reading or fetching
if (mr == NULL) {
@@ -1480,7 +1480,7 @@ load_helper(CPUArchState *env, target_ulong addr, TCGMemOpIdx oi,
if (handled) {
uc->invalid_error = UC_ERR_OK;
mr = memory_mapping(uc, addr);
mr = find_memory_region(uc, addr);
if (mr == NULL) {
uc->invalid_error = UC_ERR_MAP;
cpu_exit(uc->cpu);
@@ -2010,7 +2010,7 @@ store_helper(CPUArchState *env, target_ulong addr, uint64_t val,
}
// Load the latest memory mapping.
mr = memory_mapping(uc, addr);
mr = find_memory_region(uc, addr);
// Unicorn: callback on invalid memory
if (mr == NULL) {
@@ -2037,7 +2037,7 @@ store_helper(CPUArchState *env, target_ulong addr, uint64_t val,
return;
} else {
uc->invalid_error = UC_ERR_OK;
mr = memory_mapping(uc, addr);
mr = find_memory_region(uc, addr);
if (mr == NULL) {
uc->invalid_error = UC_ERR_MAP;
cpu_exit(uc->cpu);