[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 8/8] disas: QOMify alpha specific disas setup
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PULL 8/8] disas: QOMify alpha specific disas setup |
Date: |
Thu, 22 Oct 2015 18:22:39 +0200 |
From: Peter Crosthwaite <address@hidden>
Move the target_disas() alpha specifics to the CPUClass::disas_set_info()
hook and delete the #ifdef specific code in disas.c.
This also makes monitor_disas() consistent with target_disas(), as
monitor_disas() was missing a set of the BFD (This was an omission from
commit b9bec751c8c8b08d8055da32306eb105db03031b).
Signed-off-by: Peter Crosthwaite <address@hidden>
Acked-by: Richard Henderson <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>
---
disas.c | 5 -----
target-alpha/cpu.c | 8 ++++++++
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/disas.c b/disas.c
index bf16c42..4e11944 100644
--- a/disas.c
+++ b/disas.c
@@ -230,9 +230,6 @@ void target_disas(FILE *out, CPUState *cpu, target_ulong
code,
}
s.info.disassembler_options = (char *)"any";
s.info.print_insn = print_insn_ppc;
-#elif defined(TARGET_ALPHA)
- s.info.mach = bfd_mach_alpha_ev6;
- s.info.print_insn = print_insn_alpha;
#endif
if (s.info.print_insn == NULL) {
s.info.print_insn = print_insn_od_target;
@@ -404,8 +401,6 @@ void monitor_disas(Monitor *mon, CPUState *cpu,
s.info.mach = bfd_mach_i386_i386;
}
s.info.print_insn = print_insn_i386;
-#elif defined(TARGET_ALPHA)
- s.info.print_insn = print_insn_alpha;
#elif defined(TARGET_PPC)
if (flags & 0xFFFF) {
/* If we have a precise definition of the instruction set, use it. */
diff --git a/target-alpha/cpu.c b/target-alpha/cpu.c
index ff1926a..e5bdfa8 100644
--- a/target-alpha/cpu.c
+++ b/target-alpha/cpu.c
@@ -46,6 +46,12 @@ static bool alpha_cpu_has_work(CPUState *cs)
| CPU_INTERRUPT_MCHK);
}
+static void alpha_cpu_disas_set_info(CPUState *cpu, disassemble_info *info)
+{
+ info->mach = bfd_mach_alpha_ev6;
+ info->print_insn = print_insn_alpha;
+}
+
static void alpha_cpu_realizefn(DeviceState *dev, Error **errp)
{
CPUState *cs = CPU(dev);
@@ -297,6 +303,8 @@ static void alpha_cpu_class_init(ObjectClass *oc, void
*data)
cc->get_phys_page_debug = alpha_cpu_get_phys_page_debug;
dc->vmsd = &vmstate_alpha_cpu;
#endif
+ cc->disas_set_info = alpha_cpu_disas_set_info;
+
cc->gdb_num_core_regs = 67;
/*
--
2.1.4
- [Qemu-devel] [PULL 0/8] QOM CPUState patch queue 2015-10-22, Andreas Färber, 2015/10/22
- [Qemu-devel] [PULL 6/8] disas: QOMify sh4 specific disas setup, Andreas Färber, 2015/10/22
- [Qemu-devel] [PULL 4/8] disas: QOMify sparc specific disas setup, Andreas Färber, 2015/10/22
- [Qemu-devel] [PULL 5/8] disas: QOMify lm32 specific disas setup, Andreas Färber, 2015/10/22
- [Qemu-devel] [PULL 1/8] disas: QOMify s390x specific disas setup, Andreas Färber, 2015/10/22
- [Qemu-devel] [PULL 3/8] disas: QOMify m68k specific disas setup, Andreas Färber, 2015/10/22
- [Qemu-devel] [PULL 8/8] disas: QOMify alpha specific disas setup,
Andreas Färber <=
- [Qemu-devel] [PULL 2/8] disas: QOMify moxie specific disas setup, Andreas Färber, 2015/10/22
- [Qemu-devel] [PULL 7/8] disas: QOMify mips specific disas setup, Andreas Färber, 2015/10/22
- Re: [Qemu-devel] [PULL 0/8] QOM CPUState patch queue 2015-10-22, Peter Maydell, 2015/10/22