[PATCH 08/16] push last_program_signals_packet into struct remote_state

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

This moves the global last_program_signals_packet into remote_state.

* remote.c (struct remote_state) <last_program_signals_packet>:
New field.
(last_program_signals_packet): Remove.
(remote_program_signals, remote_open_1): Update.
---
gdb/remote.c | 27 +++++++++++++--------------
1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/gdb/remote.c b/gdb/remote.c
index 136c3d9..a2d7e13 100644
--- a/gdb/remote.c
+++ b/gdb/remote.c
@@ -382,6 +382,12 @@ struct remote_state
int remote_traceframe_number;

char *last_pass_packet;
+
+ /* The last QProgramSignals packet sent to the target. We bypass
+ sending a new program signals list down to the target if the new
+ packet is exactly the same as the last we sent. IOW, we only let
+ the target know about program signals list changes. */
+ char *last_program_signals_packet;
};

/* Private data that we'll store in (struct thread_info)->private. */
@@ -1706,13 +1712,6 @@ remote_pass_signals (int numsigs, unsigned char *pass_signals)
}
}

-/* The last QProgramSignals packet sent to the target. We bypass
- sending a new program signals list down to the target if the new
- packet is exactly the same as the last we sent. IOW, we only let
- the target know about program signals list changes. */
-
-static char *last_program_signals_packet;
-
/* If 'QProgramSignals' is supported, tell the remote stub what
signals it should pass through to the inferior when detaching. */

@@ -1723,6 +1722,7 @@ remote_program_signals (int numsigs, unsigned char *signals)
{
char *packet, *p;
int count = 0, i;
+ struct remote_state *rs = get_remote_state ();

gdb_assert (numsigs < 256);
for (i = 0; i < numsigs; i++)
@@ -1748,17 +1748,16 @@ remote_program_signals (int numsigs, unsigned char *signals)
}
}
*p = 0;
- if (!last_program_signals_packet
- || strcmp (last_program_signals_packet, packet) != 0)
+ if (!rs->last_program_signals_packet
+ || strcmp (rs->last_program_signals_packet, packet) != 0)
{
- struct remote_state *rs = get_remote_state ();
char *buf = rs->buf;

putpkt (packet);
getpkt (&rs->buf, &rs->buf_size, 0);
packet_ok (buf, &remote_protocol_packets[PACKET_QProgramSignals]);
- xfree (last_program_signals_packet);
- last_program_signals_packet = packet;
+ xfree (rs->last_program_signals_packet);
+ rs->last_program_signals_packet = packet;
}
else
xfree (packet);
@@ -4288,8 +4287,8 @@ remote_open_1 (char *name, int from_tty,

/* Make sure we send the program signals list the next time we
resume. */
- xfree (last_program_signals_packet);
- last_program_signals_packet = NULL;
+ xfree (rs->last_program_signals_packet);
+ rs->last_program_signals_packet = NULL;

remote_fileio_reset ();
reopen_exec_file ();
--
1.8.1.4