diff options
| author | Tom Tromey <tromey@redhat.com> | 2013-04-08 19:59:09 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@redhat.com> | 2013-04-08 19:59:09 +0000 |
| commit | 7cbd4a934e9cf3808e1199c62e65b4c25b24b4e5 (patch) | |
| tree | f43a0ccccead27184646d90998d0054410abd6e3 /gdb/i386-tdep.c | |
| parent | f85f34ede85d0c306e689736c6694caa2f0a0f78 (diff) | |
| download | gdb-7cbd4a934e9cf3808e1199c62e65b4c25b24b4e5.zip gdb-7cbd4a934e9cf3808e1199c62e65b4c25b24b4e5.tar.gz gdb-7cbd4a934e9cf3808e1199c62e65b4c25b24b4e5.tar.bz2 | |
* 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.
Diffstat (limited to 'gdb/i386-tdep.c')
| -rw-r--r-- | gdb/i386-tdep.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gdb/i386-tdep.c b/gdb/i386-tdep.c index e76dcbe..930d6fc 100644 --- a/gdb/i386-tdep.c +++ b/gdb/i386-tdep.c @@ -1687,15 +1687,15 @@ i386_skip_main_prologue (struct gdbarch *gdbarch, CORE_ADDR pc) { /* Make sure address is computed correctly as a 32bit integer even if CORE_ADDR is 64 bit wide. */ - struct minimal_symbol *s; + struct bound_minimal_symbol s; CORE_ADDR call_dest; call_dest = pc + 5 + extract_signed_integer (buf, 4, byte_order); call_dest = call_dest & 0xffffffffU; s = lookup_minimal_symbol_by_pc (call_dest); - if (s != NULL - && SYMBOL_LINKAGE_NAME (s) != NULL - && strcmp (SYMBOL_LINKAGE_NAME (s), "__main") == 0) + if (s.minsym != NULL + && SYMBOL_LINKAGE_NAME (s.minsym) != NULL + && strcmp (SYMBOL_LINKAGE_NAME (s.minsym), "__main") == 0) pc += 5; } } @@ -3352,7 +3352,7 @@ i386_pe_skip_trampoline_code (struct frame_info *frame, unsigned long indirect = read_memory_unsigned_integer (pc + 2, 4, byte_order); struct minimal_symbol *indsym = - indirect ? lookup_minimal_symbol_by_pc (indirect) : 0; + indirect ? lookup_minimal_symbol_by_pc (indirect).minsym : 0; const char *symname = indsym ? SYMBOL_LINKAGE_NAME (indsym) : 0; if (symname) |