From 34fcf120a59c728d58100891b00c81de26baa747 Mon Sep 17 00:00:00 2001 From: Daniel Jacobowitz Date: Mon, 22 Mar 2004 21:39:00 +0000 Subject: [PATCH] * mips-tdep.c (non_heuristic_proc_desc): Search using the specified PC rather than the partial function start address. Use the start address to sanity check the found PDR. --- gdb/ChangeLog | 6 ++++++ gdb/mips-tdep.c | 46 +++++++++++++++++++++++++++++++++++++++------- 2 files changed, 45 insertions(+), 7 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 57c7a923c2..3121b17d8f 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2004-03-22 Daniel Jacobowitz + + * mips-tdep.c (non_heuristic_proc_desc): Search using the specified + PC rather than the partial function start address. Use the start + address to sanity check the found PDR. + 2004-03-22 Daniel Jacobowitz * lin-lwp.c (lin_lwp_wait): Pass the LWP ID to diff --git a/gdb/mips-tdep.c b/gdb/mips-tdep.c index 9638b0862f..0543d6565e 100644 --- a/gdb/mips-tdep.c +++ b/gdb/mips-tdep.c @@ -2352,38 +2352,70 @@ non_heuristic_proc_desc (CORE_ADDR pc, CORE_ADDR *addrptr) { int low, mid, high; char *ptr; + CORE_ADDR pdr_pc; low = 0; high = priv->size / 32; + /* We've found a .pdr section describing this objfile. We want to + find the entry which describes this code address. The .pdr + information is not very descriptive; we have only a function + start address. We have to look for the closest entry, because + the local symbol at the beginning of this function may have + been stripped - so if we ask the symbol table for the start + address we may get a preceding global function. */ + + /* First, find the last .pdr entry starting at or before PC. */ do { - CORE_ADDR pdr_pc; - mid = (low + high) / 2; ptr = priv->contents + mid * 32; pdr_pc = bfd_get_signed_32 (sec->objfile->obfd, ptr); pdr_pc += ANOFFSET (sec->objfile->section_offsets, SECT_OFF_TEXT (sec->objfile)); - if (pdr_pc == startaddr) - break; - if (pdr_pc > startaddr) + + if (pdr_pc > pc) high = mid; else low = mid + 1; } while (low != high); - if (low != high) + /* Both low and high point one past the PDR of interest. If + both are zero, that means this PC is before any region + covered by a PDR, i.e. pdr_pc for the first PDR entry is + greater than PC. */ + if (low > 0) + { + ptr = priv->contents + (low - 1) * 32; + pdr_pc = bfd_get_signed_32 (sec->objfile->obfd, ptr); + pdr_pc += ANOFFSET (sec->objfile->section_offsets, + SECT_OFF_TEXT (sec->objfile)); + } + + /* We don't have a range, so we have no way to know for sure + whether we're in the correct PDR or a PDR for a preceding + function and the current function was a stripped local + symbol. But if the PDR's PC is at least as great as the + best guess from the symbol table, assume that it does cover + the right area; if a .pdr section is present at all then + nearly every function will have an entry. The biggest exception + will be the dynamic linker stubs; conveniently these are + placed before .text instead of after. */ + + if (pc >= pdr_pc && pdr_pc >= startaddr) { struct symbol *sym = find_pc_function (pc); + if (addrptr) + *addrptr = pdr_pc; + /* Fill in what we need of the proc_desc. */ proc_desc = (mips_extra_func_info_t) obstack_alloc (&sec->objfile->objfile_obstack, sizeof (struct mips_extra_func_info)); - PROC_LOW_ADDR (proc_desc) = startaddr; + PROC_LOW_ADDR (proc_desc) = pdr_pc; /* Only used for dummy frames. */ PROC_HIGH_ADDR (proc_desc) = 0; -- 2.34.1