| Message ID | 20190529064148.19856-9-arilou@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | gdbstub: Refactor command packets handler | expand |
Jon Doron <arilou@gmail.com> writes: > Signed-off-by: Jon Doron <arilou@gmail.com> Reviewed-by: Alex Bennée <alex.bennee@linaro.org> > --- > gdbstub.c | 39 ++++++++++++++++++++++++++++++--------- > 1 file changed, 30 insertions(+), 9 deletions(-) > > diff --git a/gdbstub.c b/gdbstub.c > index 572222bfa4..fc9526b3f5 100644 > --- a/gdbstub.c > +++ b/gdbstub.c > @@ -1651,6 +1651,27 @@ static void handle_remove_bp(GdbCmdContext *gdb_ctx, void *user_ctx) > put_packet(gdb_ctx->s, "E22"); > } > > +static void handle_set_reg(GdbCmdContext *gdb_ctx, void *user_ctx) > +{ > + int reg_size; > + > + if (!gdb_has_xml) { > + put_packet(gdb_ctx->s, "E00"); > + return; > + } > + > + if (gdb_ctx->num_params != 2) { > + put_packet(gdb_ctx->s, "E22"); > + return; > + } > + > + reg_size = strlen(gdb_ctx->params[1].data) / 2; > + hextomem(gdb_ctx->mem_buf, gdb_ctx->params[1].data, reg_size); > + gdb_write_register(gdb_ctx->s->g_cpu, gdb_ctx->mem_buf, > + gdb_ctx->params[0].val_ull); > + put_packet(gdb_ctx->s, "OK"); > +} > + > static int gdb_handle_packet(GDBState *s, const char *line_buf) > { > CPUState *cpu; > @@ -1895,15 +1916,15 @@ static int gdb_handle_packet(GDBState *s, const char *line_buf) > } > break; > case 'P': > - if (!gdb_has_xml) > - goto unknown_command; > - addr = strtoull(p, (char **)&p, 16); > - if (*p == '=') > - p++; > - reg_size = strlen(p) / 2; > - hextomem(mem_buf, p, reg_size); > - gdb_write_register(s->g_cpu, mem_buf, addr); > - put_packet(s, "OK"); > + { > + static const GdbCmdParseEntry set_reg_cmd_desc = { > + .handler = handle_set_reg, > + .cmd = "P", > + .cmd_startswith = 1, > + .schema = "L?s0" > + }; > + cmd_parser = &set_reg_cmd_desc; > + } > break; > case 'Z': > { -- Alex Bennée
diff --git a/gdbstub.c b/gdbstub.c index 572222bfa4..fc9526b3f5 100644 --- a/gdbstub.c +++ b/gdbstub.c @@ -1651,6 +1651,27 @@ static void handle_remove_bp(GdbCmdContext *gdb_ctx, void *user_ctx) put_packet(gdb_ctx->s, "E22"); } +static void handle_set_reg(GdbCmdContext *gdb_ctx, void *user_ctx) +{ + int reg_size; + + if (!gdb_has_xml) { + put_packet(gdb_ctx->s, "E00"); + return; + } + + if (gdb_ctx->num_params != 2) { + put_packet(gdb_ctx->s, "E22"); + return; + } + + reg_size = strlen(gdb_ctx->params[1].data) / 2; + hextomem(gdb_ctx->mem_buf, gdb_ctx->params[1].data, reg_size); + gdb_write_register(gdb_ctx->s->g_cpu, gdb_ctx->mem_buf, + gdb_ctx->params[0].val_ull); + put_packet(gdb_ctx->s, "OK"); +} + static int gdb_handle_packet(GDBState *s, const char *line_buf) { CPUState *cpu; @@ -1895,15 +1916,15 @@ static int gdb_handle_packet(GDBState *s, const char *line_buf) } break; case 'P': - if (!gdb_has_xml) - goto unknown_command; - addr = strtoull(p, (char **)&p, 16); - if (*p == '=') - p++; - reg_size = strlen(p) / 2; - hextomem(mem_buf, p, reg_size); - gdb_write_register(s->g_cpu, mem_buf, addr); - put_packet(s, "OK"); + { + static const GdbCmdParseEntry set_reg_cmd_desc = { + .handler = handle_set_reg, + .cmd = "P", + .cmd_startswith = 1, + .schema = "L?s0" + }; + cmd_parser = &set_reg_cmd_desc; + } break; case 'Z': {
Signed-off-by: Jon Doron <arilou@gmail.com> --- gdbstub.c | 39 ++++++++++++++++++++++++++++++--------- 1 file changed, 30 insertions(+), 9 deletions(-)