[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 1/8] disas: QOMify s390x specific disas setup
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PULL 1/8] disas: QOMify s390x specific disas setup |
Date: |
Thu, 22 Oct 2015 18:22:32 +0200 |
From: Peter Crosthwaite <address@hidden>
Move the target_disas() s390 specifics to the CPUClass::disas_set_info()
hook and delete the #ifdef specific code in disas.c.
Cc: Alexander Graf <address@hidden>
Signed-off-by: Peter Crosthwaite <address@hidden>
Acked-by: Richard Henderson <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>
---
disas.c | 6 ------
target-s390x/cpu.c | 8 ++++++++
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/disas.c b/disas.c
index 45878fa..655f23d 100644
--- a/disas.c
+++ b/disas.c
@@ -249,9 +249,6 @@ void target_disas(FILE *out, CPUState *cpu, target_ulong
code,
#elif defined(TARGET_ALPHA)
s.info.mach = bfd_mach_alpha_ev6;
s.info.print_insn = print_insn_alpha;
-#elif defined(TARGET_S390X)
- s.info.mach = bfd_mach_s390_64;
- s.info.print_insn = print_insn_s390;
#elif defined(TARGET_MOXIE)
s.info.mach = bfd_arch_moxie;
s.info.print_insn = print_insn_moxie;
@@ -462,9 +459,6 @@ void monitor_disas(Monitor *mon, CPUState *cpu,
#elif defined(TARGET_SH4)
s.info.mach = bfd_mach_sh4;
s.info.print_insn = print_insn_sh;
-#elif defined(TARGET_S390X)
- s.info.mach = bfd_mach_s390_64;
- s.info.print_insn = print_insn_s390;
#elif defined(TARGET_MOXIE)
s.info.mach = bfd_arch_moxie;
s.info.print_insn = print_insn_moxie;
diff --git a/target-s390x/cpu.c b/target-s390x/cpu.c
index ccfaa8a..189a2af 100644
--- a/target-s390x/cpu.c
+++ b/target-s390x/cpu.c
@@ -184,6 +184,12 @@ static void s390_cpu_machine_reset_cb(void *opaque)
}
#endif
+static void s390_cpu_disas_set_info(CPUState *cpu, disassemble_info *info)
+{
+ info->mach = bfd_mach_s390_64;
+ info->print_insn = print_insn_s390;
+}
+
static void s390_cpu_realizefn(DeviceState *dev, Error **errp)
{
CPUState *cs = CPU(dev);
@@ -351,6 +357,8 @@ static void s390_cpu_class_init(ObjectClass *oc, void *data)
cc->cpu_exec_interrupt = s390_cpu_exec_interrupt;
cc->debug_excp_handler = s390x_cpu_debug_excp_handler;
#endif
+ cc->disas_set_info = s390_cpu_disas_set_info;
+
cc->gdb_num_core_regs = S390_NUM_CORE_REGS;
cc->gdb_core_xml_file = "s390x-core64.xml";
--
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 <=
- [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, 2015/10/22
- Re: [Qemu-devel] [PULL 0/8] QOM CPUState patch queue 2015-10-22, Peter Maydell, 2015/10/22