[PATCH 10/16] push last_sent_step into struct remote_state

Tom Tromey
2013-06-28T17:40:48Z

This moves the global last_sent_step into remote_state.

* remote.c (struct remote_state) <last_sent_step>:
New field.
(last_sent_step): Remove.
(remote_resume, remote_wait_as): Update.
---
gdb/remote.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gdb/remote.c b/gdb/remote.c
index f095b5e..e87f7e8 100644
--- a/gdb/remote.c
+++ b/gdb/remote.c
@@ -390,6 +390,8 @@ struct remote_state
char *last_program_signals_packet;

enum gdb_signal last_sent_signal;
+
+ int last_sent_step;
};

/* Private data that we'll store in (struct thread_info)->private. */
@@ -4913,8 +4915,6 @@ remote_vcont_resume (ptid_t ptid, int step, enum gdb_signal siggnal)

/* Tell the remote machine to resume. */

-static int last_sent_step;
-
static void
remote_resume (struct target_ops *ops,
ptid_t ptid, int step, enum gdb_signal siggnal)
@@ -4932,7 +4932,7 @@ remote_resume (struct target_ops *ops,
remote_notif_process (&notif_client_stop);

rs->last_sent_signal = siggnal;
- last_sent_step = step;
+ rs->last_sent_step = step;

/* The vCont packet doesn't need to specify threads via Hc. */
/* No reverse support (yet) for vCont. */
@@ -6034,7 +6034,7 @@ remote_wait_as (ptid_t ptid, struct target_waitstatus *status, int options)
rs->last_sent_signal = GDB_SIGNAL_0;
target_terminal_inferior ();

- strcpy ((char *) buf, last_sent_step ? "s" : "c");
+ strcpy ((char *) buf, rs->last_sent_step ? "s" : "c");
putpkt ((char *) buf);

/* We just told the target to resume, so a stop reply is in
--
1.8.1.4