[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 22/22] disas: cris: QOMify target specific disas s
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PULL v2 22/22] disas: cris: QOMify target specific disas setup |
Date: |
Tue, 7 Jul 2015 19:16:29 +0200 |
From: Peter Crosthwaite <address@hidden>
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!
Reviewed-by: Edgar E. Iglesias <address@hidden>
Signed-off-by: Peter Crosthwaite <address@hidden>
Signed-off-by: Andreas Färber <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 937e08b..69a6066 100644
--- a/disas.c
+++ b/disas.c
@@ -257,14 +257,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_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 0db209b..b17e849 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 = {
--
2.1.4
- [Qemu-devel] [PULL v2 03/22] cpu: Reorder cpu->as, cpu->thread_id, cpu->memory_dispatch init, (continued)
- [Qemu-devel] [PULL v2 03/22] cpu: Reorder cpu->as, cpu->thread_id, cpu->memory_dispatch init, Andreas Färber, 2015/07/07
- [Qemu-devel] [PULL v2 08/22] gdbstub: Change gdbserver_fork() to accept cpu instead of env, Andreas Färber, 2015/07/07
- [Qemu-devel] [PULL v2 09/22] cpu: Change tcg_cpu_exec() arg to cpu, not env, Andreas Färber, 2015/07/07
- [Qemu-devel] [PULL v2 14/22] hw/arm/boot: Use cpu_set_pc(), Andreas Färber, 2015/07/07
- [Qemu-devel] [PULL v2 06/22] target-ppc: Move cpu_exec_init() call to realize function, Andreas Färber, 2015/07/07
- [Qemu-devel] [PULL v2 05/22] cpu: Convert cpu_index into a bitmap, Andreas Färber, 2015/07/07
- [Qemu-devel] [PULL v2 15/22] microblaze: boot: Use cpu_set_pc(), Andreas Färber, 2015/07/07
- [Qemu-devel] [PULL v2 13/22] gdbstub: Use cpu_set_pc() helper, Andreas Färber, 2015/07/07
- [Qemu-devel] [PULL v2 21/22] disas: cris: Fix 0 buffer length case, Andreas Färber, 2015/07/07
- [Qemu-devel] [PULL v2 20/22] disas: microblaze: QOMify target specific disas setup, Andreas Färber, 2015/07/07
- [Qemu-devel] [PULL v2 22/22] disas: cris: QOMify target specific disas setup,
Andreas Färber <=
- [Qemu-devel] [PULL v2 18/22] disas: arm-a64: Make printfer and stream variable, Andreas Färber, 2015/07/07
- [Qemu-devel] [PULL v2 07/22] translate-all: Change tb_flush() env argument to cpu, Andreas Färber, 2015/07/07
- [Qemu-devel] [PULL v2 19/22] disas: arm: QOMify target specific disas setup, Andreas Färber, 2015/07/07
- [Qemu-devel] [PULL v2 17/22] disas: QOMify target specific setup, Andreas Färber, 2015/07/07
- [Qemu-devel] [PULL v2 01/22] cpu: No need to zero-initialize CPUState::numa_node, Andreas Färber, 2015/07/07
- [Qemu-devel] [PULL v2 16/22] disas: Add print_insn to disassemble info, Andreas Färber, 2015/07/07
- [Qemu-devel] [PULL v2 04/22] cpu: Add Error argument to cpu_exec_init(), Andreas Färber, 2015/07/07
- [Qemu-devel] [PULL v2 10/22] cpu: Change cpu_exec_init() arg to cpu, not env, Andreas Färber, 2015/07/07
- [Qemu-devel] [PULL v2 12/22] cpu: Add wrapper for the set_pc() hook, Andreas Färber, 2015/07/07
- [Qemu-devel] [PULL v2 11/22] cpu-exec: Purge all uses of ENV_GET_CPU(), Andreas Färber, 2015/07/07