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.
This commit is contained in:
Andrew Cagney 2004-05-12 22:19:02 +00:00
parent 090ddb2a8c
commit f2c9ca0856
6 changed files with 15 additions and 23 deletions

View File

@ -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> 2004-05-12 Ulrich Weigand <uweigand@de.ibm.com>
* MAINTAINERS (write after approval): Add myself. * MAINTAINERS (write after approval): Add myself.

View File

@ -48,7 +48,6 @@ struct thread_info
CORE_ADDR step_range_start; CORE_ADDR step_range_start;
CORE_ADDR step_range_end; CORE_ADDR step_range_end;
struct frame_id step_frame_id; struct frame_id step_frame_id;
CORE_ADDR step_sp;
int current_line; int current_line;
struct symtab *current_symtab; struct symtab *current_symtab;
int trap_expected; int trap_expected;
@ -126,8 +125,7 @@ extern void save_infrun_state (ptid_t ptid,
bpstat stepping_through_solib_catchpoints, bpstat stepping_through_solib_catchpoints,
int stepping_through_sigtramp, int stepping_through_sigtramp,
int current_line, int current_line,
struct symtab *current_symtab, struct symtab *current_symtab);
CORE_ADDR step_sp);
/* infrun context switch: load the debugger state previously saved /* infrun context switch: load the debugger state previously saved
for the given thread. */ for the given thread. */
@ -144,8 +142,7 @@ extern void load_infrun_state (ptid_t ptid,
bpstat *stepping_through_solib_catchpoints, bpstat *stepping_through_solib_catchpoints,
int *stepping_through_sigtramp, int *stepping_through_sigtramp,
int *current_line, int *current_line,
struct symtab **current_symtab, struct symtab **current_symtab);
CORE_ADDR *step_sp);
/* Commands with a prefix of `thread'. */ /* Commands with a prefix of `thread'. */
extern struct cmd_list_element *thread_cmd_list; extern struct cmd_list_element *thread_cmd_list;

View File

@ -186,11 +186,6 @@ CORE_ADDR step_range_end; /* Exclusive */
struct frame_id step_frame_id; 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; enum step_over_calls_kind step_over_calls;
/* If stepping, nonzero means step count is > 1 /* 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? */ if (!frame) /* Avoid coredump here. Why tho? */
error ("No current frame"); error ("No current frame");
step_frame_id = get_frame_id (frame); step_frame_id = get_frame_id (frame);
step_sp = read_sp ();
if (!single_inst) if (!single_inst)
{ {
@ -725,7 +719,6 @@ step_once (int skip_subroutines, int single_inst, int count)
if (!frame) /* Avoid coredump here. Why tho? */ if (!frame) /* Avoid coredump here. Why tho? */
error ("No current frame"); error ("No current frame");
step_frame_id = get_frame_id (frame); step_frame_id = get_frame_id (frame);
step_sp = read_sp ();
if (!single_inst) if (!single_inst)
{ {
@ -978,7 +971,6 @@ until_next_command (int from_tty)
step_over_calls = STEP_OVER_ALL; step_over_calls = STEP_OVER_ALL;
step_frame_id = get_frame_id (frame); step_frame_id = get_frame_id (frame);
step_sp = read_sp ();
step_multi = 0; /* Only one call to proceed */ step_multi = 0; /* Only one call to proceed */

View File

@ -364,10 +364,6 @@ extern CORE_ADDR step_range_end; /* Exclusive */
extern struct frame_id step_frame_id; 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 all subroutine calls.
-1 means step over calls to undebuggable functions. */ -1 means step over calls to undebuggable functions. */

View File

@ -1159,7 +1159,7 @@ context_switch (struct execution_control_state *ecs)
ecs->stepping_through_solib_after_catch, ecs->stepping_through_solib_after_catch,
ecs->stepping_through_solib_catchpoints, ecs->stepping_through_solib_catchpoints,
ecs->stepping_through_sigtramp, 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 for the new thread. */
load_infrun_state (ecs->ptid, &prev_pc, 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_after_catch,
&ecs->stepping_through_solib_catchpoints, &ecs->stepping_through_solib_catchpoints,
&ecs->stepping_through_sigtramp, &ecs->stepping_through_sigtramp,
&ecs->current_line, &ecs->current_symtab, &step_sp); &ecs->current_line, &ecs->current_symtab);
} }
inferior_ptid = ecs->ptid; inferior_ptid = ecs->ptid;
} }

View File

@ -303,7 +303,7 @@ load_infrun_state (ptid_t ptid,
bpstat *stepping_through_solib_catchpoints, bpstat *stepping_through_solib_catchpoints,
int *stepping_through_sigtramp, int *stepping_through_sigtramp,
int *current_line, int *current_line,
struct symtab **current_symtab, CORE_ADDR *step_sp) struct symtab **current_symtab)
{ {
struct thread_info *tp; struct thread_info *tp;
@ -328,7 +328,6 @@ load_infrun_state (ptid_t ptid,
*stepping_through_sigtramp = tp->stepping_through_sigtramp; *stepping_through_sigtramp = tp->stepping_through_sigtramp;
*current_line = tp->current_line; *current_line = tp->current_line;
*current_symtab = tp->current_symtab; *current_symtab = tp->current_symtab;
*step_sp = tp->step_sp;
} }
/* Save infrun state for the thread PID. */ /* Save infrun state for the thread PID. */
@ -347,7 +346,7 @@ save_infrun_state (ptid_t ptid,
bpstat stepping_through_solib_catchpoints, bpstat stepping_through_solib_catchpoints,
int stepping_through_sigtramp, int stepping_through_sigtramp,
int current_line, int current_line,
struct symtab *current_symtab, CORE_ADDR step_sp) struct symtab *current_symtab)
{ {
struct thread_info *tp; struct thread_info *tp;
@ -370,7 +369,6 @@ save_infrun_state (ptid_t ptid,
tp->stepping_through_sigtramp = stepping_through_sigtramp; tp->stepping_through_sigtramp = stepping_through_sigtramp;
tp->current_line = current_line; tp->current_line = current_line;
tp->current_symtab = current_symtab; tp->current_symtab = current_symtab;
tp->step_sp = step_sp;
} }
/* Return true if TP is an active thread. */ /* Return true if TP is an active thread. */