From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 9541 invoked by alias); 13 Feb 2004 22:38:00 -0000 Mailing-List: contact gdb-patches-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sources.redhat.com Received: (qmail 9528 invoked from network); 13 Feb 2004 22:37:54 -0000 Received: from unknown (HELO localhost.redhat.com) (66.30.197.194) by sources.redhat.com with SMTP; 13 Feb 2004 22:37:54 -0000 Received: by localhost.redhat.com (Postfix, from userid 469) id A71B61A448A; Fri, 13 Feb 2004 17:33:48 -0500 (EST) From: Elena Zannoni MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Message-ID: <16429.20684.591874.642280@localhost.redhat.com> Date: Fri, 13 Feb 2004 22:38:00 -0000 To: gdb-patches@sources.redhat.com Subject: [PATCH] move entry_point stuff to objfiles.c X-SW-Source: 2004-02/txt/msg00356.txt.bz2 I got carried away, I really didn't like the entry_point stuff being in symfile.c. It is manipulating stuff in objfiles, so I moved it. Given that today is Friday the 13th, it seem perfectly in line that I had also to cleanup the includes. Lots of includes are no longer needed. Note that I didn't remove the includes in xcoffread.c and solib-irix.c because the gdb_mbuild.sh script doesn't get to compile these files, so I just added a comment. I'll check in tomorrow-ish. elena 2004-02-13 Elena Zannoni * symfile.c (init_entry_point_info, enrty_point_address): Move from here... * objfiles.c (init_entry_point_info, entry_point_address):..to here. * symfile.h (init_entry_point_info, enrty_point_address): Remove prototypes. * objfiles.h (init_entry_point_info, entry_point_address):Add prototypes. * cris-tdep.c: Remove include of symfile.h. Add include of objfiles.h. * infcall.c: Ditto. * mcore-tdep.c: Ditto. * mn10300-tdep.c: Ditto. * sh64-tdep.c: Ditto. * v850-tdep.c: Ditto. * arm-tdep.c: Remove include of symfile.h. * blockframe.c: Ditto. * coffread.c: Ditto. * dbxread.c: Ditto. * dwarf2read.c: Ditto. * dwarfread.c: Ditto. * frv-tdep.c: Ditto. * ia64-tdep.c: Ditto. * mdebugread.c: Ditto. * mipsread.c: Ditto. * rs6000-tdep.c: Ditto. * s390-tdep.c: Ditto. * sh-tdep.c: Ditto. * xstormy16-tdep.c: Ditto. * gdbarch.sh: Remove include of symfile.h. * gdbarch.c: Regenerate. * solib-irix.c (enable_break): Use entry_point_address(). Add comment about include file. * xcoffread.c: Add comment about include file. * Makefile.in (arm-tdep.o, blockframe.o, coffread.o, cris-tdep.o) (dbxread.o, dwarf2read.o, dwarfread.o, frv-tdep.o, gdbarch.o) (ia64-tdep.o, infcall.o, mcore-tdep.o, mdebugread.o, mipsread.o) (mn10300-tdep.o, rs6000-nat.o, s390-tdep.o, sh64-tdep.o) (sh-tdep.o, v850-tdep.o, xstormy16-tdep.o): Update dependencies. Index: Makefile.in =================================================================== RCS file: /cvs/src/src/gdb/Makefile.in,v retrieving revision 1.496 diff -u -p -r1.496 Makefile.in --- Makefile.in 11 Feb 2004 18:47:26 -0000 1.496 +++ Makefile.in 13 Feb 2004 22:26:16 -0000 @@ -1599,7 +1599,7 @@ armnbsd-nat.o: armnbsd-nat.c $(defs_h) $ armnbsd-tdep.o: armnbsd-tdep.c $(defs_h) $(osabi_h) $(arm_tdep_h) \ $(nbsd_tdep_h) $(solib_svr4_h) arm-tdep.o: arm-tdep.c $(defs_h) $(frame_h) $(inferior_h) $(gdbcmd_h) \ - $(gdbcore_h) $(symfile_h) $(gdb_string_h) $(dis_asm_h) $(regcache_h) \ + $(gdbcore_h) $(gdb_string_h) $(dis_asm_h) $(regcache_h) \ $(doublest_h) $(value_h) $(arch_utils_h) $(osabi_h) \ $(frame_unwind_h) $(frame_base_h) $(trad_frame_h) $(arm_tdep_h) \ $(gdb_sim_arm_h) $(elf_bfd_h) $(coff_internal_h) $(elf_arm_h) \ @@ -1622,7 +1622,7 @@ bfd-target.o: bfd-target.c $(defs_h) $(t $(gdb_assert_h) $(gdb_string_h) block.o: block.c $(defs_h) $(block_h) $(symtab_h) $(symfile_h) \ $(gdb_obstack_h) $(cp_support_h) -blockframe.o: blockframe.c $(defs_h) $(symtab_h) $(bfd_h) $(symfile_h) \ +blockframe.o: blockframe.c $(defs_h) $(symtab_h) $(bfd_h) \ $(objfiles_h) $(frame_h) $(gdbcore_h) $(value_h) $(target_h) \ $(inferior_h) $(annotate_h) $(regcache_h) $(gdb_assert_h) \ $(dummy_frame_h) $(command_h) $(gdbcmd_h) $(block_h) @@ -1650,7 +1650,7 @@ coff-pe-read.o: coff-pe-read.c $(coff_pe $(gdbtypes_h) $(symtab_h) $(symfile_h) $(objfiles_h) coffread.o: coffread.c $(defs_h) $(symtab_h) $(gdbtypes_h) $(demangle_h) \ $(breakpoint_h) $(bfd_h) $(gdb_obstack_h) $(gdb_string_h) \ - $(coff_internal_h) $(libcoff_h) $(symfile_h) $(objfiles_h) \ + $(coff_internal_h) $(libcoff_h) $(objfiles_h) \ $(buildsym_h) $(gdb_stabs_h) $(stabsread_h) $(complaints_h) \ $(target_h) $(gdb_assert_h) $(block_h) $(dictionary_h) \ $(coff_pe_read_h) @@ -1691,7 +1691,7 @@ cp-valprint.o: cp-valprint.c $(defs_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) $(dis_asm_h) + $(objfiles_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) \ @@ -1709,7 +1709,7 @@ dbug-rom.o: dbug-rom.c $(defs_h) $(gdbco $(serial_h) $(regcache_h) $(m68k_tdep_h) dbxread.o: dbxread.c $(defs_h) $(gdb_string_h) $(gdb_obstack_h) \ $(gdb_stat_h) $(symtab_h) $(breakpoint_h) $(target_h) $(gdbcore_h) \ - $(libaout_h) $(symfile_h) $(objfiles_h) $(buildsym_h) $(stabsread_h) \ + $(libaout_h) $(objfiles_h) $(buildsym_h) $(stabsread_h) \ $(gdb_stabs_h) $(demangle_h) $(language_h) $(complaints_h) \ $(cp_abi_h) $(gdb_assert_h) $(aout_aout64_h) $(aout_stab_gnu_h) dcache.o: dcache.c $(defs_h) $(dcache_h) $(gdbcmd_h) $(gdb_string_h) \ @@ -1745,11 +1745,11 @@ dwarf2loc.o: dwarf2loc.c $(defs_h) $(ui_ $(regcache_h) $(objfiles_h) $(elf_dwarf2_h) $(dwarf2expr_h) \ $(dwarf2loc_h) $(gdb_string_h) dwarf2read.o: dwarf2read.c $(defs_h) $(bfd_h) $(symtab_h) $(gdbtypes_h) \ - $(symfile_h) $(objfiles_h) $(elf_dwarf2_h) $(buildsym_h) \ + $(objfiles_h) $(elf_dwarf2_h) $(buildsym_h) \ $(demangle_h) $(expression_h) $(filenames_h) $(macrotab_h) \ $(language_h) $(complaints_h) $(bcache_h) $(dwarf2expr_h) \ $(dwarf2loc_h) $(cp_support_h) $(gdb_string_h) $(gdb_assert_h) -dwarfread.o: dwarfread.c $(defs_h) $(symtab_h) $(gdbtypes_h) $(symfile_h) \ +dwarfread.o: dwarfread.c $(defs_h) $(symtab_h) $(gdbtypes_h) \ $(objfiles_h) $(elf_dwarf_h) $(buildsym_h) $(demangle_h) \ $(expression_h) $(language_h) $(complaints_h) $(gdb_string_h) elfread.o: elfread.c $(defs_h) $(bfd_h) $(gdb_string_h) $(elf_bfd_h) \ @@ -1791,7 +1791,7 @@ frame.o: frame.c $(defs_h) $(frame_h) $( $(command_h) $(gdbcmd_h) frame-unwind.o: frame-unwind.c $(defs_h) $(frame_h) $(frame_unwind_h) \ $(gdb_assert_h) $(dummy_frame_h) -frv-tdep.o: frv-tdep.c $(defs_h) $(gdb_string_h) $(inferior_h) $(symfile_h) \ +frv-tdep.o: frv-tdep.c $(defs_h) $(gdb_string_h) $(inferior_h) \ $(gdbcore_h) $(arch_utils_h) $(regcache_h) $(frame_h) \ $(frame_unwind_h) $(frame_base_h) $(trad_frame_h) $(dis_asm_h) \ $(gdb_assert_h) $(sim_regno_h) $(gdb_sim_frv_h) \ @@ -1807,7 +1807,7 @@ gcore.o: gcore.c $(defs_h) $(elf_bfd_h) $(gdb_assert_h) gdbarch.o: gdbarch.c $(defs_h) $(arch_utils_h) $(gdbcmd_h) $(inferior_h) \ $(symcat_h) $(floatformat_h) $(gdb_assert_h) $(gdb_string_h) \ - $(gdb_events_h) $(reggroups_h) $(osabi_h) $(symfile_h) \ + $(gdb_events_h) $(reggroups_h) $(osabi_h) \ $(gdb_obstack_h) gdb.o: gdb.c $(defs_h) $(main_h) $(gdb_string_h) $(interps_h) gdb-events.o: gdb-events.c $(defs_h) $(gdb_events_h) $(gdbcmd_h) @@ -1917,7 +1917,7 @@ ia64-aix-tdep.o: ia64-aix-tdep.c $(defs_ ia64-linux-nat.o: ia64-linux-nat.c $(defs_h) $(gdb_string_h) $(inferior_h) \ $(target_h) $(gdbcore_h) $(regcache_h) $(gdb_wait_h) $(gregset_h) ia64-linux-tdep.o: ia64-linux-tdep.c $(defs_h) $(arch_utils_h) $(gdbcore_h) -ia64-tdep.o: ia64-tdep.c $(defs_h) $(inferior_h) $(symfile_h) $(gdbcore_h) \ +ia64-tdep.o: ia64-tdep.c $(defs_h) $(inferior_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) \ @@ -1925,7 +1925,7 @@ ia64-tdep.o: ia64-tdep.c $(defs_h) $(inf $(libunwind_ia64_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) + $(objfiles_h) $(gdbcmd_h) $(command_h) $(gdb_string_h) $(infcall_h) infcmd.o: infcmd.c $(defs_h) $(gdb_string_h) $(symtab_h) $(gdbtypes_h) \ $(frame_h) $(inferior_h) $(environ_h) $(value_h) $(gdbcmd_h) \ $(symfile_h) $(gdbcore_h) $(target_h) $(language_h) $(symfile_h) \ @@ -2046,10 +2046,10 @@ maint.o: maint.c $(defs_h) $(command_h) 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) \ + $(gdbcmd_h) $(regcache_h) $(objfiles_h) $(gdbcore_h) $(inferior_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) \ + $(objfiles_h) $(gdb_obstack_h) $(buildsym_h) \ $(stabsread_h) $(complaints_h) $(demangle_h) $(gdb_assert_h) \ $(block_h) $(dictionary_h) $(coff_sym_h) $(coff_symconst_h) \ $(gdb_stat_h) $(gdb_string_h) $(bfd_h) $(coff_ecoff_h) $(libaout_h) \ @@ -2072,7 +2072,7 @@ mipsnbsd-tdep.o: mipsnbsd-tdep.c $(defs_ $(target_h) $(value_h) $(osabi_h) $(nbsd_tdep_h) $(mipsnbsd_tdep_h) \ $(solib_svr4_h) mipsread.o: mipsread.c $(defs_h) $(gdb_string_h) $(bfd_h) $(symtab_h) \ - $(symfile_h) $(objfiles_h) $(buildsym_h) $(stabsread_h) \ + $(objfiles_h) $(buildsym_h) $(stabsread_h) \ $(coff_sym_h) $(coff_internal_h) $(coff_ecoff_h) $(libcoff_h) \ $(libecoff_h) $(elf_common_h) $(elf_mips_h) mips-tdep.o: mips-tdep.c $(defs_h) $(gdb_string_h) $(gdb_assert_h) \ @@ -2086,7 +2086,7 @@ mipsv4-nat.o: mipsv4-nat.c $(defs_h) $(i $(regcache_h) $(gregset_h) 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) \ + $(objfiles_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) \ @@ -2248,14 +2248,14 @@ rs6000-nat.o: rs6000-nat.c $(defs_h) $(i $(gdb_stabs_h) $(regcache_h) $(arch_utils_h) $(language_h) \ $(ppc_tdep_h) $(exec_h) $(gdb_stat_h) rs6000-tdep.o: rs6000-tdep.c $(defs_h) $(frame_h) $(inferior_h) $(symtab_h) \ - $(target_h) $(gdbcore_h) $(gdbcmd_h) $(symfile_h) $(objfiles_h) \ + $(target_h) $(gdbcore_h) $(gdbcmd_h) $(objfiles_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) $(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) \ + $(symtab_h) $(target_h) $(gdbcore_h) $(gdbcmd_h) \ $(objfiles_h) $(tm_h) $(__bfd_bfd_h) $(floatformat_h) $(regcache_h) \ $(value_h) $(gdb_assert_h) $(dis_asm_h) scm-exp.o: scm-exp.c $(defs_h) $(symtab_h) $(gdbtypes_h) $(expression_h) \ @@ -2280,7 +2280,7 @@ ser-unix.o: ser-unix.c $(defs_h) $(seria sh3-rom.o: sh3-rom.c $(defs_h) $(gdbcore_h) $(target_h) $(monitor_h) \ $(serial_h) $(srec_h) $(arch_utils_h) $(regcache_h) $(gdb_string_h) \ $(sh_tdep_h) -sh64-tdep.o: sh64-tdep.c $(defs_h) $(frame_h) $(symtab_h) $(symfile_h) \ +sh64-tdep.o: sh64-tdep.c $(defs_h) $(frame_h) $(symtab_h) $(objfiles_h) \ $(gdbtypes_h) $(gdbcmd_h) $(gdbcore_h) $(value_h) $(dis_asm_h) \ $(inferior_h) $(gdb_string_h) $(arch_utils_h) $(floatformat_h) \ $(regcache_h) $(doublest_h) $(osabi_h) $(elf_bfd_h) $(solib_svr4_h) \ @@ -2292,7 +2292,7 @@ shnbsd-tdep.o: shnbsd-tdep.c $(defs_h) $ $(shnbsd_tdep_h) sh-stub.o: sh-stub.c sh-tdep.o: sh-tdep.c $(defs_h) $(frame_h) $(frame_base_h) $(frame_unwind_h) \ - $(dwarf2_frame_h) $(symtab_h) $(symfile_h) $(gdbtypes_h) $(gdbcmd_h) \ + $(dwarf2_frame_h) $(symtab_h) $(gdbtypes_h) $(gdbcmd_h) \ $(gdbcore_h) $(value_h) $(dis_asm_h) $(inferior_h) $(gdb_string_h) \ $(gdb_assert_h) $(arch_utils_h) $(floatformat_h) $(regcache_h) \ $(doublest_h) $(osabi_h) $(sh_tdep_h) $(elf_bfd_h) $(solib_svr4_h) \ @@ -2463,7 +2463,7 @@ v850ice.o: v850ice.c $(defs_h) $(gdb_str $(inferior_h) $(breakpoint_h) $(symfile_h) $(target_h) $(objfiles_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) \ + $(value_h) $(bfd_h) $(gdb_string_h) $(gdbcore_h) $(objfiles_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) \ @@ -2509,14 +2509,14 @@ x86-64-tdep.o: x86-64-tdep.c $(defs_h) $ $(i387_tdep_h) xcoffread.o: xcoffread.c $(defs_h) $(bfd_h) $(gdb_string_h) $(gdb_stat_h) \ $(coff_internal_h) $(libcoff_h) $(coff_xcoff_h) $(libxcoff_h) \ - $(coff_rs6000_h) $(symtab_h) $(gdbtypes_h) $(symfile_h) \ + $(coff_rs6000_h) $(symtab_h) $(gdbtypes_h) $(symfile.h) \ $(objfiles_h) $(buildsym_h) $(stabsread_h) $(expression_h) \ $(complaints_h) $(gdb_stabs_h) $(aout_stab_gnu_h) xcoffsolib.o: xcoffsolib.c $(defs_h) $(bfd_h) $(xcoffsolib_h) $(inferior_h) \ $(gdbcmd_h) $(symfile_h) $(frame_h) $(gdb_regex_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) \ + $(arch_utils_h) $(regcache_h) $(gdbcore_h) \ $(objfiles_h) $(dis_asm_h) # Index: arm-tdep.c =================================================================== RCS file: /cvs/src/src/gdb/arm-tdep.c,v retrieving revision 1.161 diff -u -p -r1.161 arm-tdep.c --- arm-tdep.c 12 Feb 2004 18:43:09 -0000 1.161 +++ arm-tdep.c 13 Feb 2004 22:26:19 -0000 @@ -26,7 +26,6 @@ #include "inferior.h" #include "gdbcmd.h" #include "gdbcore.h" -#include "symfile.h" #include "gdb_string.h" #include "dis-asm.h" /* For register styles. */ #include "regcache.h" Index: blockframe.c =================================================================== RCS file: /cvs/src/src/gdb/blockframe.c,v retrieving revision 1.89 diff -u -p -r1.89 blockframe.c --- blockframe.c 12 Feb 2004 16:52:45 -0000 1.89 +++ blockframe.c 13 Feb 2004 22:26:20 -0000 @@ -25,7 +25,6 @@ #include "defs.h" #include "symtab.h" #include "bfd.h" -#include "symfile.h" #include "objfiles.h" #include "frame.h" #include "gdbcore.h" Index: coffread.c =================================================================== RCS file: /cvs/src/src/gdb/coffread.c,v retrieving revision 1.51 diff -u -p -r1.51 coffread.c --- coffread.c 7 Feb 2004 23:13:46 -0000 1.51 +++ coffread.c 13 Feb 2004 22:26:22 -0000 @@ -35,8 +35,6 @@ #include "coff/internal.h" /* Internal format of COFF symbols in BFD */ #include "libcoff.h" /* FIXME secret internal data from BFD */ - -#include "symfile.h" #include "objfiles.h" #include "buildsym.h" #include "gdb-stabs.h" Index: cris-tdep.c =================================================================== RCS file: /cvs/src/src/gdb/cris-tdep.c,v retrieving revision 1.99 diff -u -p -r1.99 cris-tdep.c --- cris-tdep.c 12 Feb 2004 18:43:09 -0000 1.99 +++ cris-tdep.c 13 Feb 2004 22:26:26 -0000 @@ -36,7 +36,7 @@ Foundation, Inc., 59 Temple Place - Suit #include "gdb_assert.h" /* To get entry_point_address. */ -#include "symfile.h" +#include "objfiles.h" #include "solib.h" /* Support for shared libraries. */ #include "solib-svr4.h" /* For struct link_map_offsets. */ Index: dbxread.c =================================================================== RCS file: /cvs/src/src/gdb/dbxread.c,v retrieving revision 1.63 diff -u -p -r1.63 dbxread.c --- dbxread.c 7 Feb 2004 18:29:53 -0000 1.63 +++ dbxread.c 13 Feb 2004 22:26:30 -0000 @@ -1,6 +1,6 @@ /* Read dbx symbol tables and convert to internal format, for GDB. Copyright 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, - 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003. + 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004. Free Software Foundation, Inc. This file is part of GDB. @@ -49,7 +49,6 @@ #include "target.h" #include "gdbcore.h" /* for bfd stuff */ #include "libaout.h" /* FIXME Secret internal BFD stuff for a.out */ -#include "symfile.h" #include "objfiles.h" #include "buildsym.h" #include "stabsread.h" Index: dwarf2read.c =================================================================== RCS file: /cvs/src/src/gdb/dwarf2read.c,v retrieving revision 1.133 diff -u -p -r1.133 dwarf2read.c --- dwarf2read.c 7 Feb 2004 23:13:47 -0000 1.133 +++ dwarf2read.c 13 Feb 2004 22:26:38 -0000 @@ -31,7 +31,6 @@ #include "bfd.h" #include "symtab.h" #include "gdbtypes.h" -#include "symfile.h" #include "objfiles.h" #include "elf/dwarf2.h" #include "buildsym.h" Index: dwarfread.c =================================================================== RCS file: /cvs/src/src/gdb/dwarfread.c,v retrieving revision 1.36 diff -u -p -r1.36 dwarfread.c --- dwarfread.c 7 Feb 2004 23:13:47 -0000 1.36 +++ dwarfread.c 13 Feb 2004 22:26:41 -0000 @@ -102,7 +102,6 @@ #include "defs.h" #include "symtab.h" #include "gdbtypes.h" -#include "symfile.h" #include "objfiles.h" #include "elf/dwarf.h" #include "buildsym.h" Index: frv-tdep.c =================================================================== RCS file: /cvs/src/src/gdb/frv-tdep.c,v retrieving revision 1.69 diff -u -p -r1.69 frv-tdep.c --- frv-tdep.c 11 Feb 2004 15:40:27 -0000 1.69 +++ frv-tdep.c 13 Feb 2004 22:26:43 -0000 @@ -1,5 +1,5 @@ /* Target-dependent code for the Fujitsu FR-V, for GDB, the GNU Debugger. - Copyright 2002, 2003 Free Software Foundation, Inc. + Copyright 2002, 2003, 2004 Free Software Foundation, Inc. This file is part of GDB. @@ -21,7 +21,6 @@ #include "defs.h" #include "gdb_string.h" #include "inferior.h" -#include "symfile.h" /* for entry_point_address */ #include "gdbcore.h" #include "arch-utils.h" #include "regcache.h" Index: gdbarch.c =================================================================== RCS file: /cvs/src/src/gdb/gdbarch.c,v retrieving revision 1.270 diff -u -p -r1.270 gdbarch.c --- gdbarch.c 12 Feb 2004 16:52:45 -0000 1.270 +++ gdbarch.c 13 Feb 2004 22:26:50 -0000 @@ -49,7 +49,6 @@ #include "gdb-events.h" #include "reggroups.h" #include "osabi.h" -#include "symfile.h" /* For entry_point_address. */ #include "gdb_obstack.h" /* Static function declarations */ Index: ia64-tdep.c =================================================================== RCS file: /cvs/src/src/gdb/ia64-tdep.c,v retrieving revision 1.113 diff -u -p -r1.113 ia64-tdep.c --- ia64-tdep.c 11 Feb 2004 15:40:27 -0000 1.113 +++ ia64-tdep.c 13 Feb 2004 22:26:54 -0000 @@ -21,7 +21,6 @@ #include "defs.h" #include "inferior.h" -#include "symfile.h" /* for entry_point_address */ #include "gdbcore.h" #include "arch-utils.h" #include "floatformat.h" Index: infcall.c =================================================================== RCS file: /cvs/src/src/gdb/infcall.c,v retrieving revision 1.36 diff -u -p -r1.36 infcall.c --- infcall.c 22 Nov 2003 22:15:23 -0000 1.36 +++ infcall.c 13 Feb 2004 22:26:56 -0000 @@ -1,8 +1,8 @@ /* Perform an inferior function call, for GDB, the GNU debugger. Copyright 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, - 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 Free Software - Foundation, Inc. + 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 + Free Software Foundation, Inc. This file is part of GDB. @@ -30,7 +30,7 @@ #include "block.h" #include "gdbcore.h" #include "language.h" -#include "symfile.h" +#include "objfiles.h" #include "gdbcmd.h" #include "command.h" #include "gdb_string.h" Index: mcore-tdep.c =================================================================== RCS file: /cvs/src/src/gdb/mcore-tdep.c,v retrieving revision 1.84 diff -u -p -r1.84 mcore-tdep.c --- mcore-tdep.c 11 Feb 2004 15:40:28 -0000 1.84 +++ mcore-tdep.c 13 Feb 2004 22:26:57 -0000 @@ -25,7 +25,7 @@ #include "value.h" #include "gdbcmd.h" #include "regcache.h" -#include "symfile.h" +#include "objfiles.h" #include "gdbcore.h" #include "inferior.h" #include "arch-utils.h" Index: mdebugread.c =================================================================== RCS file: /cvs/src/src/gdb/mdebugread.c,v retrieving revision 1.59 diff -u -p -r1.59 mdebugread.c --- mdebugread.c 7 Feb 2004 23:13:47 -0000 1.59 +++ mdebugread.c 13 Feb 2004 22:27:02 -0000 @@ -47,7 +47,6 @@ #include "symtab.h" #include "gdbtypes.h" #include "gdbcore.h" -#include "symfile.h" #include "objfiles.h" #include "gdb_obstack.h" #include "buildsym.h" Index: mipsread.c =================================================================== RCS file: /cvs/src/src/gdb/mipsread.c,v retrieving revision 1.14 diff -u -p -r1.14 mipsread.c --- mipsread.c 23 Nov 2003 20:41:17 -0000 1.14 +++ mipsread.c 13 Feb 2004 22:27:02 -0000 @@ -1,6 +1,6 @@ /* Read a symbol table in MIPS' format (Third-Eye). Copyright 1986, 1987, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, - 1998, 1999, 2000, 2001, 2003 + 1998, 1999, 2000, 2001, 2003, 2004 Free Software Foundation, Inc. Contributed by Alessandro Forin (af@cs.cmu.edu) at CMU. Major work by Per Bothner, John Gilmore and Ian Lance Taylor at Cygnus Support. @@ -29,7 +29,6 @@ #include "gdb_string.h" #include "bfd.h" #include "symtab.h" -#include "symfile.h" #include "objfiles.h" #include "buildsym.h" #include "stabsread.h" Index: mn10300-tdep.c =================================================================== RCS file: /cvs/src/src/gdb/mn10300-tdep.c,v retrieving revision 1.100 diff -u -p -r1.100 mn10300-tdep.c --- mn10300-tdep.c 11 Feb 2004 15:40:28 -0000 1.100 +++ mn10300-tdep.c 13 Feb 2004 22:27:04 -0000 @@ -28,7 +28,7 @@ #include "bfd.h" #include "gdb_string.h" #include "gdbcore.h" -#include "symfile.h" +#include "objfiles.h" #include "regcache.h" #include "arch-utils.h" #include "gdb_assert.h" Index: objfiles.c =================================================================== RCS file: /cvs/src/src/gdb/objfiles.c,v retrieving revision 1.48 diff -u -p -r1.48 objfiles.c --- objfiles.c 9 Feb 2004 23:50:55 -0000 1.48 +++ objfiles.c 13 Feb 2004 22:27:05 -0000 @@ -231,6 +231,40 @@ allocate_objfile (bfd *abfd, int flags) return (objfile); } +/* Initialize entry point information for this objfile. */ + +void +init_entry_point_info (struct objfile *objfile) +{ + /* Save startup file's range of PC addresses to help blockframe.c + decide where the bottom of the stack is. */ + + if (bfd_get_file_flags (objfile->obfd) & EXEC_P) + { + /* Executable file -- record its entry point so we'll recognize + the startup file because it contains the entry point. */ + objfile->ei.entry_point = bfd_get_start_address (objfile->obfd); + } + else + { + /* Examination of non-executable.o files. Short-circuit this stuff. */ + objfile->ei.entry_point = INVALID_ENTRY_POINT; + } + objfile->ei.deprecated_entry_file_lowpc = INVALID_ENTRY_LOWPC; + objfile->ei.deprecated_entry_file_highpc = INVALID_ENTRY_HIGHPC; + objfile->ei.entry_func_lowpc = INVALID_ENTRY_LOWPC; + objfile->ei.entry_func_highpc = INVALID_ENTRY_HIGHPC; + objfile->ei.main_func_lowpc = INVALID_ENTRY_LOWPC; + objfile->ei.main_func_highpc = INVALID_ENTRY_HIGHPC; +} + +/* Get current entry point address. */ + +CORE_ADDR +entry_point_address (void) +{ + return symfile_objfile ? symfile_objfile->ei.entry_point : 0; +} /* Create the terminating entry of OBJFILE's minimal symbol table. If OBJFILE->msymbols is zero, allocate a single entry from Index: objfiles.h =================================================================== RCS file: /cvs/src/src/gdb/objfiles.h,v retrieving revision 1.34 diff -u -p -r1.34 objfiles.h --- objfiles.h 10 Feb 2004 18:22:02 -0000 1.34 +++ objfiles.h 13 Feb 2004 22:27:05 -0000 @@ -532,6 +532,10 @@ extern struct objfile *object_files; extern struct objfile *allocate_objfile (bfd *, int); +extern void init_entry_point_info (struct objfile *); + +extern CORE_ADDR entry_point_address (void); + extern int build_objfile_section_table (struct objfile *); extern void terminate_minimal_symbol_table (struct objfile *objfile); Index: rs6000-tdep.c =================================================================== RCS file: /cvs/src/src/gdb/rs6000-tdep.c,v retrieving revision 1.178 diff -u -p -r1.178 rs6000-tdep.c --- rs6000-tdep.c 12 Feb 2004 18:43:09 -0000 1.178 +++ rs6000-tdep.c 13 Feb 2004 22:27:09 -0000 @@ -28,7 +28,6 @@ #include "target.h" #include "gdbcore.h" #include "gdbcmd.h" -#include "symfile.h" #include "objfiles.h" #include "arch-utils.h" #include "regcache.h" Index: s390-tdep.c =================================================================== RCS file: /cvs/src/src/gdb/s390-tdep.c,v retrieving revision 1.122 diff -u -p -r1.122 s390-tdep.c --- s390-tdep.c 12 Feb 2004 18:43:09 -0000 1.122 +++ s390-tdep.c 13 Feb 2004 22:27:12 -0000 @@ -1,6 +1,6 @@ /* Target-dependent code for GDB, the GNU debugger. - Copyright 2001, 2002, 2003 Free Software Foundation, Inc. + Copyright 2001, 2002, 2003, 2004 Free Software Foundation, Inc. Contributed by D.J. Barrow (djbarrow@de.ibm.com,barrow_dj@yahoo.com) for IBM Deutschland Entwicklung GmbH, IBM Corporation. @@ -31,7 +31,6 @@ #include "target.h" #include "gdbcore.h" #include "gdbcmd.h" -#include "symfile.h" #include "objfiles.h" #include "tm.h" #include "../bfd/bfd.h" Index: sh-tdep.c =================================================================== RCS file: /cvs/src/src/gdb/sh-tdep.c,v retrieving revision 1.158 diff -u -p -r1.158 sh-tdep.c --- sh-tdep.c 11 Feb 2004 15:40:28 -0000 1.158 +++ sh-tdep.c 13 Feb 2004 22:27:15 -0000 @@ -1,6 +1,6 @@ /* Target-dependent code for Renesas Super-H, for GDB. - Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 - Free Software Foundation, Inc. + Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, + 2003, 2004 Free Software Foundation, Inc. This file is part of GDB. @@ -30,7 +30,6 @@ #include "frame-unwind.h" #include "dwarf2-frame.h" #include "symtab.h" -#include "symfile.h" #include "gdbtypes.h" #include "gdbcmd.h" #include "gdbcore.h" Index: sh64-tdep.c =================================================================== RCS file: /cvs/src/src/gdb/sh64-tdep.c,v retrieving revision 1.21 diff -u -p -r1.21 sh64-tdep.c --- sh64-tdep.c 11 Feb 2004 15:40:28 -0000 1.21 +++ sh64-tdep.c 13 Feb 2004 22:27:18 -0000 @@ -28,7 +28,7 @@ #include "defs.h" #include "frame.h" #include "symtab.h" -#include "symfile.h" +#include "objfiles.h" #include "gdbtypes.h" #include "gdbcmd.h" #include "gdbcore.h" Index: solib-irix.c =================================================================== RCS file: /cvs/src/src/gdb/solib-irix.c,v retrieving revision 1.4 diff -u -p -r1.4 solib-irix.c --- solib-irix.c 1 Jun 2003 23:00:55 -0000 1.4 +++ solib-irix.c 13 Feb 2004 22:27:18 -0000 @@ -1,5 +1,5 @@ /* Shared library support for IRIX. - Copyright 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 + Copyright 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002, 2004 Free Software Foundation, Inc. This file was created using portions of irix5-nat.c originally @@ -26,6 +26,8 @@ #include "symtab.h" #include "bfd.h" +/* FIXME: ezannoni/2004-02-13 Verify that the include below is + really needed. */ #include "symfile.h" #include "objfiles.h" #include "gdbcore.h" @@ -355,10 +357,10 @@ static int enable_break (void) { if (symfile_objfile != NULL - && target_insert_breakpoint (symfile_objfile->ei.entry_point, + && target_insert_breakpoint (entry_point_address (), shadow_contents) == 0) { - breakpoint_addr = symfile_objfile->ei.entry_point; + breakpoint_addr = entry_point_address (); return 1; } Index: symfile.c =================================================================== RCS file: /cvs/src/src/gdb/symfile.c,v retrieving revision 1.121 diff -u -p -r1.121 symfile.c --- symfile.c 9 Feb 2004 23:50:55 -0000 1.121 +++ symfile.c 13 Feb 2004 22:27:22 -0000 @@ -294,41 +294,6 @@ psymtab_to_symtab (struct partial_symtab return pst->symtab; } -/* Initialize entry point information for this objfile. */ - -void -init_entry_point_info (struct objfile *objfile) -{ - /* Save startup file's range of PC addresses to help blockframe.c - decide where the bottom of the stack is. */ - - if (bfd_get_file_flags (objfile->obfd) & EXEC_P) - { - /* Executable file -- record its entry point so we'll recognize - the startup file because it contains the entry point. */ - objfile->ei.entry_point = bfd_get_start_address (objfile->obfd); - } - else - { - /* Examination of non-executable.o files. Short-circuit this stuff. */ - objfile->ei.entry_point = INVALID_ENTRY_POINT; - } - objfile->ei.deprecated_entry_file_lowpc = INVALID_ENTRY_LOWPC; - objfile->ei.deprecated_entry_file_highpc = INVALID_ENTRY_HIGHPC; - objfile->ei.entry_func_lowpc = INVALID_ENTRY_LOWPC; - objfile->ei.entry_func_highpc = INVALID_ENTRY_HIGHPC; - objfile->ei.main_func_lowpc = INVALID_ENTRY_LOWPC; - objfile->ei.main_func_highpc = INVALID_ENTRY_HIGHPC; -} - -/* Get current entry point address. */ - -CORE_ADDR -entry_point_address (void) -{ - return symfile_objfile ? symfile_objfile->ei.entry_point : 0; -} - /* Remember the lowest-addressed loadable section we've seen. This function is called via bfd_map_over_sections. Index: symfile.h =================================================================== RCS file: /cvs/src/src/gdb/symfile.h,v retrieving revision 1.26 diff -u -p -r1.26 symfile.h --- symfile.h 7 Feb 2004 23:13:47 -0000 1.26 +++ symfile.h 13 Feb 2004 22:27:22 -0000 @@ -180,8 +180,6 @@ extern void fill_in_vptr_fieldno (struct extern void add_symtab_fns (struct sym_fns *); -extern void init_entry_point_info (struct objfile *); - extern void syms_from_objfile (struct objfile *, struct section_addr_info *, struct section_offsets *, int, int, int); @@ -253,8 +251,6 @@ extern int auto_solib_add; extern int auto_solib_limit; /* From symfile.c */ - -extern CORE_ADDR entry_point_address (void); extern struct partial_symtab *allocate_psymtab (char *, struct objfile *); Index: v850-tdep.c =================================================================== RCS file: /cvs/src/src/gdb/v850-tdep.c,v retrieving revision 1.81 diff -u -p -r1.81 v850-tdep.c --- v850-tdep.c 11 Feb 2004 15:40:28 -0000 1.81 +++ v850-tdep.c 13 Feb 2004 22:27:24 -0000 @@ -28,7 +28,7 @@ #include "bfd.h" #include "gdb_string.h" #include "gdbcore.h" -#include "symfile.h" +#include "objfiles.h" #include "arch-utils.h" #include "regcache.h" #include "symtab.h" Index: xcoffread.c =================================================================== RCS file: /cvs/src/src/gdb/xcoffread.c,v retrieving revision 1.39 diff -u -p -r1.39 xcoffread.c --- xcoffread.c 7 Feb 2004 23:13:47 -0000 1.39 +++ xcoffread.c 13 Feb 2004 22:27:27 -0000 @@ -44,6 +44,7 @@ #include "symtab.h" #include "gdbtypes.h" +/* FIXME: ezannoni/2004-02-13 Verify if the include below is really needed. */ #include "symfile.h" #include "objfiles.h" #include "buildsym.h" Index: xstormy16-tdep.c =================================================================== RCS file: /cvs/src/src/gdb/xstormy16-tdep.c,v retrieving revision 1.72 diff -u -p -r1.72 xstormy16-tdep.c --- xstormy16-tdep.c 11 Feb 2004 15:40:28 -0000 1.72 +++ xstormy16-tdep.c 13 Feb 2004 22:27:28 -0000 @@ -22,7 +22,6 @@ #include "defs.h" #include "value.h" #include "inferior.h" -#include "symfile.h" #include "arch-utils.h" #include "regcache.h" #include "gdbcore.h"