diff options
Diffstat (limited to 'gdb/blockframe.c')
| -rw-r--r-- | gdb/blockframe.c | 39 |
1 files changed, 21 insertions, 18 deletions
diff --git a/gdb/blockframe.c b/gdb/blockframe.c index 9788409..37debe0 100644 --- a/gdb/blockframe.c +++ b/gdb/blockframe.c @@ -144,7 +144,7 @@ inside_entry_func (CORE_ADDR pc) int frameless_look_for_prologue (struct frame_info *frame) { - CORE_ADDR func_start, after_prologue; + CORE_ADDR func_start; func_start = get_frame_func (frame); if (func_start) @@ -223,28 +223,31 @@ get_frame_block (struct frame_info *frame, CORE_ADDR *addr_in_block) CORE_ADDR get_pc_function_start (CORE_ADDR pc) { - register struct block *bl; - register struct symbol *symbol; - register struct minimal_symbol *msymbol; - CORE_ADDR fstart; + struct block *bl; + struct minimal_symbol *msymbol; - if ((bl = block_for_pc (pc)) != NULL && - (symbol = block_function (bl)) != NULL) - { - bl = SYMBOL_BLOCK_VALUE (symbol); - fstart = BLOCK_START (bl); - } - else if ((msymbol = lookup_minimal_symbol_by_pc (pc)) != NULL) + bl = block_for_pc (pc); + if (bl) { - fstart = SYMBOL_VALUE_ADDRESS (msymbol); - if (!find_pc_section (fstart)) - return 0; + struct symbol *symbol = block_function (bl); + + if (symbol) + { + bl = SYMBOL_BLOCK_VALUE (symbol); + return BLOCK_START (bl); + } } - else + + msymbol = lookup_minimal_symbol_by_pc (pc); + if (msymbol) { - fstart = 0; + CORE_ADDR fstart = SYMBOL_VALUE_ADDRESS (msymbol); + + if (find_pc_section (fstart)) + return fstart; } - return (fstart); + + return 0; } /* Return the symbol for the function executing in frame FRAME. */ |