[COMMIT PATCH] remote.c: Remove unnecessary fields from 'struct stop_reply'. (was: Re: RFA [PATCH v3] Implement 'catch syscall' for gdbserver)

Pedro Alves
2013-09-27T13:25:04Z

On 09/21/2013 09:55 PM, Philippe Waroquiers wrote:
> @@ -5284,6 +5377,11 @@ typedef struct stop_reply
> int stopped_by_watchpoint_p;
> CORE_ADDR watch_data_address;
>
> + /* Set to 1 if the stop_reply is for a syscall entry or
> + return. The field ws.value.syscall_number then identifies
> + the syscall. */
> + int syscall;
> +
> int solibs_changed;
> int replay_event;

While reviewing this patch, I wondered why we actually need this
field. Turns out we don't. I've applied the patch below.

----------
Subject: [PATCH] remote.c: Remove unnecessary fields from 'struct
stop_reply'.

I noticed these fields aren't really necessary -- if the T stop reply
indicated any we have any special event, the fallthrough doesn't
really do anything.

Tested on x86_64 Fedora 17 w/ local gdbserver, and also confirmed
"catch load" against a Windows gdbserver running under Wine, which
exercises TARGET_WAITKIND_LOADED, still works as expected.

gdb/
2013-09-27 Pedro Alves <palves@redhat.com>

* remote.c (struct stop_reply) <solibs_changed, replay_event>:
Delete fields.
(remote_parse_stop_reply): Adjust, setting event->ws.kind
directly.
---
gdb/remote.c | 31 +++++++++++--------------------
1 file changed, 11 insertions(+), 20 deletions(-)

diff --git a/gdb/remote.c b/gdb/remote.c
index 2e116d9..0fa1e2b 100644
--- a/gdb/remote.c
+++ b/gdb/remote.c
@@ -5284,9 +5284,6 @@ typedef struct stop_reply
int stopped_by_watchpoint_p;
CORE_ADDR watch_data_address;

- int solibs_changed;
- int replay_event;
-
int core;
} *stop_reply_p;

@@ -5546,8 +5543,6 @@ remote_parse_stop_reply (char *buf, struct stop_reply *event)
event->ptid = null_ptid;
event->ws.kind = TARGET_WAITKIND_IGNORE;
event->ws.value.integer = 0;
- event->solibs_changed = 0;
- event->replay_event = 0;
event->stopped_by_watchpoint_p = 0;
event->regcache = NULL;
event->core = -1;
@@ -5611,15 +5606,14 @@ Packet: '%s'\n"),
while (*p_temp && *p_temp != ';')
p_temp++;

- event->solibs_changed = 1;
+ event->ws.kind = TARGET_WAITKIND_LOADED;
p = p_temp;
}
else if (strncmp (p, "replaylog", p1 - p) == 0)
{
- /* NO_HISTORY event.
- p1 will indicate "begin" or "end", but
- it makes no difference for now, so ignore it. */
- event->replay_event = 1;
+ event->ws.kind = TARGET_WAITKIND_NO_HISTORY;
+ /* p1 will indicate "begin" or "end", but it makes
+ no difference for now, so ignore it. */
p_temp = strchr (p1 + 1, ';');
if (p_temp)
p = p_temp;
@@ -5675,18 +5669,15 @@ Packet: '%s'\n"),
buf, p);
++p;
}
+
+ if (event->ws.kind != TARGET_WAITKIND_IGNORE)
+ break;
+
/* fall through */
case 'S': /* Old style status, just signal only. */
- if (event->solibs_changed)
- event->ws.kind = TARGET_WAITKIND_LOADED;
- else if (event->replay_event)
- event->ws.kind = TARGET_WAITKIND_NO_HISTORY;
- else
- {
- event->ws.kind = TARGET_WAITKIND_STOPPED;
- event->ws.value.sig = (enum gdb_signal)
- (((fromhex (buf[1])) << 4) + (fromhex (buf[2])));
- }
+ event->ws.kind = TARGET_WAITKIND_STOPPED;
+ event->ws.value.sig = (enum gdb_signal)
+ (((fromhex (buf[1])) << 4) + (fromhex (buf[2])));
break;
case 'W': /* Target exited. */
case 'X':
--
1.7.11.7