OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert previous change. It doesn't work because it neglects to 

consider there may be a file compiled without -g screwing things up
(e.g. we are looking for the minimal symbol for "main" and we get the
one for "start" instead).

This is the change I mean:
	* minsyms.c, symtab.h (lookup_next_minimal_symbol): New function.
	* dbxread.c (process_one_symbol): Use it.
This commit is contained in:
Jim Kingdon 1993-09-08 17:26:31 +00:00
parent 9f1e14f4c9
commit 3c7d306488
2 changed files with 5 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gdb/dbxread.c
View File

@ -1933,17 +1933,12 @@ process_one_symbol (type, desc, valu, name, section_offsets, objfile)
if (m && STREQN (SYMBOL_NAME (m), name, l))
/* last_pc_address was in this function */
valu = SYMBOL_VALUE (m);
else if (m && STREQN (SYMBOL_NAME (m+1), name, l))
/* last_pc_address was in last function */
valu = SYMBOL_VALUE (m+1);
else
{
m = lookup_next_minimal_symbol (last_pc_address);
if (m && STREQN (SYMBOL_NAME (m), name, l))
/* last_pc_address was in last function */
valu = SYMBOL_VALUE (m);
else
/* Not found.
Use last_pc_address (for finish_block). */
valu = last_pc_address;
}
/* Not found - use last_pc_address (for finish_block) */
valu = last_pc_address;
}
last_pc_address = valu; /* Save for SunOS bug circumcision */

83
gdb/minsyms.c
View File

@ -265,89 +265,6 @@ lookup_minimal_symbol_by_pc (pc)
return (best_symbol);
}
/* Just like lookup_minimal_symbol_by_pc, but look up the closest minimal
symbol > PC, not the one <= PC. */
struct minimal_symbol *
lookup_next_minimal_symbol (pc)
CORE_ADDR pc;
{
register int lo;
register int hi;
register int new;
register struct objfile *objfile;
register struct minimal_symbol *msymbol;
register struct minimal_symbol *best_symbol = NULL;
for (objfile = object_files;
objfile != NULL;
objfile = objfile -> next)
{
/* If this objfile has a minimal symbol table, go search it using
a binary search. Note that a minimal symbol table always consists
of at least two symbols, a "real" symbol and the terminating
"null symbol". If there are no real symbols, then there is no
minimal symbol table at all. */
if ((msymbol = objfile -> msymbols) != NULL)
{
lo = 0;
hi = objfile -> minimal_symbol_count - 1;
/* This code assumes that the minimal symbols are sorted by
ascending address values. If the pc value is greater than or
equal to the first symbol's address, then some symbol in this
minimal symbol table is a suitable candidate for being the
"best" symbol. This includes the last real symbol, for cases
where the pc value is larger than any address in this vector.
By iterating until the address associated with the current
hi index (the endpoint of the test interval) is less than
or equal to the desired pc value, we accomplish two things:
(1) the case where the pc value is larger than any minimal
symbol address is trivially solved, (2) the address associated
with the hi index is always the one we want when the interation
terminates. In essence, we are iterating the test interval
down until the pc value is pushed out of it from the high end.
Warning: this code is trickier than it would appear at first. */
/* Intentionally does not check that pc <= start of objfile.
dbxread.c:process_one_symbol wants to call this with zero and
get the first minimal symbol. */
if (pc < SYMBOL_VALUE_ADDRESS (&msymbol[hi]))
{
while (SYMBOL_VALUE_ADDRESS (&msymbol[lo]) <= pc)
{
/* pc is still strictly less than highest address */
/* Note "new" will always be >= lo */
new = (lo + hi) / 2;
if ((SYMBOL_VALUE_ADDRESS (&msymbol[new]) < pc) ||
(lo == new))
{
hi = new;
}
else
{
lo = new;
}
}
/* The minimal symbol indexed by hi now is the best one in this
objfile's minimal symbol table. See if it is the best one
overall. */
if ((best_symbol == NULL) ||
(SYMBOL_VALUE_ADDRESS (best_symbol) >
SYMBOL_VALUE_ADDRESS (&msymbol[lo])))
{
best_symbol = &msymbol[lo];
}
}
}
}
return (best_symbol);
}
/* Prepare to start collecting minimal symbols. Note that presetting
msym_bunch_index to BUNCH_SIZE causes the first call to save a minimal
symbol to allocate the memory for the first bunch. */