diff options
| author | Joel Brobecker <brobecker@gnat.com> | 2003-10-10 20:49:40 +0000 |
|---|---|---|
| committer | Joel Brobecker <brobecker@gnat.com> | 2003-10-10 20:49:40 +0000 |
| commit | a91b032d3f40e082beb757cac8536f2741993327 (patch) | |
| tree | 3c923ce8a84e68ad7e14fe9843488f9faabcb3e7 /gdb | |
| parent | 003e4f5805268f1c8752e3d2de25dea7c049c716 (diff) | |
| download | gdb-a91b032d3f40e082beb757cac8536f2741993327.tar.gz | |
* blockframe.c (inside_main_func): No longer use symbol_lookup()
to lookup the main function symbol.
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/blockframe.c | 23 |
2 files changed, 22 insertions, 6 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 852d8dae64b..540368b1bcf 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2003-10-10 J. Brobecker <brobecker@gnat.com> + + * blockframe.c (inside_main_func): No longer use symbol_lookup() + to lookup the main function symbol. + 2003-10-10 Corinna Vinschen <vinschen@redhat.com> * sh-tdep.c (sh_treat_as_flt_p): New function to recognize float diff --git a/gdb/blockframe.c b/gdb/blockframe.c index 4deb3c17020..04be0d10a25 100644 --- a/gdb/blockframe.c +++ b/gdb/blockframe.c @@ -83,22 +83,35 @@ deprecated_inside_entry_file (CORE_ADDR addr) int inside_main_func (CORE_ADDR pc) { + struct minimal_symbol *msymbol; + if (pc == 0) return 1; if (symfile_objfile == 0) return 0; + msymbol = lookup_minimal_symbol (main_name (), NULL, symfile_objfile); + /* If the addr range is not set up at symbol reading time, set it up now. This is for DEPRECATED_FRAME_CHAIN_VALID_ALTERNATE. I do this for coff, because it is unable to set it up and symbol reading time. */ - if (symfile_objfile->ei.main_func_lowpc == INVALID_ENTRY_LOWPC && - symfile_objfile->ei.main_func_highpc == INVALID_ENTRY_HIGHPC) + if (msymbol != NULL + && symfile_objfile->ei.main_func_lowpc == INVALID_ENTRY_LOWPC + && symfile_objfile->ei.main_func_highpc == INVALID_ENTRY_HIGHPC) { - struct symbol *mainsym; + /* brobecker/2003-10-10: We used to rely on lookup_symbol() to search + the symbol associated to the main function. Unfortunately, + lookup_symbol() uses the current-language la_lookup_symbol_nonlocal + function to do the global symbol search. Depending on the language, + this can introduce certain side-effects, because certain languages + such as Ada for instance may find more than one match. So we prefer + to search the main function symbol using its address rather than + its name. */ + struct symbol *mainsym + = find_pc_function (SYMBOL_VALUE_ADDRESS (msymbol)); - mainsym = lookup_symbol (main_name (), NULL, VAR_DOMAIN, NULL, NULL); if (mainsym && SYMBOL_CLASS (mainsym) == LOC_BLOCK) { symfile_objfile->ei.main_func_lowpc = @@ -111,8 +124,6 @@ inside_main_func (CORE_ADDR pc) /* Not in the normal symbol tables, see if "main" is in the partial symbol table. If it's not, then give up. */ { - struct minimal_symbol *msymbol - = lookup_minimal_symbol (main_name (), NULL, symfile_objfile); if (msymbol != NULL && MSYMBOL_TYPE (msymbol) == mst_text) { struct obj_section *osect |