diff options
| -rw-r--r-- | gdb/ChangeLog | 9 | ||||
| -rw-r--r-- | gdb/gdbthread.h | 7 | ||||
| -rw-r--r-- | gdb/infcmd.c | 8 | ||||
| -rw-r--r-- | gdb/inferior.h | 4 | ||||
| -rw-r--r-- | gdb/infrun.c | 4 | ||||
| -rw-r--r-- | gdb/thread.c | 6 |
6 files changed, 15 insertions, 23 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 1d23f50..1e84d8d 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,12 @@ +2004-05-12 Andrew Cagney <cagney@redhat.com> + + * thread.c (load_infrun_state): Delete step_sp. + * infrun.c (context_switch): Ditto. + * inferior.h (step_sp): Ditto. + * infcmd.c (step_sp, step_1, step_once, until_next_command): Ditto. + * gdbthread.h (struct thread_info, save_infrun_state) + (restore_infrun_state): Ditto. + 2004-05-12 Ulrich Weigand <uweigand@de.ibm.com> * MAINTAINERS (write after approval): Add myself. diff --git a/gdb/gdbthread.h b/gdb/gdbthread.h index d93dbef..0f8deeb 100644 --- a/gdb/gdbthread.h +++ b/gdb/gdbthread.h @@ -48,7 +48,6 @@ struct thread_info CORE_ADDR step_range_start; CORE_ADDR step_range_end; struct frame_id step_frame_id; - CORE_ADDR step_sp; int current_line; struct symtab *current_symtab; int trap_expected; @@ -126,8 +125,7 @@ extern void save_infrun_state (ptid_t ptid, bpstat stepping_through_solib_catchpoints, int stepping_through_sigtramp, int current_line, - struct symtab *current_symtab, - CORE_ADDR step_sp); + struct symtab *current_symtab); /* infrun context switch: load the debugger state previously saved for the given thread. */ @@ -144,8 +142,7 @@ extern void load_infrun_state (ptid_t ptid, bpstat *stepping_through_solib_catchpoints, int *stepping_through_sigtramp, int *current_line, - struct symtab **current_symtab, - CORE_ADDR *step_sp); + struct symtab **current_symtab); /* Commands with a prefix of `thread'. */ extern struct cmd_list_element *thread_cmd_list; diff --git a/gdb/infcmd.c b/gdb/infcmd.c index 0b91266..a1a8ac3 100644 --- a/gdb/infcmd.c +++ b/gdb/infcmd.c @@ -186,11 +186,6 @@ CORE_ADDR step_range_end; /* Exclusive */ struct frame_id step_frame_id; -/* Our notion of the current stack pointer. */ -/* NOTE: cagney/2004-05-09: This variable is not used and should be - garbage collected. */ -CORE_ADDR step_sp; - enum step_over_calls_kind step_over_calls; /* If stepping, nonzero means step count is > 1 @@ -625,7 +620,6 @@ step_1 (int skip_subroutines, int single_inst, char *count_string) if (!frame) /* Avoid coredump here. Why tho? */ error ("No current frame"); step_frame_id = get_frame_id (frame); - step_sp = read_sp (); if (!single_inst) { @@ -725,7 +719,6 @@ step_once (int skip_subroutines, int single_inst, int count) if (!frame) /* Avoid coredump here. Why tho? */ error ("No current frame"); step_frame_id = get_frame_id (frame); - step_sp = read_sp (); if (!single_inst) { @@ -978,7 +971,6 @@ until_next_command (int from_tty) step_over_calls = STEP_OVER_ALL; step_frame_id = get_frame_id (frame); - step_sp = read_sp (); step_multi = 0; /* Only one call to proceed */ diff --git a/gdb/inferior.h b/gdb/inferior.h index 951893f..76ec0b0 100644 --- a/gdb/inferior.h +++ b/gdb/inferior.h @@ -364,10 +364,6 @@ extern CORE_ADDR step_range_end; /* Exclusive */ extern struct frame_id step_frame_id; -/* Our notion of the current stack pointer. */ - -extern CORE_ADDR step_sp; - /* 1 means step over all subroutine calls. -1 means step over calls to undebuggable functions. */ diff --git a/gdb/infrun.c b/gdb/infrun.c index 970e6c5..96f38a5 100644 --- a/gdb/infrun.c +++ b/gdb/infrun.c @@ -1159,7 +1159,7 @@ context_switch (struct execution_control_state *ecs) ecs->stepping_through_solib_after_catch, ecs->stepping_through_solib_catchpoints, ecs->stepping_through_sigtramp, - ecs->current_line, ecs->current_symtab, step_sp); + ecs->current_line, ecs->current_symtab); /* Load infrun state for the new thread. */ load_infrun_state (ecs->ptid, &prev_pc, @@ -1170,7 +1170,7 @@ context_switch (struct execution_control_state *ecs) &ecs->stepping_through_solib_after_catch, &ecs->stepping_through_solib_catchpoints, &ecs->stepping_through_sigtramp, - &ecs->current_line, &ecs->current_symtab, &step_sp); + &ecs->current_line, &ecs->current_symtab); } inferior_ptid = ecs->ptid; } diff --git a/gdb/thread.c b/gdb/thread.c index bb7c63f..7a5927d 100644 --- a/gdb/thread.c +++ b/gdb/thread.c @@ -303,7 +303,7 @@ load_infrun_state (ptid_t ptid, bpstat *stepping_through_solib_catchpoints, int *stepping_through_sigtramp, int *current_line, - struct symtab **current_symtab, CORE_ADDR *step_sp) + struct symtab **current_symtab) { struct thread_info *tp; @@ -328,7 +328,6 @@ load_infrun_state (ptid_t ptid, *stepping_through_sigtramp = tp->stepping_through_sigtramp; *current_line = tp->current_line; *current_symtab = tp->current_symtab; - *step_sp = tp->step_sp; } /* Save infrun state for the thread PID. */ @@ -347,7 +346,7 @@ save_infrun_state (ptid_t ptid, bpstat stepping_through_solib_catchpoints, int stepping_through_sigtramp, int current_line, - struct symtab *current_symtab, CORE_ADDR step_sp) + struct symtab *current_symtab) { struct thread_info *tp; @@ -370,7 +369,6 @@ save_infrun_state (ptid_t ptid, tp->stepping_through_sigtramp = stepping_through_sigtramp; tp->current_line = current_line; tp->current_symtab = current_symtab; - tp->step_sp = step_sp; } /* Return true if TP is an active thread. */ |