| Message ID | 20190502081554.5521-8-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> > --- > gdbstub.c | 33 +++++++++++++++++++++++++++++++++ > 1 file changed, 33 insertions(+) > > diff --git a/gdbstub.c b/gdbstub.c > index 21cdaf4678..36c7353a22 100644 > --- a/gdbstub.c > +++ b/gdbstub.c > @@ -1588,6 +1588,29 @@ static void handle_set_thread(GdbCmdContext *gdb_ctx, void *user_ctx) > } > } > > +static void handle_insert_bp(GdbCmdContext *gdb_ctx, void *user_ctx) > +{ > + int res; > + > + if (gdb_ctx->num_params < 3) { != 3? > + put_packet(gdb_ctx->s, "E22"); > + return; > + } > + > + res = gdb_breakpoint_insert(gdb_ctx->params[1].val_ull, > + gdb_ctx->params[2].val_ull, > + gdb_ctx->params[0].val_ul); I would be tempted to fix the prototype of gdb_breakpoint_insert to match the order of the packet parameters for cleanliness. > + if (res >= 0) { > + put_packet(gdb_ctx->s, "OK"); > + return; > + } else if (res == -ENOSYS) { > + put_packet(gdb_ctx->s, ""); > + return; > + } > + > + put_packet(gdb_ctx->s, "E22"); > +} > + > static int gdb_handle_packet(GDBState *s, const char *line_buf) > { > CPUState *cpu; > @@ -1843,6 +1866,16 @@ static int gdb_handle_packet(GDBState *s, const char *line_buf) > put_packet(s, "OK"); > break; > case 'Z': > + { > + static const GdbCmdParseEntry insert_bp_cmd_desc = { > + .handler = handle_insert_bp, > + .cmd = "Z", > + .cmd_startswith = 1, > + .schema = "l?L?L0" > + }; > + cmd_parser = &insert_bp_cmd_desc; > + } > + break; > case 'z': > type = strtoul(p, (char **)&p, 16); > if (*p == ',') You should also delete the: if (ch == 'Z') res = gdb_breakpoint_insert(addr, len, type); case. In fact I think there is probably a good case just to merge with the next patch as the two functions are very much related. -- Alex Bennée
diff --git a/gdbstub.c b/gdbstub.c index 21cdaf4678..36c7353a22 100644 --- a/gdbstub.c +++ b/gdbstub.c @@ -1588,6 +1588,29 @@ static void handle_set_thread(GdbCmdContext *gdb_ctx, void *user_ctx) } } +static void handle_insert_bp(GdbCmdContext *gdb_ctx, void *user_ctx) +{ + int res; + + if (gdb_ctx->num_params < 3) { + put_packet(gdb_ctx->s, "E22"); + return; + } + + res = gdb_breakpoint_insert(gdb_ctx->params[1].val_ull, + gdb_ctx->params[2].val_ull, + gdb_ctx->params[0].val_ul); + if (res >= 0) { + put_packet(gdb_ctx->s, "OK"); + return; + } else if (res == -ENOSYS) { + put_packet(gdb_ctx->s, ""); + return; + } + + put_packet(gdb_ctx->s, "E22"); +} + static int gdb_handle_packet(GDBState *s, const char *line_buf) { CPUState *cpu; @@ -1843,6 +1866,16 @@ static int gdb_handle_packet(GDBState *s, const char *line_buf) put_packet(s, "OK"); break; case 'Z': + { + static const GdbCmdParseEntry insert_bp_cmd_desc = { + .handler = handle_insert_bp, + .cmd = "Z", + .cmd_startswith = 1, + .schema = "l?L?L0" + }; + cmd_parser = &insert_bp_cmd_desc; + } + break; case 'z': type = strtoul(p, (char **)&p, 16); if (*p == ',')
Signed-off-by: Jon Doron <arilou@gmail.com> --- gdbstub.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+)