yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2024-12-23 18:25:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

target/m68k: fix physical address translation in m68k_cpu_get_phys_page_debug()

Browse source 
The result of the get_physical_address() function should be combined with the
offset of the original page access before being returned. Otherwise the
m68k_cpu_get_phys_page_debug() function can round to the wrong page causing
incorrect lookups in gdbstub and various "Disassembler disagrees with
translator over instruction decoding" warnings to appear at translation time.

Fixes: 88b2fef6c3 ("target/m68k: add MC68040 MMU")
This commit is contained in:
Mark Cave-Ayland 2021-02-25 23:11:58 -05:00 committed by Lioncash
parent 65d5288563
commit 3b2bc4b0c8
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
qemu/target/m68k/helper.c
View file

@ -467,10 +467,14 @@ hwaddr m68k_cpu_get_phys_page_debug(CPUState *cs, vaddr addr)
if (env->sr & SR_S) {
access_type |= ACCESS_SUPER;
}
if (get_physical_address(env, &phys_addr, &prot,
addr, access_type, &page_size) != 0) {
return -1;
}
addr &= TARGET_PAGE_MASK;
phys_addr += addr & (page_size - 1);
return phys_addr;
}