aboutsummaryrefslogtreecommitdiff
path: root/disas.c
diff options
context:
space:
mode:
authorRichard Henderson <richard.henderson@linaro.org>2017-09-19 09:40:40 -0500
committerRichard Henderson <richard.henderson@linaro.org>2017-10-25 11:55:21 +0200
commitb8d8720892f7912e8a2621b30ebac0e9a48e89e3 (patch)
tree5bca0e09dfdd109bd19f57aa20e9d8b1a27eec6e /disas.c
parentac226899db15c5751f5b1f4f42ea4b31a3d360e0 (diff)
downloadqemu-b8d8720892f7912e8a2621b30ebac0e9a48e89e3.zip
qemu-b8d8720892f7912e8a2621b30ebac0e9a48e89e3.tar.gz
qemu-b8d8720892f7912e8a2621b30ebac0e9a48e89e3.tar.bz2
disas: Remove monitor_disas_is_physical
Even though there is only one monitor, and thus no race on this global data object, there is also no point in having it. We can just as well record the decision in the read_memory_function that we select. Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Reviewed-by: Alex Bennée <alex.bennee@linaro.org> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Diffstat (limited to 'disas.c')
-rw-r--r--disas.c16
1 files changed, 4 insertions, 12 deletions
diff --git a/disas.c b/disas.c
index e52e776..92b389d 100644
--- a/disas.c
+++ b/disas.c
@@ -512,19 +512,11 @@ const char *lookup_symbol(target_ulong orig_addr)
#include "monitor/monitor.h"
-static int monitor_disas_is_physical;
-
static int
-monitor_read_memory (bfd_vma memaddr, bfd_byte *myaddr, int length,
+physical_read_memory(bfd_vma memaddr, bfd_byte *myaddr, int length,
struct disassemble_info *info)
{
- CPUDebug *s = container_of(info, CPUDebug, info);
-
- if (monitor_disas_is_physical) {
- cpu_physical_memory_read(memaddr, myaddr, length);
- } else {
- cpu_memory_rw_debug(s->cpu, memaddr, myaddr, length, 0);
- }
+ cpu_physical_memory_read(memaddr, myaddr, length);
return 0;
}
@@ -539,8 +531,8 @@ void monitor_disas(Monitor *mon, CPUState *cpu,
INIT_DISASSEMBLE_INFO(s.info, (FILE *)mon, monitor_fprintf);
s.cpu = cpu;
- monitor_disas_is_physical = is_physical;
- s.info.read_memory_func = monitor_read_memory;
+ s.info.read_memory_func
+ = (is_physical ? physical_read_memory : target_read_memory);
s.info.print_address_func = generic_print_address;
s.info.buffer_vma = pc;
s.info.cap_arch = -1;