diff options
| author | Spencer Oliver <spen@spen-soft.co.uk> | 2012-10-11 11:19:52 +0100 |
|---|---|---|
| committer | Freddie Chopin <freddie.chopin@gmail.com> | 2012-10-17 18:21:53 +0000 |
| commit | 98a41bca6ed5711c972fdd75167ffc031377a456 (patch) | |
| tree | 62b38166fb2f38a870a9edda739fd89136995851 /src/server | |
| parent | 443197aff0e4b3e2ba01635f2862aca90ac26349 (diff) | |
gdb: fix extended-remote restart
Seems versions of gdb > 6.8 require an W stop reply after receiving a
kill packet.
Without this we receive the following error from gdb:
gdb/thread.c:72: internal-error: inferior_thread: Assertion `tp' failed.
Change-Id: I86765a321f0429c9b517fe13ded0ee2dbd4b2f87
Signed-off-by: Spencer Oliver <spen@spen-soft.co.uk>
Reviewed-on: http://openocd.zylin.com/911
Tested-by: jenkins
Reviewed-by: Joel Bodenmann <joel@unormal.org>
Reviewed-by: Freddie Chopin <freddie.chopin@gmail.com>
Diffstat (limited to 'src/server')
| -rw-r--r-- | src/server/gdb_server.c | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/src/server/gdb_server.c b/src/server/gdb_server.c index 640f8eae..047a9d09 100644 --- a/src/server/gdb_server.c +++ b/src/server/gdb_server.c @@ -74,6 +74,11 @@ struct gdb_connection { * can be replied immediately and a new GDB packet will be ready without delay * (ca. 10% or so...). */ bool mem_write_error; + /* with extended-remote it seems we need to better emulate attach/detach. + * what this means is we reply with a W stop reply after a kill packet, + * normally we reply with a S reply via gdb_last_signal_packet. + * as a side note this behaviour only effects gdb > 6.8 */ + bool attached; }; #if 0 @@ -762,6 +767,7 @@ static int gdb_new_connection(struct connection *connection) gdb_connection->noack_mode = 0; gdb_connection->sync = true; gdb_connection->mem_write_error = false; + gdb_connection->attached = true; /* send ACK to GDB for debug request */ gdb_write(connection, "+", 1); @@ -878,9 +884,17 @@ static int gdb_last_signal_packet(struct connection *connection, char *packet, int packet_size) { struct target *target = get_target_from_connection(connection); + struct gdb_connection *gdb_con = connection->priv; char sig_reply[4]; int signal_var; + if (!gdb_con->attached) { + /* if we are here we have received a kill packet + * reply W stop reply otherwise gdb gets very unhappy */ + gdb_put_packet(connection, "W00", 3); + return ERROR_OK; + } + signal_var = gdb_last_signal(target); snprintf(sig_reply, 4, "S%2.2x", signal_var); @@ -2160,8 +2174,10 @@ static int gdb_input_inner(struct connection *connection) return retval; break; case 'k': - if (extended_protocol != 0) + if (extended_protocol != 0) { + gdb_con->attached = false; break; + } gdb_put_packet(connection, "OK", 2); return ERROR_SERVER_REMOTE_CLOSED; case '!': @@ -2175,6 +2191,8 @@ static int gdb_input_inner(struct connection *connection) watchpoint_clear_target(gdb_service->target); command_run_linef(connection->cmd_ctx, "ocd_gdb_restart %s", target_name(target)); + /* set connection as attached after reset */ + gdb_con->attached = true; /* info rtos parts */ gdb_thread_packet(connection, packet, packet_size); gdb_put_packet(connection, "OK", 2); |