gdbstub: Implement read memory (m pkt) with new infra

Signed-off-by: Jon Doron <arilou@gmail.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20190529064148.19856-12-arilou@gmail.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
This commit is contained in:
Jon Doron 2019-05-29 09:41:39 +03:00 committed by Alex Bennée
parent cc0ecc7890
commit da92e2360e
1 changed files with 32 additions and 16 deletions

View File

@ -1731,6 +1731,30 @@ static void handle_write_mem(GdbCmdContext *gdb_ctx, void *user_ctx)
put_packet(gdb_ctx->s, "OK"); put_packet(gdb_ctx->s, "OK");
} }
static void handle_read_mem(GdbCmdContext *gdb_ctx, void *user_ctx)
{
if (gdb_ctx->num_params != 2) {
put_packet(gdb_ctx->s, "E22");
return;
}
/* memtohex() doubles the required space */
if (gdb_ctx->params[1].val_ull > MAX_PACKET_LENGTH / 2) {
put_packet(gdb_ctx->s, "E22");
return;
}
if (target_memory_rw_debug(gdb_ctx->s->g_cpu, gdb_ctx->params[0].val_ull,
gdb_ctx->mem_buf,
gdb_ctx->params[1].val_ull, false)) {
put_packet(gdb_ctx->s, "E14");
return;
}
memtohex(gdb_ctx->str_buf, gdb_ctx->mem_buf, gdb_ctx->params[1].val_ull);
put_packet(gdb_ctx->s, gdb_ctx->str_buf);
}
static int gdb_handle_packet(GDBState *s, const char *line_buf) static int gdb_handle_packet(GDBState *s, const char *line_buf)
{ {
CPUState *cpu; CPUState *cpu;
@ -1920,22 +1944,14 @@ static int gdb_handle_packet(GDBState *s, const char *line_buf)
put_packet(s, "OK"); put_packet(s, "OK");
break; break;
case 'm': case 'm':
addr = strtoull(p, (char **)&p, 16); {
if (*p == ',') static const GdbCmdParseEntry read_mem_cmd_desc = {
p++; .handler = handle_read_mem,
len = strtoull(p, NULL, 16); .cmd = "m",
.cmd_startswith = 1,
/* memtohex() doubles the required space */ .schema = "L,L0"
if (len > MAX_PACKET_LENGTH / 2) { };
put_packet (s, "E22"); cmd_parser = &read_mem_cmd_desc;
break;
}
if (target_memory_rw_debug(s->g_cpu, addr, mem_buf, len, false) != 0) {
put_packet (s, "E14");
} else {
memtohex(buf, mem_buf, len);
put_packet(s, buf);
} }
break; break;
case 'M': case 'M':