sys64738
/
mspdebug
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

gdb: fixed bug when reporting run errors

This commit is contained in:
Daniel Beer 2010-05-12 17:43:30 +12:00
parent dcc1874434
commit c582a3513d
1 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
gdb.c
View File

@ -63,18 +63,6 @@ static void gdb_printf(struct gdb_data *data, const char *fmt, ...)
data->outlen += len; data->outlen += len;
} }
static int gdb_flush(struct gdb_data *data)
{
if (send(data->sock, data->outbuf, data->outlen, 0) < 0) {
data->error = errno;
perror("gdb: send");
return -1;
}
data->outlen = 0;
return 0;
}
static int gdb_read(struct gdb_data *data, int blocking) static int gdb_read(struct gdb_data *data, int blocking)
{ {
fd_set r; fd_set r;
@ -136,6 +124,18 @@ static int gdb_getc(struct gdb_data *data)
return c; return c;
} }
static int gdb_flush(struct gdb_data *data)
{
if (send(data->sock, data->outbuf, data->outlen, 0) < 0) {
data->error = errno;
perror("gdb: flush");
return -1;
}
data->outlen = 0;
return 0;
}
static int gdb_flush_ack(struct gdb_data *data) static int gdb_flush_ack(struct gdb_data *data)
{ {
int c; int c;
@ -145,14 +145,18 @@ static int gdb_flush_ack(struct gdb_data *data)
#ifdef DEBUG_GDB #ifdef DEBUG_GDB
printf("-> %s\n", data->outbuf); printf("-> %s\n", data->outbuf);
#endif #endif
if (gdb_flush(data) < 0) if (send(data->sock, data->outbuf, data->outlen, 0) < 0) {
data->error = errno;
perror("gdb: flush_ack");
return -1; return -1;
}
c = gdb_getc(data); c = gdb_getc(data);
if (c < 0) if (c < 0)
return -1; return -1;
} while (c != '+'); } while (c != '+');
data->outlen = 0;
return 0; return 0;
} }
@ -392,18 +396,14 @@ static int run(struct gdb_data *data, char *buf)
printf("Running\n"); printf("Running\n");
if (run_set_pc(data, buf) < 0 || if (run_set_pc(data, buf) < 0 ||
data->device->ctl(data->device, DEVICE_CTL_RUN) < 0) { data->device->ctl(data->device, DEVICE_CTL_RUN) < 0)
gdb_send(data, "E00"); return gdb_send(data, "E00");
return run_final_status(data);
}
for (;;) { for (;;) {
device_status_t status = data->device->poll(data->device); device_status_t status = data->device->poll(data->device);
if (status == DEVICE_STATUS_ERROR) { if (status == DEVICE_STATUS_ERROR)
gdb_send(data, "E00"); return gdb_send(data, "E00");
return run_final_status(data);
}
if (status == DEVICE_STATUS_HALTED) { if (status == DEVICE_STATUS_HALTED) {
printf("Target halted\n"); printf("Target halted\n");
@ -428,7 +428,7 @@ static int run(struct gdb_data *data, char *buf)
out: out:
if (data->device->ctl(data->device, DEVICE_CTL_HALT) < 0) if (data->device->ctl(data->device, DEVICE_CTL_HALT) < 0)
gdb_send(data, "E00"); return gdb_send(data, "E00");
return run_final_status(data); return run_final_status(data);
} }