diff mbox series

[v2,for-4.0,1/3] disas.c: Use address_space_read() to read memory

Message ID 20181122172653.3413-2-peter.maydell@linaro.org
State Superseded
Headers show
Series Avoid cpu_physical_memory_read() in generic code | expand

Commit Message

Peter Maydell Nov. 22, 2018, 5:26 p.m. UTC 
Currently disas.c reads physical memory using
cpu_physical_memory_read(). This effectively hard-codes
assuming that all CPUs have the same view of physical
memory. Switch to address_space_read() instead, which
lets us use the AddressSpace for the CPU we're
disassembling for.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>

---
 disas.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

-- 
2.19.1
diff mbox series

Patch

diff --git a/disas.c b/disas.c
index 5325b7e6be6..f9c517b3588 100644
--- a/disas.c
+++ b/disas.c
@@ -588,7 +588,10 @@  static int
 physical_read_memory(bfd_vma memaddr, bfd_byte *myaddr, int length,
                      struct disassemble_info *info)
 {
-    cpu_physical_memory_read(memaddr, myaddr, length);
+    CPUDebug *s = container_of(info, CPUDebug, info);
+
+    address_space_read(s->cpu->as, memaddr, MEMTXATTRS_UNSPECIFIED,
+                       myaddr, length);
     return 0;
 }