From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41412) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZpIdi-0002D0-U8 for qemu-devel@nongnu.org; Thu, 22 Oct 2015 12:22:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZpIdd-0004I7-LA for qemu-devel@nongnu.org; Thu, 22 Oct 2015 12:22:54 -0400 Received: from mx2.suse.de ([195.135.220.15]:48695) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZpIdd-0004Ho-E9 for qemu-devel@nongnu.org; Thu, 22 Oct 2015 12:22:49 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Thu, 22 Oct 2015 18:22:33 +0200 Message-Id: <1445530959-19309-3-git-send-email-afaerber@suse.de> In-Reply-To: <1445530959-19309-1-git-send-email-afaerber@suse.de> References: <1445530959-19309-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 2/8] disas: QOMify moxie specific disas setup List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Crosthwaite , Anthony Green , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Peter Crosthwaite From: Peter Crosthwaite Move the target_disas() moxie specifics to the CPUClass::disas_set_info() hook and delete the #ifdef specific code in disas.c. Cc: Anthony Green Signed-off-by: Peter Crosthwaite Signed-off-by: Andreas F=C3=A4rber --- disas.c | 6 ------ target-moxie/cpu.c | 7 +++++++ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/disas.c b/disas.c index 655f23d..05d409b 100644 --- a/disas.c +++ b/disas.c @@ -249,9 +249,6 @@ void target_disas(FILE *out, CPUState *cpu, target_ul= ong code, #elif defined(TARGET_ALPHA) s.info.mach =3D bfd_mach_alpha_ev6; s.info.print_insn =3D print_insn_alpha; -#elif defined(TARGET_MOXIE) - s.info.mach =3D bfd_arch_moxie; - s.info.print_insn =3D print_insn_moxie; #elif defined(TARGET_LM32) s.info.mach =3D bfd_mach_lm32; s.info.print_insn =3D print_insn_lm32; @@ -459,9 +456,6 @@ void monitor_disas(Monitor *mon, CPUState *cpu, #elif defined(TARGET_SH4) s.info.mach =3D bfd_mach_sh4; s.info.print_insn =3D print_insn_sh; -#elif defined(TARGET_MOXIE) - s.info.mach =3D bfd_arch_moxie; - s.info.print_insn =3D print_insn_moxie; #elif defined(TARGET_LM32) s.info.mach =3D bfd_mach_lm32; s.info.print_insn =3D print_insn_lm32; diff --git a/target-moxie/cpu.c b/target-moxie/cpu.c index 3af3779..0c60c65 100644 --- a/target-moxie/cpu.c +++ b/target-moxie/cpu.c @@ -48,6 +48,12 @@ static void moxie_cpu_reset(CPUState *s) tlb_flush(s, 1); } =20 +static void moxie_cpu_disas_set_info(CPUState *cpu, disassemble_info *in= fo) +{ + info->mach =3D bfd_arch_moxie; + info->print_insn =3D print_insn_moxie; +} + static void moxie_cpu_realizefn(DeviceState *dev, Error **errp) { CPUState *cs =3D CPU(dev); @@ -114,6 +120,7 @@ static void moxie_cpu_class_init(ObjectClass *oc, voi= d *data) cc->get_phys_page_debug =3D moxie_cpu_get_phys_page_debug; cc->vmsd =3D &vmstate_moxie_cpu; #endif + cc->disas_set_info =3D moxie_cpu_disas_set_info; =20 /* * Reason: moxie_cpu_initfn() calls cpu_exec_init(), which saves --=20 2.1.4