[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 10/11] disas: Remove monitor_disas_is_physical
From: |
Richard Henderson |
Subject: |
[Qemu-devel] [PULL 10/11] disas: Remove monitor_disas_is_physical |
Date: |
Wed, 25 Oct 2017 14:30:55 +0200 |
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é <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
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 e52e776a60..92b389d25f 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;
--
2.13.6
- [Qemu-devel] [PULL 04/11] target/arm: Don't set INSN_ARM_BE32 for CONFIG_USER_ONLY, (continued)
- [Qemu-devel] [PULL 04/11] target/arm: Don't set INSN_ARM_BE32 for CONFIG_USER_ONLY, Richard Henderson, 2017/10/25
- [Qemu-devel] [PULL 03/11] target/arm: Move BE32 disassembler fixup, Richard Henderson, 2017/10/25
- [Qemu-devel] [PULL 01/11] target/i386: Convert to disas_set_info hook, Richard Henderson, 2017/10/25
- [Qemu-devel] [PULL 02/11] target/ppc: Convert to disas_set_info hook, Richard Henderson, 2017/10/25
- [Qemu-devel] [PULL 06/11] disas: Support the Capstone disassembler library, Richard Henderson, 2017/10/25
- [Qemu-devel] [PULL 09/11] ppc: Support Capstone in disas_set_info, Richard Henderson, 2017/10/25
- [Qemu-devel] [PULL 07/11] i386: Support Capstone in disas_set_info, Richard Henderson, 2017/10/25
- [Qemu-devel] [PULL 05/11] disas: Remove unused flags arguments, Richard Henderson, 2017/10/25
- [Qemu-devel] [PULL 11/11] disas: Add capstone as submodule, Richard Henderson, 2017/10/25
- [Qemu-devel] [PULL 08/11] arm: Support Capstone in disas_set_info, Richard Henderson, 2017/10/25
- [Qemu-devel] [PULL 10/11] disas: Remove monitor_disas_is_physical,
Richard Henderson <=
- Re: [Qemu-devel] [PULL 00/11] Disassembler patches, no-reply, 2017/10/26
- Re: [Qemu-devel] [PULL 00/11] Disassembler patches, Peter Maydell, 2017/10/26
- Re: [Qemu-devel] [PULL 00/11] Disassembler patches, Peter Maydell, 2017/10/26
- Re: [Qemu-devel] [PULL 00/11] Disassembler patches, Daniel P. Berrange, 2017/10/26
- Re: [Qemu-devel] [PULL 00/11] Disassembler patches, Peter Maydell, 2017/10/26
- Re: [Qemu-devel] [PULL 00/11] Disassembler patches, Richard Henderson, 2017/10/26
- Re: [Qemu-devel] [PULL 00/11] Disassembler patches, Daniel P. Berrange, 2017/10/26
- Re: [Qemu-devel] [PULL 00/11] Disassembler patches, Philippe Mathieu-Daudé, 2017/10/26
- Re: [Qemu-devel] [PULL 00/11] Disassembler patches, Daniel P. Berrange, 2017/10/26
- Re: [Qemu-devel] [PULL 00/11] Disassembler patches, Peter Maydell, 2017/10/26