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

load_helper only call cpu_loop_exit() when emulation is running

Browse Source 
The load_helper is sometimes called from register writes. When the load
fails check if emulation is running before jump out of the emulated code.
This commit is contained in:
Takacs, Philipp
2023-05-09 14:20:11 +02:00
parent 1d9c5c7653
commit 073c4b74ca
2 changed files with 35 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1520,21 +1520,25 @@ load_helper(CPUArchState *env, target_ulong addr, TCGMemOpIdx oi,
mr = find_memory_region(uc, paddr);
if (mr == NULL) {
uc->invalid_error = UC_ERR_MAP;
cpu_exit(uc->cpu);
// XXX(@lazymio): We have to exit early so that the target register won't be overwritten
// because qemu might generate tcg code like:
// qemu_ld_i64 x0,x1,leq,8 sync: 0 dead: 0 1
// where we don't have a change to recover x0 value
cpu_loop_exit(uc->cpu);
if (!uc->cpu->stopped) {
cpu_exit(uc->cpu);
// XXX(@lazymio): We have to exit early so that the target register won't be overwritten
// because qemu might generate tcg code like:
// qemu_ld_i64 x0,x1,leq,8 sync: 0 dead: 0 1
// where we don't have a change to recover x0 value
cpu_loop_exit(uc->cpu);
}
return 0;
}
} else {
uc->invalid_addr = paddr;
uc->invalid_error = error_code;
// printf("***** Invalid fetch (unmapped memory) at " TARGET_FMT_lx "\n", addr);
cpu_exit(uc->cpu);
// See comments above
cpu_loop_exit(uc->cpu);
if (!uc->cpu->stopped) {
cpu_exit(uc->cpu);
// See comments above
cpu_loop_exit(uc->cpu);
}
return 0;
}
}
@@ -1588,9 +1592,11 @@ load_helper(CPUArchState *env, target_ulong addr, TCGMemOpIdx oi,
uc->invalid_addr = paddr;
uc->invalid_error = UC_ERR_READ_PROT;
// printf("***** Invalid memory read (non-readable) at " TARGET_FMT_lx "\n", addr);
cpu_exit(uc->cpu);
// See comments above
cpu_loop_exit(uc->cpu);
if (!uc->cpu->stopped) {
cpu_exit(uc->cpu);
// See comments above
cpu_loop_exit(uc->cpu);
}
return 0;
}
}
@@ -1618,9 +1624,11 @@ load_helper(CPUArchState *env, target_ulong addr, TCGMemOpIdx oi,
uc->invalid_addr = paddr;
uc->invalid_error = UC_ERR_FETCH_PROT;
// printf("***** Invalid fetch (non-executable) at " TARGET_FMT_lx "\n", addr);
cpu_exit(uc->cpu);
// See comments above
cpu_loop_exit(uc->cpu);
if (!uc->cpu->stopped) {
cpu_exit(uc->cpu);
// See comments above
cpu_loop_exit(uc->cpu);
}
return 0;
}
}