From e3acb1155ba584a440ac0914d97e2884c9189324 Mon Sep 17 00:00:00 2001 From: Joel Brobecker Date: Tue, 18 Jan 2011 16:18:26 +0000 Subject: [PATCH] [powerpc] breakpoint inserted past function end On powerpc, the prologue scanner reads instruction after instruction, and just skips instructions that do not affect a frame. This means that it does not stop if if finds and unexpected instruction (which could possibly happen with optimization, I presume). To avoid scanning too many instructions, it tries to establish an upper limit. The upper limit is first computed using the debugging (line) info, but if that fails, it falls back on an arbitrary 100 bytes (or 25 instructions). The problem is that, if the function is shorter than those 25 instructions, we run the risk of skipping the entire function and returning a PC that's outside our function. In the event where we can find a symbol for a given PC (and therefore can determine function start and end addresses), but cannot find an upper limit using skip_prologue_using_sal, then we can at least limit make sure that the 25 instructions do not put us beyour our function. If it does, then further reduce the upper-limit to the end of the function. gdb/ChangeLog: * rs6000-tdep.c (rs6000_skip_prologue): Make sure that the prologue upper limit address is not greater than the function end address when the upper limit could not be computed using the debugging info. --- gdb/ChangeLog | 7 +++++++ gdb/rs6000-tdep.c | 9 +++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 136bb1d8ee..10ab67329f 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2011-01-18 Joel Brobecker + + * rs6000-tdep.c (rs6000_skip_prologue): Make sure that the prologue + upper limit address is not greater than the function end address + when the upper limit could not be computed using the debugging + info. + 2011-01-17 Tom Tromey * cli/cli-cmds.c (apropos_command): Free the compiled regex. Use diff --git a/gdb/rs6000-tdep.c b/gdb/rs6000-tdep.c index c16e933418..9832b5bb3f 100644 --- a/gdb/rs6000-tdep.c +++ b/gdb/rs6000-tdep.c @@ -2090,12 +2090,12 @@ static CORE_ADDR rs6000_skip_prologue (struct gdbarch *gdbarch, CORE_ADDR pc) { struct rs6000_framedata frame; - CORE_ADDR limit_pc, func_addr; + CORE_ADDR limit_pc, func_addr, func_end_addr = 0; /* See if we can determine the end of the prologue via the symbol table. If so, then return either PC, or the PC after the prologue, whichever is greater. */ - if (find_pc_partial_function (pc, NULL, &func_addr, NULL)) + if (find_pc_partial_function (pc, NULL, &func_addr, &func_end_addr)) { CORE_ADDR post_prologue_pc = skip_prologue_using_sal (gdbarch, func_addr); @@ -2113,6 +2113,11 @@ rs6000_skip_prologue (struct gdbarch *gdbarch, CORE_ADDR pc) if (limit_pc == 0) limit_pc = pc + 100; /* Magic. */ + /* Do not allow limit_pc to be past the function end, if we know + where that end is... */ + if (func_end_addr && limit_pc > func_end_addr) + limit_pc = func_end_addr; + pc = skip_prologue (gdbarch, pc, limit_pc, &frame); return pc; }