diff options
| author | Peter Maydell | 2015-10-22 18:33:54 +0200 |
|---|---|---|
| committer | Peter Maydell | 2015-10-22 18:33:54 +0200 |
| commit | b803894e2c4d744ccc113ca6cbe6654ec80c1dc6 (patch) | |
| tree | aed47a20518d0623449f3c642bc69f5b4bdecea8 /target-m68k/cpu.c | |
| parent | Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging (diff) | |
| parent | disas: QOMify alpha specific disas setup (diff) | |
| download | qemu-b803894e2c4d744ccc113ca6cbe6654ec80c1dc6.tar.gz qemu-b803894e2c4d744ccc113ca6cbe6654ec80c1dc6.tar.xz qemu-b803894e2c4d744ccc113ca6cbe6654ec80c1dc6.zip | |
Merge remote-tracking branch 'remotes/afaerber/tags/qom-cpu-for-peter' into staging
QOM CPUState and X86CPU
* Adoption of CPUClass::disas_set_info() hook
# gpg: Signature made Thu 22 Oct 2015 17:11:24 BST using RSA key ID 3E7E013F
# gpg: Good signature from "Andreas Färber <afaerber@suse.de>"
# gpg: aka "Andreas Färber <afaerber@suse.com>"
* remotes/afaerber/tags/qom-cpu-for-peter:
disas: QOMify alpha specific disas setup
disas: QOMify mips specific disas setup
disas: QOMify sh4 specific disas setup
disas: QOMify lm32 specific disas setup
disas: QOMify sparc specific disas setup
disas: QOMify m68k specific disas setup
disas: QOMify moxie specific disas setup
disas: QOMify s390x specific disas setup
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'target-m68k/cpu.c')
| -rw-r--r-- | target-m68k/cpu.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/target-m68k/cpu.c b/target-m68k/cpu.c index 97527ef32a..e8a4eed1f9 100644 --- a/target-m68k/cpu.c +++ b/target-m68k/cpu.c @@ -61,6 +61,11 @@ static void m68k_cpu_reset(CPUState *s) tlb_flush(s, 1); } +static void m68k_cpu_disas_set_info(CPUState *cpu, disassemble_info *info) +{ + info->print_insn = print_insn_m68k; +} + /* CPU models */ static ObjectClass *m68k_cpu_class_by_name(const char *cpu_model) @@ -208,11 +213,13 @@ static void m68k_cpu_class_init(ObjectClass *c, void *data) #endif cc->cpu_exec_enter = m68k_cpu_exec_enter; cc->cpu_exec_exit = m68k_cpu_exec_exit; + cc->disas_set_info = m68k_cpu_disas_set_info; - dc->vmsd = &vmstate_m68k_cpu; cc->gdb_num_core_regs = 18; cc->gdb_core_xml_file = "cf-core.xml"; + dc->vmsd = &vmstate_m68k_cpu; + /* * Reason: m68k_cpu_initfn() calls cpu_exec_init(), which saves * the object in cpus -> dangling pointer after final |