mirrors
/
unicorn
mirror of https://github.com/unicorn-engine/unicorn
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixup! load_helper only call cpu_loop_exit() when emulation is running

This commit is contained in:
Takacs, Philipp 2023-05-12 12:28:39 +02:00
parent 073c4b74ca
commit 4a7b3b7a3a
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1520,7 +1520,7 @@ load_helper(CPUArchState *env, target_ulong addr, TCGMemOpIdx oi,
mr = find_memory_region(uc, paddr);
if (mr == NULL) {
uc->invalid_error = UC_ERR_MAP;
if (!uc->cpu->stopped) {
if (uc->nested_level > 0) {
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:
@ -1534,7 +1534,7 @@ load_helper(CPUArchState *env, target_ulong addr, TCGMemOpIdx oi,
uc->invalid_addr = paddr;
uc->invalid_error = error_code;
// printf("***** Invalid fetch (unmapped memory) at " TARGET_FMT_lx "\n", addr);
if (!uc->cpu->stopped) {
if (uc->nested_level > 0) {
cpu_exit(uc->cpu);
// See comments above
cpu_loop_exit(uc->cpu);
@ -1592,7 +1592,7 @@ 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);
if (!uc->cpu->stopped) {
if (uc->nested_level > 0) {
cpu_exit(uc->cpu);
// See comments above
cpu_loop_exit(uc->cpu);
@ -1624,7 +1624,7 @@ 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);
if (!uc->cpu->stopped) {
if (uc->nested_level > 0) {
cpu_exit(uc->cpu);
// See comments above
cpu_loop_exit(uc->cpu);