[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 20/22] disas: microblaze: QOMify target specific disa
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PULL 20/22] disas: microblaze: QOMify target specific disas setup |
Date: |
Tue, 7 Jul 2015 01:14:03 +0200 |
From: Peter Crosthwaite <address@hidden>
Move the target_disas() MB specifics to the QOM disas_set_info hook
and delete the MB specific code in disas.c.
This also now adds support for monitor_disas() to Microblaze.
E.g.
(qemu) xp 0x90000000
0000000090000000: 0x94208001
And before this patch:
(qemu) xp/i 0x90000000
0x90000000: Asm output not supported on this arch
After:
(qemu) xp/i 0x90000000
0x90000000: mfs r1, rmsr
Reviewed-by: Edgar E. Iglesias <address@hidden>
Signed-off-by: Peter Crosthwaite <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>
---
disas.c | 3 ---
target-microblaze/cpu.c | 8 ++++++++
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/disas.c b/disas.c
index fde5029..937e08b 100644
--- a/disas.c
+++ b/disas.c
@@ -268,9 +268,6 @@ void target_disas(FILE *out, CPUState *cpu, target_ulong
code,
#elif defined(TARGET_S390X)
s.info.mach = bfd_mach_s390_64;
s.info.print_insn = print_insn_s390;
-#elif defined(TARGET_MICROBLAZE)
- s.info.mach = bfd_arch_microblaze;
- s.info.print_insn = print_insn_microblaze;
#elif defined(TARGET_MOXIE)
s.info.mach = bfd_arch_moxie;
s.info.print_insn = print_insn_moxie;
diff --git a/target-microblaze/cpu.c b/target-microblaze/cpu.c
index 128d032..9ac509a 100644
--- a/target-microblaze/cpu.c
+++ b/target-microblaze/cpu.c
@@ -119,6 +119,12 @@ static void mb_cpu_reset(CPUState *s)
#endif
}
+static void mb_disas_set_info(CPUState *cpu, disassemble_info *info)
+{
+ info->mach = bfd_arch_microblaze;
+ info->print_insn = print_insn_microblaze;
+}
+
static void mb_cpu_realizefn(DeviceState *dev, Error **errp)
{
CPUState *cs = CPU(dev);
@@ -256,6 +262,8 @@ static void mb_cpu_class_init(ObjectClass *oc, void *data)
dc->vmsd = &vmstate_mb_cpu;
dc->props = mb_properties;
cc->gdb_num_core_regs = 32 + 5;
+
+ cc->disas_set_info = mb_disas_set_info;
}
static const TypeInfo mb_cpu_type_info = {
--
2.1.4
- [Qemu-devel] [PULL 08/22] gdbstub: Change gdbserver_fork() to accept cpu instead of env, (continued)
- [Qemu-devel] [PULL 08/22] gdbstub: Change gdbserver_fork() to accept cpu instead of env, Andreas Färber, 2015/07/06
- [Qemu-devel] [PULL 15/22] microblaze: boot: Use cpu_set_pc(), Andreas Färber, 2015/07/06
- [Qemu-devel] [PULL 13/22] gdbstub: Use cpu_set_pc() helper, Andreas Färber, 2015/07/06
- [Qemu-devel] [PULL 14/22] hw/arm/boot: Use cpu_set_pc(), Andreas Färber, 2015/07/06
- [Qemu-devel] [PULL 10/22] cpu: Change cpu_exec_init() arg to cpu, not env, Andreas Färber, 2015/07/06
- [Qemu-devel] [PULL 17/22] disas: QOMify target specific setup, Andreas Färber, 2015/07/06
- [Qemu-devel] [PULL 11/22] cpu-exec: Purge all uses of ENV_GET_CPU(), Andreas Färber, 2015/07/06
- [Qemu-devel] [PULL 18/22] disas: arm-a64: Make printfer and stream variable, Andreas Färber, 2015/07/06
- [Qemu-devel] [PULL 16/22] disas: Add print_insn to disassemble info, Andreas Färber, 2015/07/06
- [Qemu-devel] [PULL 19/22] disas: arm: QOMify target specific disas setup, Andreas Färber, 2015/07/06
- [Qemu-devel] [PULL 20/22] disas: microblaze: QOMify target specific disas setup,
Andreas Färber <=
- [Qemu-devel] [PULL 21/22] disas: cris: Fix 0 buffer length case, Andreas Färber, 2015/07/06
- [Qemu-devel] [PULL 22/22] disas: cris: QOMify target specific disas setup, Andreas Färber, 2015/07/06
- Re: [Qemu-devel] [PULL 00/22] QOM CPUState patch queue 2015-07-06, Andreas Färber, 2015/07/06