mirror/binutils-gdb
2
0
Fork 0
mirror of https://sourceware.org/git/binutils-gdb.git synced 2025-03-13 13:49:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

dwarf2.c: simplify best_fit_len tests

Browse Source 
* dwarf2.c (lookup_address_in_function_table): Simplify
	best_fit_len test.
	(info_hash_lookup_funcinfo): Likewise.
	(lookup_symbol_in_function_table): Likewise, also reorder tests
	and check "file" is set.
	(lookup_symbol_in_variable_table): Reorder tests.
This commit is contained in:
Alan Modra 2022-09-21 14:47:31 +09:30
parent 4609af80c2
commit 6c5e237146
1 changed files with 22 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
bfd/dwarf2.c
View File

@ -3288,7 +3288,7 @@ lookup_address_in_function_table (struct comp_unit *unit,
struct lookup_funcinfo* lookup_funcinfo = NULL;
struct funcinfo* funcinfo = NULL;
struct funcinfo* best_fit = NULL;
bfd_vma best_fit_len = 0;
bfd_vma best_fit_len = (bfd_vma) -1;
bfd_size_type low, high, mid, first;
struct arange *arange;
@ -3334,8 +3334,7 @@ lookup_address_in_function_table (struct comp_unit *unit,
if (addr < arange->low || addr >= arange->high)
continue;
if (!best_fit
|| arange->high - arange->low < best_fit_len
if (arange->high - arange->low < best_fit_len
/* The following comparison is designed to return the same
match as the previous algorithm for routines which have the
same best fit length. */
@ -3367,32 +3366,24 @@ lookup_symbol_in_function_table (struct comp_unit *unit,
const char **filename_ptr,
unsigned int *linenumber_ptr)
{
struct funcinfo* each_func;
struct funcinfo* each;
struct funcinfo* best_fit = NULL;
bfd_vma best_fit_len = 0;
bfd_vma best_fit_len = (bfd_vma) -1;
struct arange *arange;
const char *name = bfd_asymbol_name (sym);
for (each_func = unit->function_table;
each_func;
each_func = each_func->prev_func)
{
for (arange = &each_func->arange;
arange;
arange = arange->next)
for (each = unit->function_table; each; each = each->prev_func)
for (arange = &each->arange; arange; arange = arange->next)
if (addr >= arange->low
&& addr < arange->high
&& arange->high - arange->low < best_fit_len
&& each->file
&& each->name
&& strcmp (name, each->name) == 0)
{
if (addr >= arange->low
&& addr < arange->high
&& each_func->name
&& strcmp (name, each_func->name) == 0
&& (!best_fit
|| arange->high - arange->low < best_fit_len))
{
best_fit = each_func;
best_fit_len = arange->high - arange->low;
}
best_fit = each;
best_fit_len = arange->high - arange->low;
}
}
if (best_fit)
{
@ -3400,8 +3391,8 @@ lookup_symbol_in_function_table (struct comp_unit *unit,
*linenumber_ptr = best_fit->line;
return true;
}
else
return false;
return false;
}
/* Variable table functions. */
@ -3416,14 +3407,14 @@ lookup_symbol_in_variable_table (struct comp_unit *unit,
const char **filename_ptr,
unsigned int *linenumber_ptr)
{
const char *name = bfd_asymbol_name (sym);
struct varinfo* each;
const char *name = bfd_asymbol_name (sym);
for (each = unit->variable_table; each; each = each->prev_var)
if (! each->stack
if (each->addr == addr
&& !each->stack
&& each->file != NULL
&& each->name != NULL
&& each->addr == addr
&& strcmp (name, each->name) == 0)
break;
@ -5087,7 +5078,7 @@ info_hash_lookup_funcinfo (struct info_hash_table *hash_table,
{
struct funcinfo* each_func;
struct funcinfo* best_fit = NULL;
bfd_vma best_fit_len = 0;
bfd_vma best_fit_len = (bfd_vma) -1;
struct info_list_node *node;
struct arange *arange;
const char *name = bfd_asymbol_name (sym);
@ -5103,8 +5094,7 @@ info_hash_lookup_funcinfo (struct info_hash_table *hash_table,
{
if (addr >= arange->low
&& addr < arange->high
&& (!best_fit
|| arange->high - arange->low < best_fit_len))
&& arange->high - arange->low < best_fit_len)
{
best_fit = each_func;
best_fit_len = arange->high - arange->low;
@ -5135,9 +5125,9 @@ info_hash_lookup_varinfo (struct info_hash_table *hash_table,
const char **filename_ptr,
unsigned int *linenumber_ptr)
{
const char *name = bfd_asymbol_name (sym);
struct varinfo* each;
struct info_list_node *node;
const char *name = bfd_asymbol_name (sym);
for (node = lookup_info_hash_table (hash_table, name);
node;