Message ID | 20200701201531.13828-2-mark.cave-ayland@ilande.co.uk (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | target/m68k: fix physical address translation in m68k_cpu_get_phys_page_debug() | expand |
Le 01/07/2020 à 22:15, Mark Cave-Ayland a écrit : > 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") > Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> > Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > Reviewed-by: Laurent Vivier <laurent@vivier.eu> > --- > target/m68k/helper.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/target/m68k/helper.c b/target/m68k/helper.c > index 79b0b10ea9..631eab7774 100644 > --- a/target/m68k/helper.c > +++ b/target/m68k/helper.c > @@ -820,10 +820,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; > } > > Applied to my m68k branch. Thanks, Laurent
diff --git a/target/m68k/helper.c b/target/m68k/helper.c index 79b0b10ea9..631eab7774 100644 --- a/target/m68k/helper.c +++ b/target/m68k/helper.c @@ -820,10 +820,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; }