Oops, revert unintended commit. Next patch will do this properly.

This commit is contained in:
Andrew Cagney
2003-07-11 14:56:05 +00:00
parent 8edd5d0153
commit 91f78506d2
2 changed files with 6 additions and 6 deletions

View File

@ -212,7 +212,7 @@ frame_address_in_block (struct frame_info *frame)
struct block * struct block *
get_frame_block (struct frame_info *frame, CORE_ADDR *addr_in_block) get_frame_block (struct frame_info *frame, CORE_ADDR *addr_in_block)
{ {
const CORE_ADDR pc = get_frame_address_in_block (frame); const CORE_ADDR pc = frame_address_in_block (frame);
if (addr_in_block) if (addr_in_block)
*addr_in_block = pc; *addr_in_block = pc;
@ -512,7 +512,7 @@ block_innermost_frame (struct block *block)
frame = get_prev_frame (frame); frame = get_prev_frame (frame);
if (frame == NULL) if (frame == NULL)
return NULL; return NULL;
calling_pc = get_frame_address_in_block (frame); calling_pc = frame_address_in_block (frame);
if (calling_pc >= start && calling_pc < end) if (calling_pc >= start && calling_pc < end)
return frame; return frame;
} }

View File

@ -547,7 +547,7 @@ print_frame (struct frame_info *fi,
stb = ui_out_stream_new (uiout); stb = ui_out_stream_new (uiout);
old_chain = make_cleanup_ui_out_stream_delete (stb); old_chain = make_cleanup_ui_out_stream_delete (stb);
func = find_pc_function (get_frame_address_in_block (fi)); func = find_pc_function (frame_address_in_block (fi));
if (func) if (func)
{ {
/* In certain pathological cases, the symtabs give the wrong /* In certain pathological cases, the symtabs give the wrong
@ -566,7 +566,7 @@ print_frame (struct frame_info *fi,
ever changed many parts of GDB will need to be changed (and we'll ever changed many parts of GDB will need to be changed (and we'll
create a find_pc_minimal_function or some such). */ create a find_pc_minimal_function or some such). */
struct minimal_symbol *msymbol = lookup_minimal_symbol_by_pc (get_frame_address_in_block (fi)); struct minimal_symbol *msymbol = lookup_minimal_symbol_by_pc (frame_address_in_block (fi));
if (msymbol != NULL if (msymbol != NULL
&& (SYMBOL_VALUE_ADDRESS (msymbol) && (SYMBOL_VALUE_ADDRESS (msymbol)
> BLOCK_START (SYMBOL_BLOCK_VALUE (func)))) > BLOCK_START (SYMBOL_BLOCK_VALUE (func))))
@ -614,7 +614,7 @@ print_frame (struct frame_info *fi,
} }
else else
{ {
struct minimal_symbol *msymbol = lookup_minimal_symbol_by_pc (get_frame_address_in_block (fi)); struct minimal_symbol *msymbol = lookup_minimal_symbol_by_pc (frame_address_in_block (fi));
if (msymbol != NULL) if (msymbol != NULL)
{ {
funname = DEPRECATED_SYMBOL_NAME (msymbol); funname = DEPRECATED_SYMBOL_NAME (msymbol);
@ -1206,7 +1206,7 @@ backtrace_command_1 (char *count_exp, int show_locals, int from_tty)
fi = get_prev_frame (fi)) fi = get_prev_frame (fi))
{ {
QUIT; QUIT;
ps = find_pc_psymtab (get_frame_address_in_block (fi)); ps = find_pc_psymtab (frame_address_in_block (fi));
if (ps) if (ps)
PSYMTAB_TO_SYMTAB (ps); /* Force syms to come in */ PSYMTAB_TO_SYMTAB (ps); /* Force syms to come in */
} }