openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

gdbstub: move mem_buf to GDBState and use GByteArray 

This is in preparation for further re-factoring of the register API
with the rest of the code. Theoretically the read register function
could overwrite the MAX_PACKET_LENGTH buffer although currently all
registers are well within the size range.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Damien Hedde <damien.hedde@greensocs.com>
Tested-by: Damien Hedde <damien.hedde@greensocs.com>

Message-Id: <20200316172155.971-10-alex.bennee@linaro.org>
This commit is contained in:
Alex Bennée 2020-03-16 17:21:36 +00:00
parent 308f9e88b2
commit 4a25f1b97a
1 changed files with 35 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
gdbstub.c
View File

@ -367,6 +367,7 @@ typedef struct GDBState {
char syscall_buf[256]; char syscall_buf[256];
gdb_syscall_complete_cb current_syscall_cb; gdb_syscall_complete_cb current_syscall_cb;
GString *str_buf; GString *str_buf;
GByteArray *mem_buf;
} GDBState; } GDBState;
/* By default use no IRQs and no timers while single stepping so as to /* By default use no IRQs and no timers while single stepping so as to
@ -382,6 +383,7 @@ static void init_gdbserver_state(void)
memset(&gdbserver_state, 0, sizeof(GDBState)); memset(&gdbserver_state, 0, sizeof(GDBState));
gdbserver_state.init = true; gdbserver_state.init = true;
gdbserver_state.str_buf = g_string_new(NULL); gdbserver_state.str_buf = g_string_new(NULL);
gdbserver_state.mem_buf = g_byte_array_sized_new(MAX_PACKET_LENGTH);
} }
#ifndef CONFIG_USER_ONLY #ifndef CONFIG_USER_ONLY
@ -576,12 +578,13 @@ static void memtohex(GString *buf, const uint8_t *mem, int len)
g_string_append_c(buf, '\0'); g_string_append_c(buf, '\0');
} }
static void hextomem(uint8_t *mem, const char *buf, int len) static void hextomem(GByteArray *mem, const char *buf, int len)
{ {
int i; int i;
for(i = 0; i < len; i++) { for(i = 0; i < len; i++) {
mem[i] = (fromhex(buf[0]) << 4) | fromhex(buf[1]); guint8 byte = fromhex(buf[0]) << 4 | fromhex(buf[1]);
g_byte_array_append(mem, &byte, 1);
buf += 2; buf += 2;
} }
} }
@ -1412,7 +1415,6 @@ static int cmd_parse_params(const char *data, const char *schema,
typedef struct GdbCmdContext { typedef struct GdbCmdContext {
GdbCmdVariant *params; GdbCmdVariant *params;
int num_params; int num_params;
uint8_t mem_buf[MAX_PACKET_LENGTH];
} GdbCmdContext; } GdbCmdContext;
typedef void (*GdbCmdHandler)(GdbCmdContext *gdb_ctx, void *user_ctx); typedef void (*GdbCmdHandler)(GdbCmdContext *gdb_ctx, void *user_ctx);
@ -1503,6 +1505,7 @@ static void run_cmd_parser(const char *data, const GdbCmdParseEntry *cmd)
} }
g_string_set_size(gdbserver_state.str_buf, 0); g_string_set_size(gdbserver_state.str_buf, 0);
g_byte_array_set_size(gdbserver_state.mem_buf, 0);
/* In case there was an error during the command parsing we must /* In case there was an error during the command parsing we must
* send a NULL packet to indicate the command is not supported */ * send a NULL packet to indicate the command is not supported */
@ -1715,8 +1718,8 @@ static void handle_set_reg(GdbCmdContext *gdb_ctx, void *user_ctx)
} }
reg_size = strlen(gdb_ctx->params[1].data) / 2; reg_size = strlen(gdb_ctx->params[1].data) / 2;
hextomem(gdb_ctx->mem_buf, gdb_ctx->params[1].data, reg_size); hextomem(gdbserver_state.mem_buf, gdb_ctx->params[1].data, reg_size);
gdb_write_register(gdbserver_state.g_cpu, gdb_ctx->mem_buf, gdb_write_register(gdbserver_state.g_cpu, gdbserver_state.mem_buf->data,
gdb_ctx->params[0].val_ull); gdb_ctx->params[0].val_ull);
put_packet("OK"); put_packet("OK");
} }
@ -1735,14 +1738,17 @@ static void handle_get_reg(GdbCmdContext *gdb_ctx, void *user_ctx)
return; return;
} }
reg_size = gdb_read_register(gdbserver_state.g_cpu, gdb_ctx->mem_buf, reg_size = gdb_read_register(gdbserver_state.g_cpu,
gdbserver_state.mem_buf->data,
gdb_ctx->params[0].val_ull); gdb_ctx->params[0].val_ull);
if (!reg_size) { if (!reg_size) {
put_packet("E14"); put_packet("E14");
return; return;
} else {
g_byte_array_set_size(gdbserver_state.mem_buf, reg_size);
} }
memtohex(gdbserver_state.str_buf, gdb_ctx->mem_buf, reg_size); memtohex(gdbserver_state.str_buf, gdbserver_state.mem_buf->data, reg_size);
put_strbuf(); put_strbuf();
} }
@ -1759,11 +1765,11 @@ static void handle_write_mem(GdbCmdContext *gdb_ctx, void *user_ctx)
return; return;
} }
hextomem(gdb_ctx->mem_buf, gdb_ctx->params[2].data, hextomem(gdbserver_state.mem_buf, gdb_ctx->params[2].data,
gdb_ctx->params[1].val_ull); gdb_ctx->params[1].val_ull);
if (target_memory_rw_debug(gdbserver_state.g_cpu, gdb_ctx->params[0].val_ull, if (target_memory_rw_debug(gdbserver_state.g_cpu, gdb_ctx->params[0].val_ull,
gdb_ctx->mem_buf, gdbserver_state.mem_buf->data,
gdb_ctx->params[1].val_ull, true)) { gdbserver_state.mem_buf->len, true)) {
put_packet("E14"); put_packet("E14");
return; return;
} }
@ -1784,14 +1790,17 @@ static void handle_read_mem(GdbCmdContext *gdb_ctx, void *user_ctx)
return; return;
} }
g_byte_array_set_size(gdbserver_state.mem_buf, gdb_ctx->params[1].val_ull);
if (target_memory_rw_debug(gdbserver_state.g_cpu, gdb_ctx->params[0].val_ull, if (target_memory_rw_debug(gdbserver_state.g_cpu, gdb_ctx->params[0].val_ull,
gdb_ctx->mem_buf, gdbserver_state.mem_buf->data,
gdb_ctx->params[1].val_ull, false)) { gdbserver_state.mem_buf->len, false)) {
put_packet("E14"); put_packet("E14");
return; return;
} }
memtohex(gdbserver_state.str_buf, gdb_ctx->mem_buf, gdb_ctx->params[1].val_ull); memtohex(gdbserver_state.str_buf, gdbserver_state.mem_buf->data,
gdbserver_state.mem_buf->len);
put_strbuf(); put_strbuf();
} }
@ -1806,9 +1815,9 @@ static void handle_write_all_regs(GdbCmdContext *gdb_ctx, void *user_ctx)
} }
cpu_synchronize_state(gdbserver_state.g_cpu); cpu_synchronize_state(gdbserver_state.g_cpu);
registers = gdb_ctx->mem_buf;
len = strlen(gdb_ctx->params[0].data) / 2; len = strlen(gdb_ctx->params[0].data) / 2;
hextomem(registers, gdb_ctx->params[0].data, len); hextomem(gdbserver_state.mem_buf, gdb_ctx->params[0].data, len);
registers = gdbserver_state.mem_buf->data;
for (addr = 0; addr < gdbserver_state.g_cpu->gdb_num_g_regs && len > 0; for (addr = 0; addr < gdbserver_state.g_cpu->gdb_num_g_regs && len > 0;
addr++) { addr++) {
reg_size = gdb_write_register(gdbserver_state.g_cpu, registers, addr); reg_size = gdb_write_register(gdbserver_state.g_cpu, registers, addr);
@ -1825,11 +1834,14 @@ static void handle_read_all_regs(GdbCmdContext *gdb_ctx, void *user_ctx)
cpu_synchronize_state(gdbserver_state.g_cpu); cpu_synchronize_state(gdbserver_state.g_cpu);
len = 0; len = 0;
for (addr = 0; addr < gdbserver_state.g_cpu->gdb_num_g_regs; addr++) { for (addr = 0; addr < gdbserver_state.g_cpu->gdb_num_g_regs; addr++) {
len += gdb_read_register(gdbserver_state.g_cpu, gdb_ctx->mem_buf + len, len += gdb_read_register(gdbserver_state.g_cpu,
gdbserver_state.mem_buf->data + len,
addr); addr);
} }
/* FIXME: This is after the fact sizing */
g_byte_array_set_size(gdbserver_state.mem_buf, len);
memtohex(gdbserver_state.str_buf, gdb_ctx->mem_buf, len); memtohex(gdbserver_state.str_buf, gdbserver_state.mem_buf->data, len);
put_strbuf(); put_strbuf();
} }
@ -2078,6 +2090,7 @@ static void handle_query_offsets(GdbCmdContext *gdb_ctx, void *user_ctx)
#else #else
static void handle_query_rcmd(GdbCmdContext *gdb_ctx, void *user_ctx) static void handle_query_rcmd(GdbCmdContext *gdb_ctx, void *user_ctx)
{ {
const guint8 zero = 0;
int len; int len;
if (!gdb_ctx->num_params) { if (!gdb_ctx->num_params) {
@ -2091,12 +2104,13 @@ static void handle_query_rcmd(GdbCmdContext *gdb_ctx, void *user_ctx)
return; return;
} }
g_assert(gdbserver_state.mem_buf->len == 0);
len = len / 2; len = len / 2;
hextomem(gdb_ctx->mem_buf, gdb_ctx->params[0].data, len); hextomem(gdbserver_state.mem_buf, gdb_ctx->params[0].data, len);
gdb_ctx->mem_buf[len++] = 0; g_byte_array_append(gdbserver_state.mem_buf, &zero, 1);
qemu_chr_be_write(gdbserver_state.mon_chr, gdb_ctx->mem_buf, len); qemu_chr_be_write(gdbserver_state.mon_chr, gdbserver_state.mem_buf->data,
gdbserver_state.mem_buf->len);
put_packet("OK"); put_packet("OK");
} }
#endif #endif