From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50544) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZCFal-0005Li-TE for qemu-devel@nongnu.org; Mon, 06 Jul 2015 19:14:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZCFaj-0007rF-VH for qemu-devel@nongnu.org; Mon, 06 Jul 2015 19:14:27 -0400 Received: from cantor2.suse.de ([195.135.220.15]:44131 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZCFaj-0007q7-LX for qemu-devel@nongnu.org; Mon, 06 Jul 2015 19:14:25 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Tue, 7 Jul 2015 01:13:59 +0200 Message-Id: <1436224445-19449-17-git-send-email-afaerber@suse.de> In-Reply-To: <1436224445-19449-1-git-send-email-afaerber@suse.de> References: <1436224445-19449-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 16/22] disas: Add print_insn to disassemble info List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Crosthwaite , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Peter Crosthwaite From: Peter Crosthwaite Add the print_insn pointer to the disassemble info structure. This is to prepare for QOMification support, where a QOM CPU hook function will be responsible for setting the print_insn() function. Add this function to the existing struct to consolidate such that only the one struct needs to be passed to the new QOM API. Reviewed-by: Richard Henderson Signed-off-by: Peter Crosthwaite Signed-off-by: Andreas F=C3=A4rber --- disas.c | 68 ++++++++++++++++++++++++++---------------------= ------ include/disas/bfd.h | 6 +++++ 2 files changed, 39 insertions(+), 35 deletions(-) diff --git a/disas.c b/disas.c index 576c6a4..363c3bf 100644 --- a/disas.c +++ b/disas.c @@ -201,7 +201,6 @@ void target_disas(FILE *out, CPUState *cpu, target_ul= ong code, target_ulong pc; int count; CPUDebug s; - int (*print_insn)(bfd_vma pc, disassemble_info *info) =3D NULL; =20 INIT_DISASSEMBLE_INFO(s.info, out, fprintf); =20 @@ -224,7 +223,7 @@ void target_disas(FILE *out, CPUState *cpu, target_ul= ong code, } else { s.info.mach =3D bfd_mach_i386_i386; } - print_insn =3D print_insn_i386; + s.info.print_insn =3D print_insn_i386; #elif defined(TARGET_ARM) if (flags & 4) { /* We might not be compiled with the A64 disassembler @@ -232,12 +231,12 @@ void target_disas(FILE *out, CPUState *cpu, target_= ulong code, * fall through to the default print_insn_od case. */ #if defined(CONFIG_ARM_A64_DIS) - print_insn =3D print_insn_arm_a64; + s.info.print_insn =3D print_insn_arm_a64; #endif } else if (flags & 1) { - print_insn =3D print_insn_thumb1; + s.info.print_insn =3D print_insn_thumb1; } else { - print_insn =3D print_insn_arm; + s.info.print_insn =3D print_insn_arm; } if (flags & 2) { #ifdef TARGET_WORDS_BIGENDIAN @@ -247,7 +246,7 @@ void target_disas(FILE *out, CPUState *cpu, target_ul= ong code, #endif } #elif defined(TARGET_SPARC) - print_insn =3D print_insn_sparc; + s.info.print_insn =3D print_insn_sparc; #ifdef TARGET_SPARC64 s.info.mach =3D bfd_mach_sparc_v9b; #endif @@ -266,49 +265,49 @@ void target_disas(FILE *out, CPUState *cpu, target_= ulong code, #endif } s.info.disassembler_options =3D (char *)"any"; - print_insn =3D print_insn_ppc; + s.info.print_insn =3D print_insn_ppc; #elif defined(TARGET_M68K) - print_insn =3D print_insn_m68k; + s.info.print_insn =3D print_insn_m68k; #elif defined(TARGET_MIPS) #ifdef TARGET_WORDS_BIGENDIAN - print_insn =3D print_insn_big_mips; + s.info.print_insn =3D print_insn_big_mips; #else - print_insn =3D print_insn_little_mips; + s.info.print_insn =3D print_insn_little_mips; #endif #elif defined(TARGET_SH4) s.info.mach =3D bfd_mach_sh4; - print_insn =3D print_insn_sh; + s.info.print_insn =3D print_insn_sh; #elif defined(TARGET_ALPHA) s.info.mach =3D bfd_mach_alpha_ev6; - print_insn =3D print_insn_alpha; + s.info.print_insn =3D print_insn_alpha; #elif defined(TARGET_CRIS) if (flags !=3D 32) { s.info.mach =3D bfd_mach_cris_v0_v10; - print_insn =3D print_insn_crisv10; + s.info.print_insn =3D print_insn_crisv10; } else { s.info.mach =3D bfd_mach_cris_v32; - print_insn =3D print_insn_crisv32; + s.info.print_insn =3D print_insn_crisv32; } #elif defined(TARGET_S390X) s.info.mach =3D bfd_mach_s390_64; - print_insn =3D print_insn_s390; + s.info.print_insn =3D print_insn_s390; #elif defined(TARGET_MICROBLAZE) s.info.mach =3D bfd_arch_microblaze; - print_insn =3D print_insn_microblaze; + s.info.print_insn =3D print_insn_microblaze; #elif defined(TARGET_MOXIE) s.info.mach =3D bfd_arch_moxie; - print_insn =3D print_insn_moxie; + s.info.print_insn =3D print_insn_moxie; #elif defined(TARGET_LM32) s.info.mach =3D bfd_mach_lm32; - print_insn =3D print_insn_lm32; + s.info.print_insn =3D print_insn_lm32; #endif - if (print_insn =3D=3D NULL) { - print_insn =3D print_insn_od_target; + if (s.info.print_insn =3D=3D NULL) { + s.info.print_insn =3D print_insn_od_target; } =20 for (pc =3D code; size > 0; pc +=3D count, size -=3D count) { fprintf(out, "0x" TARGET_FMT_lx ": ", pc); - count =3D print_insn(pc, &s.info); + count =3D s.info.print_insn(pc, &s.info); #if 0 { int i; @@ -452,7 +451,6 @@ void monitor_disas(Monitor *mon, CPUState *cpu, { int count, i; CPUDebug s; - int (*print_insn)(bfd_vma pc, disassemble_info *info); =20 INIT_DISASSEMBLE_INFO(s.info, (FILE *)mon, monitor_fprintf); =20 @@ -476,13 +474,13 @@ void monitor_disas(Monitor *mon, CPUState *cpu, } else { s.info.mach =3D bfd_mach_i386_i386; } - print_insn =3D print_insn_i386; + s.info.print_insn =3D print_insn_i386; #elif defined(TARGET_ARM) - print_insn =3D print_insn_arm; + s.info.print_insn =3D print_insn_arm; #elif defined(TARGET_ALPHA) - print_insn =3D print_insn_alpha; + s.info.print_insn =3D print_insn_alpha; #elif defined(TARGET_SPARC) - print_insn =3D print_insn_sparc; + s.info.print_insn =3D print_insn_sparc; #ifdef TARGET_SPARC64 s.info.mach =3D bfd_mach_sparc_v9b; #endif @@ -500,27 +498,27 @@ void monitor_disas(Monitor *mon, CPUState *cpu, if ((flags >> 16) & 1) { s.info.endian =3D BFD_ENDIAN_LITTLE; } - print_insn =3D print_insn_ppc; + s.info.print_insn =3D print_insn_ppc; #elif defined(TARGET_M68K) - print_insn =3D print_insn_m68k; + s.info.print_insn =3D print_insn_m68k; #elif defined(TARGET_MIPS) #ifdef TARGET_WORDS_BIGENDIAN - print_insn =3D print_insn_big_mips; + s.info.print_insn =3D print_insn_big_mips; #else - print_insn =3D print_insn_little_mips; + s.info.print_insn =3D print_insn_little_mips; #endif #elif defined(TARGET_SH4) s.info.mach =3D bfd_mach_sh4; - print_insn =3D print_insn_sh; + s.info.print_insn =3D print_insn_sh; #elif defined(TARGET_S390X) s.info.mach =3D bfd_mach_s390_64; - print_insn =3D print_insn_s390; + s.info.print_insn =3D print_insn_s390; #elif defined(TARGET_MOXIE) s.info.mach =3D bfd_arch_moxie; - print_insn =3D print_insn_moxie; + s.info.print_insn =3D print_insn_moxie; #elif defined(TARGET_LM32) s.info.mach =3D bfd_mach_lm32; - print_insn =3D print_insn_lm32; + s.info.print_insn =3D print_insn_lm32; #else monitor_printf(mon, "0x" TARGET_FMT_lx ": Asm output not supported on this arch\n", pc); @@ -529,7 +527,7 @@ void monitor_disas(Monitor *mon, CPUState *cpu, =20 for(i =3D 0; i < nb_insn; i++) { monitor_printf(mon, "0x" TARGET_FMT_lx ": ", pc); - count =3D print_insn(pc, &s.info); + count =3D s.info.print_insn(pc, &s.info); monitor_printf(mon, "\n"); if (count < 0) break; diff --git a/include/disas/bfd.h b/include/disas/bfd.h index 8bd703c..a112e9c 100644 --- a/include/disas/bfd.h +++ b/include/disas/bfd.h @@ -313,6 +313,11 @@ typedef struct disassemble_info { void (*print_address_func) (bfd_vma addr, struct disassemble_info *info); =20 + /* Function called to print an instruction. The function is architec= ture + * specific. + */ + int (*print_insn)(bfd_vma addr, struct disassemble_info *info); + /* Function called to determine if there is a symbol at the given ADDR= . If there is, the function returns 1, otherwise it returns 0. This is used by ports which support an overlay manager where @@ -463,6 +468,7 @@ int generic_symbol_at_address(bfd_vma, struct disasse= mble_info *); (INFO).read_memory_func =3D buffer_read_memory, \ (INFO).memory_error_func =3D perror_memory, \ (INFO).print_address_func =3D generic_print_address, \ + (INFO).print_insn =3D NULL, \ (INFO).symbol_at_address_func =3D generic_symbol_at_address, \ (INFO).flags =3D 0, \ (INFO).bytes_per_line =3D 0, \ --=20 2.1.4