[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 7/8] disas: QOMify mips specific disas setup
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PULL 7/8] disas: QOMify mips specific disas setup |
Date: |
Thu, 22 Oct 2015 18:22:38 +0200 |
From: Peter Crosthwaite <address@hidden>
Move the target_disas() mips specifics to the CPUClass::disas_set_info()
hook and delete the #ifdef specific code in disas.c.
Cc: Aurelien Jarno <address@hidden>
Signed-off-by: Peter Crosthwaite <address@hidden>
Acked-by: Leon Alrae <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>
---
disas.c | 12 ------------
target-mips/cpu.c | 9 +++++++++
2 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/disas.c b/disas.c
index 2676e2f..bf16c42 100644
--- a/disas.c
+++ b/disas.c
@@ -230,12 +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_MIPS)
-#ifdef TARGET_WORDS_BIGENDIAN
- s.info.print_insn = print_insn_big_mips;
-#else
- s.info.print_insn = print_insn_little_mips;
-#endif
#elif defined(TARGET_ALPHA)
s.info.mach = bfd_mach_alpha_ev6;
s.info.print_insn = print_insn_alpha;
@@ -427,12 +421,6 @@ void monitor_disas(Monitor *mon, CPUState *cpu,
s.info.endian = BFD_ENDIAN_LITTLE;
}
s.info.print_insn = print_insn_ppc;
-#elif defined(TARGET_MIPS)
-#ifdef TARGET_WORDS_BIGENDIAN
- s.info.print_insn = print_insn_big_mips;
-#else
- s.info.print_insn = print_insn_little_mips;
-#endif
#endif
if (!s.info.print_insn) {
monitor_printf(mon, "0x" TARGET_FMT_lx
diff --git a/target-mips/cpu.c b/target-mips/cpu.c
index 7fe1f04..37880d2 100644
--- a/target-mips/cpu.c
+++ b/target-mips/cpu.c
@@ -97,6 +97,14 @@ static void mips_cpu_reset(CPUState *s)
#endif
}
+static void mips_cpu_disas_set_info(CPUState *s, disassemble_info *info) {
+#ifdef TARGET_WORDS_BIGENDIAN
+ info->print_insn = print_insn_big_mips;
+#else
+ info->print_insn = print_insn_little_mips;
+#endif
+}
+
static void mips_cpu_realizefn(DeviceState *dev, Error **errp)
{
CPUState *cs = CPU(dev);
@@ -150,6 +158,7 @@ static void mips_cpu_class_init(ObjectClass *c, void *data)
cc->get_phys_page_debug = mips_cpu_get_phys_page_debug;
cc->vmsd = &vmstate_mips_cpu;
#endif
+ cc->disas_set_info = mips_cpu_disas_set_info;
cc->gdb_num_core_regs = 73;
cc->gdb_stop_before_watchpoint = true;
--
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, 2015/10/22
- [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 <=
- Re: [Qemu-devel] [PULL 0/8] QOM CPUState patch queue 2015-10-22, Peter Maydell, 2015/10/22