* minsyms.h (struct bound_minimal_symbol): New.

(lookup_minimal_symbol_and_objfile): Return bound_minimal_symbol.
	Remove objfile argument.
	(lookup_minimal_symbol_by_pc_section, lookup_minimal_symbol_by_pc):
	Return bound_minimal_symbol.
	* minsyms.c (lookup_minimal_symbol_by_pc_1)
	(lookup_minimal_symbol_by_pc_section, lookup_minimal_symbol_by_pc):
	Return bound_minimal_symbol.
	(in_gnu_ifunc_stub): Update.
	(lookup_minimal_symbol_and_objfile): Return bound_minimal_symbol.
	Remove 'objfile_p' argument.
	(lookup_solib_trampoline_symbol_by_pc): Update.
	* ada-tasks.c, amd64-windows-tdep.c, arm-tdep.c,
	arm-wince-tdep.c, block.c, blockframe.c, breakpoint.c, btrace.c,
	c-valprint.c, dwarf2loc.c, elfread.c, frame.c, frv-tdep.c,
	glibc-tdep.c, gnu-v2-abi.c, gnu-v3-abi.c, hppa-hpux-tdep.c,
	i386-tdep.c, ia64-tdep.c, infcall.c, infcmd.c, jit.c,
	linux-fork.c, m32c-tdep.c, m68hc11-tdep.c, maint.c,
	mips-tdep.c, p-valprint.c, parse.c, ppc-linux-tdep.c,
	ppc-sysv-tdep.c, printcmd.c, rs6000-tdep.c, sh64-tdep.c,
	stack.c, symtab.c, tui/tui-disasm.c: Update.
This commit is contained in:
Tom Tromey 2013-04-08 19:59:09 +00:00
parent f85f34ede8
commit 7cbd4a934e
41 changed files with 344 additions and 258 deletions

View file

@ -1037,23 +1037,25 @@ find_frame_funname (struct frame_info *frame, const char **funname,
changed (and we'll create a find_pc_minimal_function or some
such). */
struct minimal_symbol *msymbol = NULL;
struct bound_minimal_symbol msymbol;
/* Don't attempt to do this for inlined functions, which do not
have a corresponding minimal symbol. */
if (!block_inlined_p (SYMBOL_BLOCK_VALUE (func)))
msymbol
= lookup_minimal_symbol_by_pc (get_frame_address_in_block (frame));
else
memset (&msymbol, 0, sizeof (msymbol));
if (msymbol != NULL
&& (SYMBOL_VALUE_ADDRESS (msymbol)
if (msymbol.minsym != NULL
&& (SYMBOL_VALUE_ADDRESS (msymbol.minsym)
> BLOCK_START (SYMBOL_BLOCK_VALUE (func))))
{
/* We also don't know anything about the function besides
its address and name. */
func = 0;
*funname = SYMBOL_PRINT_NAME (msymbol);
*funlang = SYMBOL_LANGUAGE (msymbol);
*funname = SYMBOL_PRINT_NAME (msymbol.minsym);
*funlang = SYMBOL_LANGUAGE (msymbol.minsym);
}
else
{
@ -1080,17 +1082,17 @@ find_frame_funname (struct frame_info *frame, const char **funname,
}
else
{
struct minimal_symbol *msymbol;
struct bound_minimal_symbol msymbol;
CORE_ADDR pc;
if (!get_frame_address_in_block_if_available (frame, &pc))
return;
msymbol = lookup_minimal_symbol_by_pc (pc);
if (msymbol != NULL)
if (msymbol.minsym != NULL)
{
*funname = SYMBOL_PRINT_NAME (msymbol);
*funlang = SYMBOL_LANGUAGE (msymbol);
*funname = SYMBOL_PRINT_NAME (msymbol.minsym);
*funlang = SYMBOL_LANGUAGE (msymbol.minsym);
}
}
}
@ -1424,13 +1426,13 @@ frame_info (char *addr_exp, int from_tty)
}
else if (frame_pc_p)
{
struct minimal_symbol *msymbol;
struct bound_minimal_symbol msymbol;
msymbol = lookup_minimal_symbol_by_pc (frame_pc);
if (msymbol != NULL)
if (msymbol.minsym != NULL)
{
funname = SYMBOL_PRINT_NAME (msymbol);
funlang = SYMBOL_LANGUAGE (msymbol);
funname = SYMBOL_PRINT_NAME (msymbol.minsym);
funlang = SYMBOL_LANGUAGE (msymbol.minsym);
}
}
calling_frame_info = get_prev_frame (fi);