projects
/
fw
/
stlink
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
bbecbc1
)
Revert "[ merge ] patch from fischermi@t-online.de, GDB server endless loop"
author
Michael Pratt
<michael@pratt.im>
Wed, 6 Mar 2013 17:03:27 +0000
(12:03 -0500)
committer
Michael Pratt
<michael@pratt.im>
Wed, 6 Mar 2013 17:03:27 +0000
(12:03 -0500)
This reverts commit
1c2828cc914260a57299461373bf835f90043863
.
gdbserver/gdb-server.c
patch
|
blob
|
history
diff --git
a/gdbserver/gdb-server.c
b/gdbserver/gdb-server.c
index f92fc05f06aa7c11f437c67ab252561fbccf85bc..5f0a43b682d5ad7bb15eec7df3bb1a76cd70c3ce 100644
(file)
--- a/
gdbserver/gdb-server.c
+++ b/
gdbserver/gdb-server.c
@@
-650,8
+650,7
@@
int serve(stlink_t *sl, int port) {
perror("listen");
return 1;
}
perror("listen");
return 1;
}
-
\r
-start_again:
+
stlink_force_debug(sl);
stlink_reset(sl);
init_code_breakpoints(sl);
stlink_force_debug(sl);
stlink_reset(sl);
init_code_breakpoints(sl);
@@
-682,7
+681,7
@@
start_again:
int status = gdb_recv_packet(client, &packet);
if(status < 0) {
fprintf(stderr, "cannot recv: %d\n", status);
int status = gdb_recv_packet(client, &packet);
if(status < 0) {
fprintf(stderr, "cannot recv: %d\n", status);
- goto start_again;
+ return 1;
}
#ifdef DEBUG
}
#ifdef DEBUG
@@
-1221,9
+1220,7
@@
start_again:
int result = gdb_send_packet(client, reply);
if(result != 0) {
fprintf(stderr, "cannot send: %d\n", result);
int result = gdb_send_packet(client, reply);
if(result != 0) {
fprintf(stderr, "cannot send: %d\n", result);
- free(reply);
- free(packet);
- goto start_again;
+ return 1;
}
free(reply);
}
free(reply);