OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* infrun.c (handle_inferior_event): Rename 'tmp' to real_stop_pc. 

Remove duplicate/shadowing variable of same name.
This commit is contained in:
Adam Fedor 2003-01-31 15:22:57 +00:00
parent 71469e2fea
commit d764a8245b
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gdb/ChangeLog
View File

@ -1,3 +1,8 @@
2003-01-31 Adam Fedor <fedor@gnu.org>
* infrun.c (handle_inferior_event): Rename 'tmp' to real_stop_pc.
Remove duplicate/shadowing variable of same name.
2003-01-30 Jim Blandy <jimb@redhat.com>
* symfile.c (find_separate_debug_file): Assert that the objfile's

22
gdb/infrun.c
View File

@ -1172,7 +1172,7 @@ context_switch (struct execution_control_state *ecs)
void
handle_inferior_event (struct execution_control_state *ecs)
{
CORE_ADDR tmp;
CORE_ADDR real_stop_pc;
int stepped_after_stopped_by_watchpoint;
int sw_single_step_trap_p = 0;
@ -2407,19 +2407,19 @@ process_event_stop_test:
function. That's what tells us (a) whether we want to step
into it at all, and (b) what prologue we want to run to
the end of, if we do step into it. */
tmp = SKIP_TRAMPOLINE_CODE (stop_pc);
if (tmp != 0)
ecs->stop_func_start = tmp;
real_stop_pc = SKIP_TRAMPOLINE_CODE (stop_pc);
if (real_stop_pc != 0)
ecs->stop_func_start = real_stop_pc;
else
{
tmp = DYNAMIC_TRAMPOLINE_NEXTPC (stop_pc);
if (tmp)
real_stop_pc = DYNAMIC_TRAMPOLINE_NEXTPC (stop_pc);
if (real_stop_pc)
{
struct symtab_and_line xxx;
/* Why isn't this s_a_l called "sr_sal", like all of the
other s_a_l's where this code is duplicated? */
init_sal (&xxx); /* initialize to zeroes */
xxx.pc = tmp;
xxx.pc = real_stop_pc;
xxx.section = find_pc_overlay (xxx.pc);
check_for_old_step_resume_breakpoint ();
step_resume_breakpoint =
@ -2482,19 +2482,17 @@ process_event_stop_test:
we want to proceed through the trampoline when stepping. */
if (IN_SOLIB_RETURN_TRAMPOLINE (stop_pc, ecs->stop_func_name))
{
CORE_ADDR tmp;
/* Determine where this trampoline returns. */
tmp = SKIP_TRAMPOLINE_CODE (stop_pc);
real_stop_pc = SKIP_TRAMPOLINE_CODE (stop_pc);
/* Only proceed through if we know where it's going. */
if (tmp)
if (real_stop_pc)
{
/* And put the step-breakpoint there and go until there. */
struct symtab_and_line sr_sal;
init_sal (&sr_sal); /* initialize to zeroes */
sr_sal.pc = tmp;
sr_sal.pc = real_stop_pc;
sr_sal.section = find_pc_overlay (sr_sal.pc);
/* Do not specify what the fp should be when we stop
since on some machines the prologue