| Message ID | 20190424142714.28460-4-arilou@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v3,01/20] gdbstub: Add infrastructure to parse cmd packets | expand |
arilou@gmail.com writes: > From: Jon Doron <arilou@gmail.com> > > Signed-off-by: Jon Doron <arilou@gmail.com> Reviewed-by: Alex Bennée <alex.bennee@linaro.org> > --- > gdbstub.c | 25 +++++++++++++++++++------ > 1 file changed, 19 insertions(+), 6 deletions(-) > > diff --git a/gdbstub.c b/gdbstub.c > index 435b492b4f..a6d5acd6f0 100644 > --- a/gdbstub.c > +++ b/gdbstub.c > @@ -1538,6 +1538,16 @@ static void handle_thread_alive(GdbCmdContext *gdb_ctx, void *user_ctx) > put_packet(gdb_ctx->s, "OK"); > } > > +static void handle_continue(GdbCmdContext *gdb_ctx, void *user_ctx) > +{ > + if (gdb_ctx->num_params) { > + gdb_set_cpu_pc(gdb_ctx->s, gdb_ctx->params[0].val_ull); > + } > + > + gdb_ctx->s->signal = 0; > + gdb_continue(gdb_ctx->s); > +} > + > static int gdb_handle_packet(GDBState *s, const char *line_buf) > { > CPUState *cpu; > @@ -1573,13 +1583,16 @@ static int gdb_handle_packet(GDBState *s, const char *line_buf) > gdb_breakpoint_remove_all(); > break; > case 'c': > - if (*p != '\0') { > - addr = strtoull(p, (char **)&p, 16); > - gdb_set_cpu_pc(s, addr); > + { > + static GdbCmdParseEntry continue_cmd_desc = { > + .handler = handle_continue, > + .cmd = "c", > + .cmd_startswith = 1, > + .schema = "L0" > + }; > + process_string_cmd(s, NULL, line_buf, &continue_cmd_desc, 1); > } > - s->signal = 0; > - gdb_continue(s); > - return RS_IDLE; > + break; > case 'C': > s->signal = gdb_signal_to_target (strtoul(p, (char **)&p, 16)); > if (s->signal == -1) -- Alex Bennée
diff --git a/gdbstub.c b/gdbstub.c index 435b492b4f..a6d5acd6f0 100644 --- a/gdbstub.c +++ b/gdbstub.c @@ -1538,6 +1538,16 @@ static void handle_thread_alive(GdbCmdContext *gdb_ctx, void *user_ctx) put_packet(gdb_ctx->s, "OK"); } +static void handle_continue(GdbCmdContext *gdb_ctx, void *user_ctx) +{ + if (gdb_ctx->num_params) { + gdb_set_cpu_pc(gdb_ctx->s, gdb_ctx->params[0].val_ull); + } + + gdb_ctx->s->signal = 0; + gdb_continue(gdb_ctx->s); +} + static int gdb_handle_packet(GDBState *s, const char *line_buf) { CPUState *cpu; @@ -1573,13 +1583,16 @@ static int gdb_handle_packet(GDBState *s, const char *line_buf) gdb_breakpoint_remove_all(); break; case 'c': - if (*p != '\0') { - addr = strtoull(p, (char **)&p, 16); - gdb_set_cpu_pc(s, addr); + { + static GdbCmdParseEntry continue_cmd_desc = { + .handler = handle_continue, + .cmd = "c", + .cmd_startswith = 1, + .schema = "L0" + }; + process_string_cmd(s, NULL, line_buf, &continue_cmd_desc, 1); } - s->signal = 0; - gdb_continue(s); - return RS_IDLE; + break; case 'C': s->signal = gdb_signal_to_target (strtoul(p, (char **)&p, 16)); if (s->signal == -1)