* 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:
parent
f85f34ede8
commit
7cbd4a934e
41 changed files with 344 additions and 258 deletions
|
@ -2457,14 +2457,15 @@ m32c_m16c_address_to_pointer (struct gdbarch *gdbarch,
|
|||
struct minimal_symbol *tramp_msym;
|
||||
|
||||
/* Try to find a linker symbol at this address. */
|
||||
struct minimal_symbol *func_msym = lookup_minimal_symbol_by_pc (addr);
|
||||
struct bound_minimal_symbol func_msym
|
||||
= lookup_minimal_symbol_by_pc (addr);
|
||||
|
||||
if (! func_msym)
|
||||
if (! func_msym.minsym)
|
||||
error (_("Cannot convert code address %s to function pointer:\n"
|
||||
"couldn't find a symbol at that address, to find trampoline."),
|
||||
paddress (gdbarch, addr));
|
||||
|
||||
func_name = SYMBOL_LINKAGE_NAME (func_msym);
|
||||
func_name = SYMBOL_LINKAGE_NAME (func_msym.minsym);
|
||||
tramp_name = xmalloc (strlen (func_name) + 5);
|
||||
strcpy (tramp_name, func_name);
|
||||
strcat (tramp_name, ".plt");
|
||||
|
@ -2535,11 +2536,11 @@ m32c_m16c_pointer_to_address (struct gdbarch *gdbarch,
|
|||
{
|
||||
/* See if there is a minimal symbol at that address whose name is
|
||||
"NAME.plt". */
|
||||
struct minimal_symbol *ptr_msym = lookup_minimal_symbol_by_pc (ptr);
|
||||
struct bound_minimal_symbol ptr_msym = lookup_minimal_symbol_by_pc (ptr);
|
||||
|
||||
if (ptr_msym)
|
||||
if (ptr_msym.minsym)
|
||||
{
|
||||
const char *ptr_msym_name = SYMBOL_LINKAGE_NAME (ptr_msym);
|
||||
const char *ptr_msym_name = SYMBOL_LINKAGE_NAME (ptr_msym.minsym);
|
||||
int len = strlen (ptr_msym_name);
|
||||
|
||||
if (len > 4
|
||||
|
@ -2572,7 +2573,7 @@ m32c_m16c_pointer_to_address (struct gdbarch *gdbarch,
|
|||
{
|
||||
ptr_msym = lookup_minimal_symbol_by_pc ((aspace << 16) | ptr);
|
||||
|
||||
if (ptr_msym)
|
||||
if (ptr_msym.minsym)
|
||||
ptr |= aspace << 16;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue