From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41414) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZpIdi-0002D2-Uz 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 1ZpIde-0004JH-7o for qemu-devel@nongnu.org; Thu, 22 Oct 2015 12:22:54 -0400 Received: from mx2.suse.de ([195.135.220.15]:48728) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZpIdd-0004IT-VR for qemu-devel@nongnu.org; Thu, 22 Oct 2015 12:22:50 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Thu, 22 Oct 2015 18:22:32 +0200 Message-Id: <1445530959-19309-2-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 1/8] disas: QOMify s390x specific disas setup List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Crosthwaite , Richard Henderson , Alexander Graf , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Peter Crosthwaite From: Peter Crosthwaite Move the target_disas() s390 specifics to the CPUClass::disas_set_info() hook and delete the #ifdef specific code in disas.c. Cc: Alexander Graf Signed-off-by: Peter Crosthwaite Acked-by: Richard Henderson Signed-off-by: Andreas F=C3=A4rber --- disas.c | 6 ------ target-s390x/cpu.c | 8 ++++++++ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/disas.c b/disas.c index 45878fa..655f23d 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_S390X) - s.info.mach =3D bfd_mach_s390_64; - s.info.print_insn =3D print_insn_s390; #elif defined(TARGET_MOXIE) s.info.mach =3D bfd_arch_moxie; s.info.print_insn =3D print_insn_moxie; @@ -462,9 +459,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_S390X) - s.info.mach =3D bfd_mach_s390_64; - s.info.print_insn =3D print_insn_s390; #elif defined(TARGET_MOXIE) s.info.mach =3D bfd_arch_moxie; s.info.print_insn =3D print_insn_moxie; diff --git a/target-s390x/cpu.c b/target-s390x/cpu.c index ccfaa8a..189a2af 100644 --- a/target-s390x/cpu.c +++ b/target-s390x/cpu.c @@ -184,6 +184,12 @@ static void s390_cpu_machine_reset_cb(void *opaque) } #endif =20 +static void s390_cpu_disas_set_info(CPUState *cpu, disassemble_info *inf= o) +{ + info->mach =3D bfd_mach_s390_64; + info->print_insn =3D print_insn_s390; +} + static void s390_cpu_realizefn(DeviceState *dev, Error **errp) { CPUState *cs =3D CPU(dev); @@ -351,6 +357,8 @@ static void s390_cpu_class_init(ObjectClass *oc, void= *data) cc->cpu_exec_interrupt =3D s390_cpu_exec_interrupt; cc->debug_excp_handler =3D s390x_cpu_debug_excp_handler; #endif + cc->disas_set_info =3D s390_cpu_disas_set_info; + cc->gdb_num_core_regs =3D S390_NUM_CORE_REGS; cc->gdb_core_xml_file =3D "s390x-core64.xml"; =20 --=20 2.1.4