2002-12-05 Andrew Cagney <ac131313@redhat.com>

* gdbthread.h: Include "frame.h".
	(struct thread_info): Replace step_frame_address with
	step_frame_id.
	* inferior.h: Include "frame.h".
	(step_frame_id): Replace external variable step_frame_address.
	* gdbthread.h (save_infrun_state): Replace step_frame_address
	parameter with step_frame_id parameter.
	(load_infrun_state): Ditto.
	* Makefile.in (gdbthread_h, inferior_h): Add $(frame_h).
	* infcmd.c (step_frame_id, step_1, step_once): Update.
	* thread.c (load_infrun_state, save_infrun_state): Update.
	* infrun.c (clear_proceed_status, save_inferior_status): Update.
	(handle_inferior_event, step_over_function): Update.
	(normal_stop, context_switch, restore_inferior_status): Update.
	(struct inferior_status): Replace step_frame_address with
	step_frame_id.
This commit is contained in:
Andrew Cagney
2002-12-06 07:35:55 +00:00
parent 2f9bd3f641
commit aa0cd9c15b
7 changed files with 78 additions and 47 deletions

View File

@ -182,7 +182,7 @@ CORE_ADDR step_range_end; /* Exclusive */
This is how we know when we step into a subroutine call,
and how to set the frame for the breakpoint used to step out. */
CORE_ADDR step_frame_address;
struct frame_id step_frame_id;
/* Our notion of the current stack pointer. */
@ -627,7 +627,7 @@ step_1 (int skip_subroutines, int single_inst, char *count_string)
frame = get_current_frame ();
if (!frame) /* Avoid coredump here. Why tho? */
error ("No current frame");
step_frame_address = get_frame_base (frame);
step_frame_id = get_frame_id (frame);
step_sp = read_sp ();
if (!single_inst)
@ -742,7 +742,7 @@ step_once (int skip_subroutines, int single_inst, int count)
frame = get_current_frame ();
if (!frame) /* Avoid coredump here. Why tho? */
error ("No current frame");
step_frame_address = get_frame_base (frame);
step_frame_id = get_frame_id (frame);
step_sp = read_sp ();
if (!single_inst)
@ -1105,7 +1105,7 @@ until_next_command (int from_tty)
}
step_over_calls = STEP_OVER_ALL;
step_frame_address = get_frame_base (frame);
step_frame_id = get_frame_id (frame);
step_sp = read_sp ();
step_multi = 0; /* Only one call to proceed */