[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 7/7] disas: cris: QOMify target specific disas se
From: |
Peter Crosthwaite |
Subject: |
[Qemu-devel] [PATCH v2 7/7] disas: cris: QOMify target specific disas setup |
Date: |
Sat, 9 May 2015 13:11:17 -0700 |
Move the target_disas() cris specifics to the QOM disas_set_info hook
and delete the cris specific code in disas.c.
This also now adds support for monitor disas to cris.
E.g.
(qemu) xp 0x40004000
0000000040004000: 0x1e6f25f0
And before this patch:
(qemu) xp/i 0x40004000
0x40004000: Asm output not supported on this arch
After:
(qemu) xp/i 0x40004000
0x40004000: di
(qemu) xp/i 0x40004002
0x40004002: move.d 0xb003c004,$r1
Note: second example is 6-byte misaligned instruction!
Signed-off-by: Peter Crosthwaite <address@hidden>
---
disas.c | 8 --------
target-cris/cpu.c | 16 ++++++++++++++++
2 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/disas.c b/disas.c
index 087f4b4..184a180 100644
--- a/disas.c
+++ b/disas.c
@@ -258,14 +258,6 @@ void target_disas(FILE *out, CPUArchState *env,
target_ulong code,
#elif defined(TARGET_ALPHA)
s.info.mach = bfd_mach_alpha_ev6;
s.info.print_insn = print_insn_alpha;
-#elif defined(TARGET_CRIS)
- if (flags != 32) {
- s.info.mach = bfd_mach_cris_v0_v10;
- s.info.print_insn = print_insn_crisv10;
- } else {
- s.info.mach = bfd_mach_cris_v32;
- s.info.print_insn = print_insn_crisv32;
- }
#elif defined(TARGET_S390X)
s.info.mach = bfd_mach_s390_64;
s.info.print_insn = print_insn_s390;
diff --git a/target-cris/cpu.c b/target-cris/cpu.c
index 16cfba9..d555ea0 100644
--- a/target-cris/cpu.c
+++ b/target-cris/cpu.c
@@ -161,6 +161,20 @@ static void cris_cpu_set_irq(void *opaque, int irq, int
level)
}
#endif
+static void cris_disas_set_info(CPUState *cpu, disassemble_info *info)
+{
+ CRISCPU *cc = CRIS_CPU(cpu);
+ CPUCRISState *env = &cc->env;
+
+ if (env->pregs[PR_VR] != 32) {
+ info->mach = bfd_mach_cris_v0_v10;
+ info->print_insn = print_insn_crisv10;
+ } else {
+ info->mach = bfd_mach_cris_v32;
+ info->print_insn = print_insn_crisv32;
+ }
+}
+
static void cris_cpu_initfn(Object *obj)
{
CPUState *cs = CPU(obj);
@@ -292,6 +306,8 @@ static void cris_cpu_class_init(ObjectClass *oc, void *data)
cc->gdb_num_core_regs = 49;
cc->gdb_stop_before_watchpoint = true;
+
+ cc->disas_set_info = cris_disas_set_info;
}
static const TypeInfo cris_cpu_type_info = {
--
1.9.1
- Re: [Qemu-devel] [PATCH v2 1/7] disas: Add print_insn to disassemble info, (continued)
- [Qemu-devel] [PATCH v2 2/7] disas: QOMify target specific setup, Peter Crosthwaite, 2015/05/09
- [Qemu-devel] [PATCH v2 3/7] disas: arm-a64: Make printfer and stream variable, Peter Crosthwaite, 2015/05/09
- [Qemu-devel] [PATCH v2 4/7] disas: arm: QOMify target specific disas setup, Peter Crosthwaite, 2015/05/09
- [Qemu-devel] [PATCH v2 5/7] disas: microblaze: QOMify target specific disas setup, Peter Crosthwaite, 2015/05/09
- [Qemu-devel] [PATCH v2 6/7] disas: cris: Fix 0 buffer length case, Peter Crosthwaite, 2015/05/09
- [Qemu-devel] [PATCH v2 7/7] disas: cris: QOMify target specific disas setup,
Peter Crosthwaite <=
- Re: [Qemu-devel] [PATCH v2 0/7] Unify and QOMify (target|monitor)_disas, Peter Crosthwaite, 2015/05/15