[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 8/9] disas: Remove monitor_disas_is_physical
From: |
Richard Henderson |
Subject: |
[Qemu-devel] [PATCH v4 8/9] disas: Remove monitor_disas_is_physical |
Date: |
Thu, 28 Sep 2017 09:54:13 -0700 |
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.
Reviewed-by: Alex Bennée <address@hidden>
Signed-off-by: Richard Henderson <address@hidden>
---
disas.c | 16 ++++------------
1 file changed, 4 insertions(+), 12 deletions(-)
diff --git a/disas.c b/disas.c
index 0d212f2ac5..194c523885 100644
--- a/disas.c
+++ b/disas.c
@@ -513,19 +513,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;
}
@@ -540,8 +532,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;
--
2.13.5
- [Qemu-devel] [PATCH v4 0/9] Support the Capstone disassembler, Richard Henderson, 2017/09/28
- [Qemu-devel] [PATCH v4 1/9] target/i386: Convert to disas_set_info hook, Richard Henderson, 2017/09/28
- [Qemu-devel] [PATCH v4 6/9] arm: Support Capstone in disas_set_info, Richard Henderson, 2017/09/28
- [Qemu-devel] [PATCH v4 2/9] target/ppc: Convert to disas_set_info hook, Richard Henderson, 2017/09/28
- [Qemu-devel] [PATCH v4 4/9] disas: Support the Capstone disassembler library, Richard Henderson, 2017/09/28
- [Qemu-devel] [PATCH v4 5/9] i386: Support Capstone in disas_set_info, Richard Henderson, 2017/09/28
- [Qemu-devel] [PATCH v4 7/9] ppc: Support Capstone in disas_set_info, Richard Henderson, 2017/09/28
- [Qemu-devel] [PATCH v4 3/9] disas: Remove unused flags arguments, Richard Henderson, 2017/09/28
- [Qemu-devel] [PATCH v4 8/9] disas: Remove monitor_disas_is_physical,
Richard Henderson <=
- [Qemu-devel] [PATCH v4 9/9] disas: Add capstone as submodule, Richard Henderson, 2017/09/28