diff options
| -rw-r--r-- | gdb/ChangeLog | 43 | ||||
| -rw-r--r-- | gdb/Makefile.in | 40 | ||||
| -rw-r--r-- | gdb/avr-tdep.c | 1 | ||||
| -rw-r--r-- | gdb/cris-tdep.c | 7 | ||||
| -rw-r--r-- | gdb/disasm.c | 18 | ||||
| -rw-r--r-- | gdb/gdbarch.c | 2 | ||||
| -rw-r--r-- | gdb/gdbarch.h | 7 | ||||
| -rwxr-xr-x | gdb/gdbarch.sh | 5 | ||||
| -rw-r--r-- | gdb/h8300-tdep.c | 1 | ||||
| -rw-r--r-- | gdb/i386-tdep.c | 3 | ||||
| -rw-r--r-- | gdb/ia64-tdep.c | 1 | ||||
| -rw-r--r-- | gdb/m68k-tdep.c | 1 | ||||
| -rw-r--r-- | gdb/mcore-tdep.c | 1 | ||||
| -rw-r--r-- | gdb/mips-tdep.c | 7 | ||||
| -rw-r--r-- | gdb/mn10300-tdep.c | 1 | ||||
| -rw-r--r-- | gdb/ns32k-tdep.c | 1 | ||||
| -rw-r--r-- | gdb/rs6000-tdep.c | 1 | ||||
| -rw-r--r-- | gdb/s390-tdep.c | 2 | ||||
| -rw-r--r-- | gdb/sparc-tdep.c | 1 | ||||
| -rw-r--r-- | gdb/v850-tdep.c | 1 | ||||
| -rw-r--r-- | gdb/vax-tdep.c | 1 | ||||
| -rw-r--r-- | gdb/xstormy16-tdep.c | 3 |
22 files changed, 101 insertions, 47 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 1ca28e42205..49ebd5e7e3b 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,46 @@ +2003-09-04 Andrew Cagney <cagney@redhat.com> + + * avr-tdep.c: Include "dis-asm.h". + * cris-tdep.c: Include "dis-asm.h". + (cris_delayed_get_disassembler): Use "struct disassemble_info" + instead of corresponding typedef. + * h8300-tdep.c: Include "dis-asm.h". + * ia64-tdep.c: Include "dis-asm.h". + * i386-tdep.c: Include "dis-asm.h". + (i386_print_insn): Use "struct disassemble_info" instead of + corresponding typedef. + * m68k-tdep.c: Include "dis-asm.h". + * mcore-tdep.c: Include "dis-asm.h". + * mips-tdep.c: Include "dis-asm.h". + (gdb_print_insn_mips): Make static, use "struct disassemble_info" + instead of corresponding typedef. + * ns32k-tdep.c: Include "dis-asm.h". + * s390-tdep.c: Include "dis-asm.h". + * sparc-tdep.c: Include "dis-asm.h". + * vax-tdep.c: Include "dis-asm.h". + * v850-tdep.c: Include "dis-asm.h". + * mn10300-tdep.c: Include "dis-asm.h". + * rs6000-tdep.c: Include "dis-asm.h". + * xstormy16-tdep.c: Include "dis-asm.h". + (_initialize_xstormy16_tdep): Delete "extern" declaration of + print_insn_xstormy16. + * Makefile.in (v850-tdep.o): Update dependencies. + (vax-tdep.o, sparc-tdep.o, s390-tdep.o): Ditto. + (ns32k-tdep.o, mips-tdep.o, mcore-tdep.o): Ditto. + (m68k-tdep.o, ia64-tdep.o, i386-tdep.o): Ditto. + (h8300-tdep.o, cris-tdep.o, avr-tdep.o): Ditto. + (mn10300-tdep.o, xstormy16-tdep.o, disasm.o): Ditto. + (gdbarch_h): Remove $(dis_asm_h). + * disasm.c: Include "dis-asm.h". + (dis_asm_read_memory): Use "struct disassemble_info" instead of + corresponding typedef. + (dis_asm_memory_error, dump_insns, do_assembly_only): Ditto. + (gdb_disassemble_info, gdb_disassembly, gdb_print_insn): Ditto. + * gdbarch.sh: Do not include "dis-asm.h". + (struct disassemble_info): Declare opaque. + (TARGET_PRINT_INSN): Update declaration. + * gdbarch.h, gdbarch.c: Re-generate. + 2003-09-08 Andrew Cagney <cagney@redhat.com> * gdbarch.sh (DEPRECATED_CALL_DUMMY_ADDRESS): Rename diff --git a/gdb/Makefile.in b/gdb/Makefile.in index 70238ea9187..3a8ed99d46f 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -667,7 +667,7 @@ f_lang_h = f-lang.h frame_base_h = frame-base.h frame_h = frame.h frame_unwind_h = frame-unwind.h $(frame_h) -gdbarch_h = gdbarch.h $(dis_asm_h) +gdbarch_h = gdbarch.h gdb_assert_h = gdb_assert.h gdbcmd_h = gdbcmd.h $(command_h) $(ui_out_h) gdbcore_h = gdbcore.h $(bfd_h) @@ -1594,7 +1594,7 @@ arm-tdep.o: arm-tdep.c $(defs_h) $(frame_h) $(inferior_h) $(gdbcmd_h) \ avr-tdep.o: avr-tdep.c $(defs_h) $(frame_h) $(frame_unwind_h) \ $(frame_base_h) $(trad_frame_h) $(gdbcmd_h) $(gdbcore_h) \ $(inferior_h) $(symfile_h) $(arch_utils_h) $(regcache_h) \ - $(gdb_string_h) + $(gdb_string_h) $(dis_asm_h) ax-gdb.o: ax-gdb.c $(defs_h) $(symtab_h) $(symfile_h) $(gdbtypes_h) \ $(value_h) $(expression_h) $(command_h) $(gdbcmd_h) $(frame_h) \ $(target_h) $(ax_h) $(ax_gdb_h) $(gdb_string_h) $(block_h) \ @@ -1670,7 +1670,7 @@ cp-valprint.o: cp-valprint.c $(defs_h) $(gdb_obstack_h) $(symtab_h) \ cris-tdep.o: cris-tdep.c $(defs_h) $(frame_h) $(symtab_h) $(inferior_h) \ $(gdbtypes_h) $(gdbcore_h) $(gdbcmd_h) $(target_h) $(value_h) \ $(opcode_cris_h) $(arch_utils_h) $(regcache_h) $(gdb_assert_h) \ - $(symfile_h) $(solib_h) $(solib_svr4_h) $(gdb_string_h) + $(symfile_h) $(solib_h) $(solib_svr4_h) $(gdb_string_h) $(dis_asm_h) c-typeprint.o: c-typeprint.c $(defs_h) $(gdb_obstack_h) $(bfd_h) $(symtab_h) \ $(gdbtypes_h) $(expression_h) $(value_h) $(gdbcore_h) $(target_h) \ $(language_h) $(demangle_h) $(c_lang_h) $(typeprint_h) $(cp_abi_h) \ @@ -1701,7 +1701,7 @@ dictionary.o: dictionary.c $(defs_h) $(gdb_obstack_h) $(symtab_h) \ dink32-rom.o: dink32-rom.c $(defs_h) $(gdbcore_h) $(target_h) $(monitor_h) \ $(serial_h) $(symfile_h) $(inferior_h) $(regcache_h) disasm.o: disasm.c $(defs_h) $(target_h) $(value_h) $(ui_out_h) \ - $(gdb_string_h) $(disasm_h) $(gdbcore_h) + $(gdb_string_h) $(disasm_h) $(gdbcore_h) $(dis_asm_h) doublest.o: doublest.c $(defs_h) $(doublest_h) $(floatformat_h) \ $(gdb_assert_h) $(gdb_string_h) $(gdbtypes_h) dpx2-nat.o: dpx2-nat.c $(defs_h) $(gdbcore_h) $(gdb_string_h) @@ -1804,7 +1804,7 @@ go32-nat.o: go32-nat.c $(defs_h) $(inferior_h) $(gdb_wait_h) $(gdbcore_h) \ $(gdb_string_h) h8300-tdep.o: h8300-tdep.c $(defs_h) $(value_h) $(inferior_h) $(symfile_h) \ $(arch_utils_h) $(regcache_h) $(gdbcore_h) $(objfiles_h) $(gdbcmd_h) \ - $(gdb_assert_h) + $(gdb_assert_h) $(dis_asm_h) # OBSOLETE h8500-tdep.o: h8500-tdep.c hpacc-abi.o: hpacc-abi.c $(defs_h) $(value_h) $(gdb_regex_h) $(gdb_string_h) \ $(gdbtypes_h) $(gdbcore_h) $(cp_abi_h) @@ -1873,7 +1873,8 @@ i386-tdep.o: i386-tdep.c $(defs_h) $(arch_utils_h) $(command_h) \ $(frame_h) $(frame_base_h) $(frame_unwind_h) $(inferior_h) \ $(gdbcmd_h) $(gdbcore_h) $(objfiles_h) $(osabi_h) $(regcache_h) \ $(reggroups_h) $(symfile_h) $(symtab_h) $(target_h) $(value_h) \ - $(gdb_assert_h) $(gdb_string_h) $(i386_tdep_h) $(i387_tdep_h) + $(dis_asm_h) $(gdb_assert_h) $(gdb_string_h) $(i386_tdep_h) \ + $(i387_tdep_h) i386v4-nat.o: i386v4-nat.c $(defs_h) $(value_h) $(inferior_h) $(regcache_h) \ $(i386_tdep_h) $(i387_tdep_h) $(gregset_h) i386v-nat.o: i386v-nat.c $(defs_h) $(frame_h) $(inferior_h) $(language_h) \ @@ -1893,7 +1894,7 @@ ia64-tdep.o: ia64-tdep.c $(defs_h) $(inferior_h) $(symfile_h) $(gdbcore_h) \ $(arch_utils_h) $(floatformat_h) $(regcache_h) $(reggroups_h) \ $(frame_h) $(frame_base_h) $(frame_unwind_h) $(doublest_h) \ $(value_h) $(gdb_assert_h) $(objfiles_h) $(elf_common_h) \ - $(elf_bfd_h) + $(elf_bfd_h) $(dis_asm_h) infcall.o: infcall.c $(defs_h) $(breakpoint_h) $(target_h) $(regcache_h) \ $(inferior_h) $(gdb_assert_h) $(block_h) $(gdbcore_h) $(language_h) \ $(symfile_h) $(gdbcmd_h) $(command_h) $(gdb_string_h) $(infcall_h) @@ -1995,7 +1996,7 @@ m68k-stub.o: m68k-stub.c m68k-tdep.o: m68k-tdep.c $(defs_h) $(frame_h) $(frame_base_h) \ $(frame_unwind_h) $(symtab_h) $(gdbcore_h) $(value_h) \ $(gdb_string_h) $(gdb_assert_h) $(inferior_h) $(regcache_h) \ - $(arch_utils_h) $(osabi_h) $(m68k_tdep_h) $(gregset_h) + $(arch_utils_h) $(osabi_h) $(dis_asm_h) $(m68k_tdep_h) $(gregset_h) macrocmd.o: macrocmd.c $(defs_h) $(macrotab_h) $(macroexp_h) $(macroscope_h) \ $(command_h) $(gdbcmd_h) macroexp.o: macroexp.c $(defs_h) $(gdb_obstack_h) $(bcache_h) $(macrotab_h) \ @@ -2015,7 +2016,7 @@ mcore-rom.o: mcore-rom.c $(defs_h) $(gdbcore_h) $(target_h) $(monitor_h) \ $(gdb_string_h) $(regcache_h) $(serial_h) mcore-tdep.o: mcore-tdep.c $(defs_h) $(frame_h) $(symtab_h) $(value_h) \ $(gdbcmd_h) $(regcache_h) $(symfile_h) $(gdbcore_h) $(inferior_h) \ - $(arch_utils_h) $(gdb_string_h) $(disasm_h) + $(arch_utils_h) $(gdb_string_h) $(disasm_h) $(dis_asm_h) mdebugread.o: mdebugread.c $(defs_h) $(symtab_h) $(gdbtypes_h) $(gdbcore_h) \ $(symfile_h) $(objfiles_h) $(gdb_obstack_h) $(buildsym_h) \ $(stabsread_h) $(complaints_h) $(demangle_h) $(gdb_assert_h) \ @@ -2049,13 +2050,14 @@ mips-tdep.o: mips-tdep.c $(defs_h) $(gdb_string_h) $(gdb_assert_h) \ $(language_h) $(gdbcore_h) $(symfile_h) $(objfiles_h) $(gdbtypes_h) \ $(target_h) $(arch_utils_h) $(regcache_h) $(osabi_h) $(mips_tdep_h) \ $(block_h) $(reggroups_h) $(opcode_mips_h) $(elf_mips_h) \ - $(elf_bfd_h) $(symcat_h) $(sim_regno_h) + $(elf_bfd_h) $(symcat_h) $(sim_regno_h) $(dis_asm_h) mipsv4-nat.o: mipsv4-nat.c $(defs_h) $(inferior_h) $(gdbcore_h) $(target_h) \ $(regcache_h) $(gregset_h) # OBSOLETE mn10200-tdep.o: mn10200-tdep.c mn10300-tdep.o: mn10300-tdep.c $(defs_h) $(frame_h) $(inferior_h) \ $(target_h) $(value_h) $(bfd_h) $(gdb_string_h) $(gdbcore_h) \ - $(symfile_h) $(regcache_h) $(arch_utils_h) $(gdb_assert_h) + $(symfile_h) $(regcache_h) $(arch_utils_h) $(gdb_assert_h) \ + $(dis_asm_h) monitor.o: monitor.c $(defs_h) $(gdbcore_h) $(target_h) $(gdb_string_h) \ $(command_h) $(serial_h) $(monitor_h) $(gdbcmd_h) $(inferior_h) \ $(gdb_regex_h) $(srec_h) $(regcache_h) @@ -2068,7 +2070,7 @@ ns32knbsd-tdep.o: ns32knbsd-tdep.c $(defs_h) $(osabi_h) $(ns32k_tdep_h) \ $(gdb_string_h) ns32k-tdep.o: ns32k-tdep.c $(defs_h) $(frame_h) $(gdbtypes_h) $(gdbcore_h) \ $(inferior_h) $(regcache_h) $(target_h) $(arch_utils_h) $(osabi_h) \ - $(ns32k_tdep_h) $(gdb_string_h) + $(dis_asm_h) $(ns32k_tdep_h) $(gdb_string_h) nto-procfs.o: nto-procfs.c $(defs_h) $(gdb_dirent_h) $(gdb_string_h) \ $(gdbcore_h) $(inferior_h) $(target_h) $(objfiles_h) $(gdbthread_h) \ $(nto_tdep_h) $(command_h) $(regcache_h) @@ -2222,12 +2224,12 @@ rs6000-tdep.o: rs6000-tdep.c $(defs_h) $(frame_h) $(inferior_h) $(symtab_h) \ $(arch_utils_h) $(regcache_h) $(doublest_h) $(value_h) \ $(parser_defs_h) $(osabi_h) $(libbfd_h) $(coff_internal_h) \ $(libcoff_h) $(coff_xcoff_h) $(libxcoff_h) $(elf_bfd_h) \ - $(solib_svr4_h) $(ppc_tdep_h) $(gdb_assert_h) + $(solib_svr4_h) $(ppc_tdep_h) $(gdb_assert_h) $(dis_asm_h) s390-nat.o: s390-nat.c $(defs_h) $(tm_h) $(regcache_h) s390-tdep.o: s390-tdep.c $(arch_utils_h) $(frame_h) $(inferior_h) \ $(symtab_h) $(target_h) $(gdbcore_h) $(gdbcmd_h) $(symfile_h) \ $(objfiles_h) $(tm_h) $(__bfd_bfd_h) $(floatformat_h) $(regcache_h) \ - $(value_h) $(gdb_assert_h) + $(value_h) $(gdb_assert_h) $(dis_asm_h) scm-exp.o: scm-exp.c $(defs_h) $(symtab_h) $(gdbtypes_h) $(expression_h) \ $(parser_defs_h) $(language_h) $(value_h) $(c_lang_h) $(scm_lang_h) \ $(scm_tags_h) @@ -2328,8 +2330,8 @@ sparcnbsd-tdep.o: sparcnbsd-tdep.c $(defs_h) $(gdbcore_h) $(regcache_h) \ sparc-stub.o: sparc-stub.c sparc-tdep.o: sparc-tdep.c $(defs_h) $(arch_utils_h) $(frame_h) \ $(inferior_h) $(target_h) $(value_h) $(bfd_h) $(gdb_string_h) \ - $(regcache_h) $(osabi_h) $(sparc_tdep_h) $(gregset_h) $(gdbcore_h) \ - $(gdb_assert_h) $(symfile_h) + $(regcache_h) $(osabi_h) $(dis_asm_h) $(sparc_tdep_h) $(gregset_h) \ + $(gdbcore_h) $(gdb_assert_h) $(symfile_h) stabsread.o: stabsread.c $(defs_h) $(gdb_string_h) $(bfd_h) $(gdb_obstack_h) \ $(symtab_h) $(gdbtypes_h) $(expression_h) $(symfile_h) $(objfiles_h) \ $(aout_stab_gnu_h) $(libaout_h) $(aout_aout64_h) $(gdb_stabs_h) \ @@ -2408,7 +2410,7 @@ v850ice.o: v850ice.c $(defs_h) $(gdb_string_h) $(frame_h) $(symtab_h) \ $(gdbcore_h) $(value_h) $(command_h) $(regcache_h) v850-tdep.o: v850-tdep.c $(defs_h) $(frame_h) $(inferior_h) $(target_h) \ $(value_h) $(bfd_h) $(gdb_string_h) $(gdbcore_h) $(symfile_h) \ - $(arch_utils_h) $(regcache_h) $(symtab_h) + $(arch_utils_h) $(regcache_h) $(symtab_h) $(dis_asm_h) valarith.o: valarith.c $(defs_h) $(value_h) $(symtab_h) $(gdbtypes_h) \ $(expression_h) $(target_h) $(language_h) $(gdb_string_h) \ $(doublest_h) $(infcall_h) @@ -2427,7 +2429,7 @@ varobj.o: varobj.c $(defs_h) $(value_h) $(expression_h) $(frame_h) \ $(language_h) $(wrapper_h) $(gdbcmd_h) $(gdb_string_h) $(varobj_h) vax-tdep.o: vax-tdep.c $(defs_h) $(symtab_h) $(opcode_vax_h) $(gdbcore_h) \ $(inferior_h) $(regcache_h) $(frame_h) $(value_h) $(arch_utils_h) \ - $(gdb_string_h) $(osabi_h) $(vax_tdep_h) + $(gdb_string_h) $(osabi_h) $(dis_asm_h) $(vax_tdep_h) w89k-rom.o: w89k-rom.c $(defs_h) $(gdbcore_h) $(target_h) $(monitor_h) \ $(serial_h) $(xmodem_h) $(regcache_h) win32-nat.o: win32-nat.c $(defs_h) $(tm_h) $(frame_h) $(inferior_h) \ @@ -2461,7 +2463,7 @@ xcoffsolib.o: xcoffsolib.c $(defs_h) $(bfd_h) $(xcoffsolib_h) $(inferior_h) \ xmodem.o: xmodem.c $(defs_h) $(serial_h) $(target_h) $(xmodem_h) xstormy16-tdep.o: xstormy16-tdep.c $(defs_h) $(value_h) $(inferior_h) \ $(symfile_h) $(arch_utils_h) $(regcache_h) $(gdbcore_h) \ - $(objfiles_h) + $(objfiles_h) $(dis_asm_h) # OBSOLETE z8k-tdep.o: z8k-tdep.c # diff --git a/gdb/avr-tdep.c b/gdb/avr-tdep.c index 477aa82cb83..2a4bf6f16f6 100644 --- a/gdb/avr-tdep.c +++ b/gdb/avr-tdep.c @@ -36,6 +36,7 @@ #include "arch-utils.h" #include "regcache.h" #include "gdb_string.h" +#include "dis-asm.h" /* AVR Background: diff --git a/gdb/cris-tdep.c b/gdb/cris-tdep.c index 27ef266cc58..1b199995899 100644 --- a/gdb/cris-tdep.c +++ b/gdb/cris-tdep.c @@ -39,6 +39,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "solib.h" /* Support for shared libraries. */ #include "solib-svr4.h" /* For struct link_map_offsets. */ #include "gdb_string.h" +#include "dis-asm.h" enum cris_num_regs @@ -374,8 +375,6 @@ static CORE_ADDR cris_skip_prologue_main (CORE_ADDR pc, int frameless_p); static struct gdbarch *cris_gdbarch_init (struct gdbarch_info, struct gdbarch_list *); -static int cris_delayed_get_disassembler (bfd_vma, disassemble_info *); - static void cris_dump_tdep (struct gdbarch *, struct ui_file *); static void cris_version_update (char *ignore_args, int from_tty, @@ -3539,9 +3538,9 @@ cris_gdb_func (enum cris_op_type op_type, unsigned short inst, exec_bfd has been set. */ static int -cris_delayed_get_disassembler (bfd_vma addr, disassemble_info *info) +cris_delayed_get_disassembler (bfd_vma addr, struct disassemble_info *info) { - int (*print_insn) (bfd_vma addr, disassemble_info *info); + int (*print_insn) (bfd_vma addr, struct disassemble_info *info); /* FIXME: cagney/2003-08-27: It should be possible to select a CRIS disassembler, even when there is no BFD. Does something like "gdb; target remote; disassmeble *0x123" work? */ diff --git a/gdb/disasm.c b/gdb/disasm.c index 0dfd20aaa17..5f4d07a0aea 100644 --- a/gdb/disasm.c +++ b/gdb/disasm.c @@ -26,6 +26,7 @@ #include "gdb_string.h" #include "disasm.h" #include "gdbcore.h" +#include "dis-asm.h" /* Disassemble functions. FIXME: We should get rid of all the duplicate code in gdb that does @@ -46,14 +47,15 @@ struct dis_line_entry /* Like target_read_memory, but slightly different parameters. */ static int dis_asm_read_memory (bfd_vma memaddr, bfd_byte *myaddr, unsigned int len, - disassemble_info *info) + struct disassemble_info *info) { return target_read_memory (memaddr, (char *) myaddr, len); } /* Like memory_error with slightly different parameters. */ static void -dis_asm_memory_error (int status, bfd_vma memaddr, disassemble_info *info) +dis_asm_memory_error (int status, bfd_vma memaddr, + struct disassemble_info *info) { memory_error (status, memaddr); } @@ -83,7 +85,7 @@ compare_lines (const void *mle1p, const void *mle2p) } static int -dump_insns (struct ui_out *uiout, disassemble_info * di, +dump_insns (struct ui_out *uiout, struct disassemble_info * di, CORE_ADDR low, CORE_ADDR high, int how_many, struct ui_stream *stb) { @@ -296,7 +298,7 @@ do_mixed_source_and_assembly (struct ui_out *uiout, static void -do_assembly_only (struct ui_out *uiout, disassemble_info * di, +do_assembly_only (struct ui_out *uiout, struct disassemble_info * di, CORE_ADDR low, CORE_ADDR high, int how_many, struct ui_stream *stb) { @@ -324,10 +326,10 @@ fprintf_disasm (void *stream, const char *format, ...) return 0; } -static disassemble_info +static struct disassemble_info gdb_disassemble_info (struct gdbarch *gdbarch, struct ui_file *file) { - disassemble_info di; + struct disassemble_info di; init_disassemble_info (&di, file, fprintf_disasm); di.flavour = bfd_target_unknown_flavour; di.memory_error_func = dis_asm_memory_error; @@ -356,7 +358,7 @@ gdb_disassembly (struct ui_out *uiout, { struct ui_stream *stb = ui_out_stream_new (uiout); struct cleanup *cleanups = make_cleanup_ui_out_stream_delete (stb); - disassemble_info di = gdb_disassemble_info (current_gdbarch, stb->stream); + struct disassemble_info di = gdb_disassemble_info (current_gdbarch, stb->stream); /* To collect the instruction outputted from opcodes. */ struct symtab *symtab = NULL; struct linetable_entry *le = NULL; @@ -390,6 +392,6 @@ gdb_disassembly (struct ui_out *uiout, int gdb_print_insn (CORE_ADDR memaddr, struct ui_file *stream) { - disassemble_info di = gdb_disassemble_info (current_gdbarch, stream); + struct disassemble_info di = gdb_disassemble_info (current_gdbarch, stream); return TARGET_PRINT_INSN (memaddr, &di); } diff --git a/gdb/gdbarch.c b/gdb/gdbarch.c index d7c65f47ebe..329583b96cf 100644 --- a/gdb/gdbarch.c +++ b/gdb/gdbarch.c @@ -5086,7 +5086,7 @@ set_gdbarch_software_single_step (struct gdbarch *gdbarch, } int -gdbarch_print_insn (struct gdbarch *gdbarch, bfd_vma vma, disassemble_info *info) +gdbarch_print_insn (struct gdbarch *gdbarch, bfd_vma vma, struct disassemble_info *info) { gdb_assert (gdbarch != NULL); gdb_assert (gdbarch->print_insn != NULL); diff --git a/gdb/gdbarch.h b/gdb/gdbarch.h index a15044be4e2..995d97784d9 100644 --- a/gdb/gdbarch.h +++ b/gdb/gdbarch.h @@ -35,8 +35,6 @@ #ifndef GDBARCH_H #define GDBARCH_H -#include "dis-asm.h" /* Get defs for disassemble_info, which unfortunately is a typedef. */ - struct floatformat; struct ui_file; struct frame_info; @@ -45,6 +43,7 @@ struct objfile; struct minimal_symbol; struct regcache; struct reggroup; +struct disassemble_info; extern struct gdbarch *current_gdbarch; @@ -2082,8 +2081,8 @@ extern void set_gdbarch_software_single_step (struct gdbarch *gdbarch, gdbarch_s /* FIXME: cagney/2003-08-28: Need to find a better way of selecting the disassembler. Perhaphs objdump can handle it? */ -typedef int (gdbarch_print_insn_ftype) (bfd_vma vma, disassemble_info *info); -extern int gdbarch_print_insn (struct gdbarch *gdbarch, bfd_vma vma, disassemble_info *info); +typedef int (gdbarch_print_insn_ftype) (bfd_vma vma, struct disassemble_info *info); +extern int gdbarch_print_insn (struct gdbarch *gdbarch, bfd_vma vma, struct disassemble_info *info); extern void set_gdbarch_print_insn (struct gdbarch *gdbarch, gdbarch_print_insn_ftype *print_insn); #if (GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) && defined (TARGET_PRINT_INSN) #error "Non multi-arch definition of TARGET_PRINT_INSN" diff --git a/gdb/gdbarch.sh b/gdb/gdbarch.sh index efb1ef0234d..dd89e6a5d8f 100755 --- a/gdb/gdbarch.sh +++ b/gdb/gdbarch.sh @@ -674,7 +674,7 @@ f:2:SMASH_TEXT_ADDRESS:CORE_ADDR:smash_text_address:CORE_ADDR addr:addr:::core_a F:2:SOFTWARE_SINGLE_STEP:void:software_single_step:enum target_signal sig, int insert_breakpoints_p:sig, insert_breakpoints_p # FIXME: cagney/2003-08-28: Need to find a better way of selecting the # disassembler. Perhaphs objdump can handle it? -f::TARGET_PRINT_INSN:int:print_insn:bfd_vma vma, disassemble_info *info:vma, info:::0: +f::TARGET_PRINT_INSN:int:print_insn:bfd_vma vma, struct disassemble_info *info:vma, info:::0: f:2:SKIP_TRAMPOLINE_CODE:CORE_ADDR:skip_trampoline_code:CORE_ADDR pc:pc:::generic_skip_trampoline_code::0 @@ -836,8 +836,6 @@ cat <<EOF #ifndef GDBARCH_H #define GDBARCH_H -#include "dis-asm.h" /* Get defs for disassemble_info, which unfortunately is a typedef. */ - struct floatformat; struct ui_file; struct frame_info; @@ -846,6 +844,7 @@ struct objfile; struct minimal_symbol; struct regcache; struct reggroup; +struct disassemble_info; extern struct gdbarch *current_gdbarch; diff --git a/gdb/h8300-tdep.c b/gdb/h8300-tdep.c index c60c299f20d..d3c4009763b 100644 --- a/gdb/h8300-tdep.c +++ b/gdb/h8300-tdep.c @@ -35,6 +35,7 @@ #include "objfiles.h" #include "gdbcmd.h" #include "gdb_assert.h" +#include "dis-asm.h" /* Extra info which is saved in each frame_info. */ struct frame_extra_info diff --git a/gdb/i386-tdep.c b/gdb/i386-tdep.c index 9aa20d6e1b8..dd19e2499d0 100644 --- a/gdb/i386-tdep.c +++ b/gdb/i386-tdep.c @@ -41,6 +41,7 @@ #include "symtab.h" #include "target.h" #include "value.h" +#include "dis-asm.h" #include "gdb_assert.h" #include "gdb_string.h" @@ -1566,7 +1567,7 @@ i386_pc_in_sigtramp (CORE_ADDR pc, char *name) deals with switching between those. */ static int -i386_print_insn (bfd_vma pc, disassemble_info *info) +i386_print_insn (bfd_vma pc, struct disassemble_info *info) { gdb_assert (disassembly_flavor == att_flavor || disassembly_flavor == intel_flavor); diff --git a/gdb/ia64-tdep.c b/gdb/ia64-tdep.c index 323bf1c9781..9847da14e52 100644 --- a/gdb/ia64-tdep.c +++ b/gdb/ia64-tdep.c @@ -36,6 +36,7 @@ #include "objfiles.h" #include "elf/common.h" /* for DT_PLTGOT value */ #include "elf-bfd.h" +#include "dis-asm.h" /* Hook for determining the global pointer when calling functions in the inferior under AIX. The initialization code in ia64-aix-nat.c diff --git a/gdb/m68k-tdep.c b/gdb/m68k-tdep.c index bbc14d3410e..c6cbd5bbaf8 100644 --- a/gdb/m68k-tdep.c +++ b/gdb/m68k-tdep.c @@ -33,6 +33,7 @@ #include "regcache.h" #include "arch-utils.h" #include "osabi.h" +#include "dis-asm.h" #include "m68k-tdep.h" diff --git a/gdb/mcore-tdep.c b/gdb/mcore-tdep.c index dcb8a93ec74..ac76c17dc11 100644 --- a/gdb/mcore-tdep.c +++ b/gdb/mcore-tdep.c @@ -29,6 +29,7 @@ #include "arch-utils.h" #include "gdb_string.h" #include "disasm.h" +#include "dis-asm.h" static CORE_ADDR mcore_analyze_prologue (struct frame_info *fi, CORE_ADDR pc, int skip_prologue); diff --git a/gdb/mips-tdep.c b/gdb/mips-tdep.c index ad268b6dd66..9e391c0811e 100644 --- a/gdb/mips-tdep.c +++ b/gdb/mips-tdep.c @@ -48,6 +48,7 @@ #include "elf-bfd.h" #include "symcat.h" #include "sim-regno.h" +#include "dis-asm.h" static void set_reg_offset (CORE_ADDR *saved_regs, int regnum, CORE_ADDR off); static struct type *mips_register_type (struct gdbarch *gdbarch, int regnum); @@ -374,8 +375,6 @@ mips_stack_argsize (void) #define VM_MIN_ADDRESS (CORE_ADDR)0x400000 -int gdb_print_insn_mips (bfd_vma, disassemble_info *); - static mips_extra_func_info_t heuristic_proc_desc (CORE_ADDR, CORE_ADDR, struct frame_info *, int); @@ -5255,8 +5254,8 @@ reinit_frame_cache_sfunc (char *args, int from_tty, reinit_frame_cache (); } -int -gdb_print_insn_mips (bfd_vma memaddr, disassemble_info *info) +static int +gdb_print_insn_mips (bfd_vma memaddr, struct disassemble_info *info) { struct gdbarch_tdep *tdep = gdbarch_tdep (current_gdbarch); mips_extra_func_info_t proc_desc; diff --git a/gdb/mn10300-tdep.c b/gdb/mn10300-tdep.c index 83be4d18210..44a46a1c8d3 100644 --- a/gdb/mn10300-tdep.c +++ b/gdb/mn10300-tdep.c @@ -32,6 +32,7 @@ #include "regcache.h" #include "arch-utils.h" #include "gdb_assert.h" +#include "dis-asm.h" #define D0_REGNUM 0 #define D2_REGNUM 2 diff --git a/gdb/ns32k-tdep.c b/gdb/ns32k-tdep.c index f5fae7b0440..5fd95fcb3c7 100644 --- a/gdb/ns32k-tdep.c +++ b/gdb/ns32k-tdep.c @@ -28,6 +28,7 @@ #include "target.h" #include "arch-utils.h" #include "osabi.h" +#include "dis-asm.h" #include "ns32k-tdep.h" #include "gdb_string.h" diff --git a/gdb/rs6000-tdep.c b/gdb/rs6000-tdep.c index eaf4db611e4..d03bfa8974a 100644 --- a/gdb/rs6000-tdep.c +++ b/gdb/rs6000-tdep.c @@ -48,6 +48,7 @@ #include "ppc-tdep.h" #include "gdb_assert.h" +#include "dis-asm.h" /* If the kernel has to deliver a signal, it pushes a sigcontext structure on the stack and then calls the signal handler, passing diff --git a/gdb/s390-tdep.c b/gdb/s390-tdep.c index e3c71d4f447..bc82646b57f 100644 --- a/gdb/s390-tdep.c +++ b/gdb/s390-tdep.c @@ -39,7 +39,7 @@ #include "regcache.h" #include "value.h" #include "gdb_assert.h" - +#include "dis-asm.h" diff --git a/gdb/sparc-tdep.c b/gdb/sparc-tdep.c index c516efd024a..8f43983a6f4 100644 --- a/gdb/sparc-tdep.c +++ b/gdb/sparc-tdep.c @@ -33,6 +33,7 @@ #include "gdb_string.h" #include "regcache.h" #include "osabi.h" +#include "dis-asm.h" #include "sparc-tdep.h" diff --git a/gdb/v850-tdep.c b/gdb/v850-tdep.c index c7a8027ad97..a38d5621e8d 100644 --- a/gdb/v850-tdep.c +++ b/gdb/v850-tdep.c @@ -31,6 +31,7 @@ #include "arch-utils.h" #include "regcache.h" #include "symtab.h" +#include "dis-asm.h" struct gdbarch_tdep { diff --git a/gdb/vax-tdep.c b/gdb/vax-tdep.c index c2a3fbb5033..9a16730f62e 100644 --- a/gdb/vax-tdep.c +++ b/gdb/vax-tdep.c @@ -30,6 +30,7 @@ #include "arch-utils.h" #include "gdb_string.h" #include "osabi.h" +#include "dis-asm.h" #include "vax-tdep.h" diff --git a/gdb/xstormy16-tdep.c b/gdb/xstormy16-tdep.c index 15abe452f45..1014abad200 100644 --- a/gdb/xstormy16-tdep.c +++ b/gdb/xstormy16-tdep.c @@ -27,6 +27,7 @@ #include "regcache.h" #include "gdbcore.h" #include "objfiles.h" +#include "dis-asm.h" struct gdbarch_tdep { @@ -1128,7 +1129,5 @@ extern initialize_file_ftype _initialize_xstormy16_tdep; /* -Wmissing-prototypes void _initialize_xstormy16_tdep (void) { - extern int print_insn_xstormy16 (); - register_gdbarch_init (bfd_arch_xstormy16, xstormy16_gdbarch_init); } |