From 36b8628e1954d9e640894c948262e27e92101f62 Mon Sep 17 00:00:00 2001 From: Andrew Cagney Date: Sun, 31 Oct 2004 04:33:14 +0000 Subject: [PATCH] 2004-10-30 Andrew Cagney * mdebugread.h: Include "coff/sym.h" and "coff/symconst.h". (struct mdebug_extra_func_info): Define. * config/alpha/tm-alpha.h: Delete same. * config/mips/tm-mips.h: Delete same. * mdebugread.c: Delete same. * Makefile.in: Update dependencies. * mips-mdebug-tdep.c: Include "mdebugread.h". --- gdb/ChangeLog | 8 ++++++++ gdb/Makefile.in | 10 +++++----- gdb/config/alpha/tm-alpha.h | 17 ----------------- gdb/config/mips/tm-mips.h | 14 -------------- gdb/mdebugread.c | 7 ------- gdb/mdebugread.h | 12 ++++++++++++ gdb/mips-mdebug-tdep.c | 1 + 7 files changed, 26 insertions(+), 43 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 602ad2fc53f..26f9b2ed520 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,13 @@ 2004-10-30 Andrew Cagney + * mdebugread.h: Include "coff/sym.h" and "coff/symconst.h". + (struct mdebug_extra_func_info): Define. + * config/alpha/tm-alpha.h: Delete same. + * config/mips/tm-mips.h: Delete same. + * mdebugread.c: Delete same. + * Makefile.in: Update dependencies. + * mips-mdebug-tdep.c: Include "mdebugread.h". + * objfiles.c: Include "mdebugread.h". * mdebugread.c: Include "mdebugread.h". (ecoff_relocate_cfi): Delete. diff --git a/gdb/Makefile.in b/gdb/Makefile.in index 3fbe255109b..7abd4698e53 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -727,7 +727,7 @@ macroexp_h = macroexp.h macroscope_h = macroscope.h $(macrotab_h) $(symtab_h) macrotab_h = macrotab.h main_h = main.h -mdebugread_h = mdebugread.h +mdebugread_h = mdebugread.h $(coff_sym_h) $(coff_symconst_h) memattr_h = memattr.h mips_mdebug_tdep_h = mips-mdebug-tdep.h mipsnbsd_tdep_h = mipsnbsd-tdep.h @@ -2222,9 +2222,9 @@ mcore-tdep.o: mcore-tdep.c $(defs_h) $(frame_h) $(symtab_h) $(value_h) \ mdebugread.o: mdebugread.c $(defs_h) $(symtab_h) $(gdbtypes_h) $(gdbcore_h) \ $(objfiles_h) $(gdb_obstack_h) $(buildsym_h) $(stabsread_h) \ $(complaints_h) $(demangle_h) $(gdb_assert_h) $(block_h) \ - $(dictionary_h) $(mdebugread_h) $(coff_sym_h) $(coff_symconst_h) \ - $(gdb_stat_h) $(gdb_string_h) $(bfd_h) $(coff_ecoff_h) $(libaout_h) \ - $(aout_aout64_h) $(aout_stab_gnu_h) $(expression_h) + $(dictionary_h) $(mdebugread_h) $(gdb_stat_h) $(gdb_string_h) \ + $(bfd_h) $(coff_ecoff_h) $(libaout_h) $(aout_aout64_h) \ + $(aout_stab_gnu_h) $(expression_h) memattr.o: memattr.c $(defs_h) $(command_h) $(gdbcmd_h) $(memattr_h) \ $(target_h) $(value_h) $(language_h) $(gdb_string_h) mem-break.o: mem-break.c $(defs_h) $(symtab_h) $(breakpoint_h) $(inferior_h) \ @@ -2243,7 +2243,7 @@ mips-linux-tdep.o: mips-linux-tdep.c $(defs_h) $(gdbcore_h) $(target_h) \ mips-mdebug-tdep.o: mips-mdebug-tdep.c $(defs_h) $(frame_h) $(mips_tdep_h) \ $(trad_frame_h) $(block_h) $(symtab_h) $(objfiles_h) $(elf_mips_h) \ $(elf_bfd_h) $(gdb_assert_h) $(frame_unwind_h) $(frame_base_h) \ - $(mips_mdebug_tdep_h) + $(mips_mdebug_tdep_h) $(mdebugread_h) mipsnbsd-nat.o: mipsnbsd-nat.c $(defs_h) $(inferior_h) $(regcache_h) \ $(mips_tdep_h) $(mipsnbsd_tdep_h) mipsnbsd-tdep.o: mipsnbsd-tdep.c $(defs_h) $(gdbcore_h) $(regcache_h) \ diff --git a/gdb/config/alpha/tm-alpha.h b/gdb/config/alpha/tm-alpha.h index fcf90deab32..468798b4711 100644 --- a/gdb/config/alpha/tm-alpha.h +++ b/gdb/config/alpha/tm-alpha.h @@ -24,13 +24,6 @@ #ifndef TM_ALPHA_H #define TM_ALPHA_H -#include "bfd.h" -#include "coff/sym.h" /* Needed for PDR below. */ -#include "coff/symconst.h" - -struct frame_info; -struct symbol; - /* Special symbol found in blocks associated with routines. We can hang alpha_extra_func_info_t's off of this. */ @@ -38,14 +31,4 @@ struct symbol; #define RA_REGNUM 26 /* XXXJRT needed by mdebugread.c */ -/* Specific information about a procedure. - This overlays the ALPHA's PDR records, - alpharead.c (ab)uses this to save memory */ - -struct mdebug_extra_func_info -{ - long numargs; /* number of args to procedure (was iopt) */ - PDR pdr; /* Procedure descriptor record */ -}; - #endif /* TM_ALPHA_H */ diff --git a/gdb/config/mips/tm-mips.h b/gdb/config/mips/tm-mips.h index 2f2ab9d7d40..344c98e94a8 100644 --- a/gdb/config/mips/tm-mips.h +++ b/gdb/config/mips/tm-mips.h @@ -33,10 +33,6 @@ struct symbol; struct type; struct value; -#include -#include "coff/sym.h" /* Needed for PDR below. */ -#include "coff/symconst.h" - /* Return non-zero if PC points to an instruction which will cause a step to execute both the instruction at PC and an instruction at PC+4. */ extern int mips_step_skips_delay (CORE_ADDR); @@ -50,16 +46,6 @@ extern int mips_step_skips_delay (CORE_ADDR); #define MDEBUG_EFI_SYMBOL_NAME "__GDB_EFI_INFO__" -/* Specific information about a procedure. - This overlays the MIPS's PDR records, - mipsread.c (ab)uses this to save memory */ - -struct mdebug_extra_func_info -{ - long numargs; /* number of args to procedure (was iopt) */ - PDR pdr; /* Procedure descriptor record */ -}; - /* Functions for dealing with MIPS16 call and return stubs. */ #define DEPRECATED_IGNORE_HELPER_CALL(pc) mips_ignore_helper (pc) extern int mips_ignore_helper (CORE_ADDR pc); diff --git a/gdb/mdebugread.c b/gdb/mdebugread.c index 009430c020a..26b9de6c71a 100644 --- a/gdb/mdebugread.c +++ b/gdb/mdebugread.c @@ -63,13 +63,6 @@ #ifndef MDEBUG_EFI_SYMBOL_NAME #define MDEBUG_EFI_SYMBOL_NAME "__GDB_EFI_INFO__" -#include "coff/sym.h" -#include "coff/symconst.h" -struct mdebug_extra_func_info -{ - long numargs; - PDR pdr; -}; #ifndef RA_REGNUM #define RA_REGNUM 0 #endif diff --git a/gdb/mdebugread.h b/gdb/mdebugread.h index e1a5d1a23cd..25b7beef13e 100644 --- a/gdb/mdebugread.h +++ b/gdb/mdebugread.h @@ -22,6 +22,18 @@ #ifndef MDEBUGREAD_H #define MDEBUGREAD_H +#include "coff/sym.h" /* Needed for PDR below. */ +#include "coff/symconst.h" + extern void ecoff_relocate_efi (struct symbol *, CORE_ADDR); +/* Specific information about a procedure. Architectures (ab)uses + this to save memory. */ + +struct mdebug_extra_func_info +{ + long numargs; /* number of args to procedure (was iopt) */ + PDR pdr; /* Procedure descriptor record */ +}; + #endif /* MDEBUGREAD_H */ diff --git a/gdb/mips-mdebug-tdep.c b/gdb/mips-mdebug-tdep.c index b13cba4e79f..538e37476a2 100644 --- a/gdb/mips-mdebug-tdep.c +++ b/gdb/mips-mdebug-tdep.c @@ -35,6 +35,7 @@ #include "frame-unwind.h" #include "frame-base.h" #include "mips-mdebug-tdep.h" +#include "mdebugread.h" #define PROC_LOW_ADDR(proc) ((proc)->pdr.adr) /* least address */ #define PROC_FRAME_OFFSET(proc) ((proc)->pdr.frameoffset) -- 2.30.2