diff options
| -rw-r--r-- | gdb/ChangeLog | 16 | ||||
| -rw-r--r-- | gdb/blockframe.c | 4 | ||||
| -rw-r--r-- | gdb/dwarf2read.c | 7 | ||||
| -rw-r--r-- | gdb/dwarfread.c | 6 | ||||
| -rw-r--r-- | gdb/objfiles.c | 8 | ||||
| -rw-r--r-- | gdb/objfiles.h | 6 |
6 files changed, 17 insertions, 30 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 51e746b1277..8997876efa5 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,19 @@ +2004-06-24 Andrew Cagney <cagney@gnu.org> + + * objfiles.h (struct entry_info): Delete entry_func_lowpc and + entry_func_highpc fields. + * objfiles.c (init_entry_point_info): Do not clear + entry_func_lowpc and entry_func_highpc. + (objfile_relocate): Do not relocate entry_func_lowpc and + entry_func_highpc. + * dwarfread.c (read_func_scope): Do not set entry_func_lowpc and + entry_func_highpc. + * dwarf2read.c (read_func_scope): Do not set entry_func_lowpc and + entry_func_highpc. + * blockframe.c (legacy_frame_chain_valid): Replace tests against + entry_func_lowpc and entry_func_highpc with call to + inside_entry_func. + 2004-06-24 Mark Kettenis <kettenis@gnu.org> * sparc64-tdep.c (sparc64_store_arguments): Fix passing diff --git a/gdb/blockframe.c b/gdb/blockframe.c index a9f0b60f447..eb032258939 100644 --- a/gdb/blockframe.c +++ b/gdb/blockframe.c @@ -524,9 +524,7 @@ legacy_frame_chain_valid (CORE_ADDR fp, struct frame_info *fi) /* If we're already inside the entry function for the main objfile, then it isn't valid. */ - if (symfile_objfile != NULL - && (symfile_objfile->ei.entry_func_lowpc <= get_frame_pc (fi) - && symfile_objfile->ei.entry_func_highpc > get_frame_pc (fi))) + if (inside_entry_func (fi)) return 0; return 1; diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c index b07d07c9baa..c1f6c654f33 100644 --- a/gdb/dwarf2read.c +++ b/gdb/dwarf2read.c @@ -2504,13 +2504,6 @@ read_func_scope (struct die_info *die, struct dwarf2_cu *cu) /* Record the function range for dwarf_decode_lines. */ add_to_cu_func_list (name, lowpc, highpc, cu); - if (objfile->ei.entry_point >= lowpc && - objfile->ei.entry_point < highpc) - { - objfile->ei.entry_func_lowpc = lowpc; - objfile->ei.entry_func_highpc = highpc; - } - new = push_context (0, lowpc); new->name = new_symbol (die, die->type, cu); diff --git a/gdb/dwarfread.c b/gdb/dwarfread.c index b9fe7d71c4b..cb31543ae0b 100644 --- a/gdb/dwarfread.c +++ b/gdb/dwarfread.c @@ -1792,12 +1792,6 @@ read_func_scope (struct dieinfo *dip, char *thisdie, char *enddie, return; } - if (objfile->ei.entry_point >= dip->at_low_pc && - objfile->ei.entry_point < dip->at_high_pc) - { - objfile->ei.entry_func_lowpc = dip->at_low_pc; - objfile->ei.entry_func_highpc = dip->at_high_pc; - } new = push_context (0, dip->at_low_pc); new->name = new_symbol (dip, objfile); list_in_scope = &local_symbols; diff --git a/gdb/objfiles.c b/gdb/objfiles.c index a40721e6c17..48d695456df 100644 --- a/gdb/objfiles.c +++ b/gdb/objfiles.c @@ -250,8 +250,6 @@ init_entry_point_info (struct objfile *objfile) /* Examination of non-executable.o files. Short-circuit this stuff. */ objfile->ei.entry_point = INVALID_ENTRY_POINT; } - 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; } @@ -649,12 +647,6 @@ objfile_relocate (struct objfile *objfile, struct section_offsets *new_offsets) } } - if (objfile->ei.entry_func_lowpc != INVALID_ENTRY_LOWPC) - { - objfile->ei.entry_func_lowpc += ANOFFSET (delta, SECT_OFF_TEXT (objfile)); - objfile->ei.entry_func_highpc += ANOFFSET (delta, SECT_OFF_TEXT (objfile)); - } - if (objfile->ei.main_func_lowpc != INVALID_ENTRY_LOWPC) { objfile->ei.main_func_lowpc += ANOFFSET (delta, SECT_OFF_TEXT (objfile)); diff --git a/gdb/objfiles.h b/gdb/objfiles.h index c2a6a01a1ba..29be9729583 100644 --- a/gdb/objfiles.h +++ b/gdb/objfiles.h @@ -110,12 +110,6 @@ struct entry_info #define INVALID_ENTRY_POINT (~0) /* ~0 will not be in any file, we hope. */ - /* Start (inclusive) and end (exclusive) of function containing the - entry point. */ - - CORE_ADDR entry_func_lowpc; - CORE_ADDR entry_func_highpc; - /* Start (inclusive) and end (exclusive) of the user code main() function. */ CORE_ADDR main_func_lowpc; |