[qemu-xen master] target/m68k: fix physical address translation in m68k_cpu_get_phys_page_debug()

[patchbot@xxxxxxx]

commit 78318119eead6aed050d1730a6b72d1c555302d2
Author:     Mark Cave-Ayland <mark.cave-ayland@xxxxxxxxxxxx>
AuthorDate: Wed Jul 1 21:15:30 2020 +0100
Commit:     Laurent Vivier <laurent@xxxxxxxxx>
CommitDate: Mon Jul 6 21:39:19 2020 +0200

    target/m68k: fix physical address translation in 
m68k_cpu_get_phys_page_debug()
    
    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@xxxxxxxxxxxx>
    Reviewed-by: Philippe Mathieu-Daudé <f4bug@xxxxxxxxx>
    Reviewed-by: Laurent Vivier <laurent@xxxxxxxxx>
    Message-Id: <20200701201531.13828-2-mark.cave-ayland@xxxxxxxxxxxx>
    Signed-off-by: Laurent Vivier <laurent@xxxxxxxxx>
---
 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;
 }
 
--
generated by git-patchbot for /home/xen/git/qemu-xen.git#master