sys64738
/
blackmagic
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

gdb_main: More type confusion fixes and cleanup

This commit is contained in:
dragonmux 2022-07-20 01:42:26 +01:00 committed by Piotr Esden-Tempski
parent 75d7dd32d1
commit 00c09b4156
1 changed files with 55 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

114
src/gdb_main.c
View File

@ -48,7 +48,7 @@ enum gdb_signal {
GDB_SIGLOST = 29, GDB_SIGLOST = 29,
}; };
#define BUF_SIZE 1024 #define BUF_SIZE 1024U
#define ERROR_IF_NO_TARGET() \ #define ERROR_IF_NO_TARGET() \
if(!cur_target) { gdb_putpacketz("EFF"); break; } if(!cur_target) { gdb_putpacketz("EFF"); break; }
@ -56,17 +56,17 @@ enum gdb_signal {
typedef struct typedef struct
{ {
const char *cmd_prefix; const char *cmd_prefix;
void (*func)(const char *packet, int len); void (*func)(const char *packet, size_t len);
} cmd_executer; } cmd_executer;
static char pbuf[BUF_SIZE + 1]; static char pbuf[BUF_SIZE + 1U];
static target *cur_target; static target *cur_target;
static target *last_target; static target *last_target;
static void handle_q_packet(char *packet, int len); static void handle_q_packet(char *packet, size_t len);
static void handle_v_packet(char *packet, int len); static void handle_v_packet(char *packet, size_t len);
static void handle_z_packet(char *packet, int len); static void handle_z_packet(char *packet, size_t len);
static void gdb_target_destroy_callback(struct target_controller *tc, target *t) static void gdb_target_destroy_callback(struct target_controller *tc, target *t)
{ {
@ -148,7 +148,8 @@ int gdb_main_loop(struct target_controller *tc, bool in_syscall)
break; break;
} }
case 'M': { /* 'M addr,len:XX': Write len bytes to addr */ case 'M': { /* 'M addr,len:XX': Write len bytes to addr */
uint32_t addr, len; uint32_t addr = 0;
uint32_t len = 0;
int hex; int hex;
ERROR_IF_NO_TARGET(); ERROR_IF_NO_TARGET();
sscanf(pbuf, "M%" SCNx32 ",%" SCNx32 ":%n", &addr, &len, &hex); sscanf(pbuf, "M%" SCNx32 ",%" SCNx32 ":%n", &addr, &len, &hex);
@ -355,12 +356,12 @@ int gdb_main_loop(struct target_controller *tc, bool in_syscall)
} }
} }
static bool exec_command(char *packet, int len, const cmd_executer *exec) static bool exec_command(char *packet, const size_t length, const cmd_executer *exec)
{ {
while (exec->cmd_prefix) { while (exec->cmd_prefix) {
const int l = strlen(exec->cmd_prefix); const size_t prefix_length = strlen(exec->cmd_prefix);
if (!strncmp(packet, exec->cmd_prefix, l)) { if (!strncmp(packet, exec->cmd_prefix, prefix_length)) {
exec->func(packet + l, len - l); exec->func(packet + prefix_length, length - prefix_length);
return true; return true;
} }
++exec; ++exec;
@ -368,21 +369,18 @@ static bool exec_command(char *packet, int len, const cmd_executer *exec)
return false; return false;
} }
static void exec_q_rcmd(const char *packet,int len) static void exec_q_rcmd(const char *packet, const size_t length)
{ {
char *data;
int datalen;
/* calculate size and allocate buffer for command */ /* calculate size and allocate buffer for command */
datalen = len / 2; const size_t datalen = length / 2U;
// This needs replacing with something more sensible. // This needs replacing with something more sensible.
// It should be pinging -Wvla among other things, and it failing is straight-up UB // It should be pinging -Wvla among other things, and it failing is straight-up UB
data = alloca(datalen + 1); char *data = alloca(datalen + 1);
/* dehexify command */ /* dehexify command */
unhexify(data, packet, datalen); unhexify(data, packet, datalen);
data[datalen] = 0; /* add terminating null */ data[datalen] = 0; /* add terminating null */
int c = command_process(cur_target, data); const int c = command_process(cur_target, data);
if (c < 0) if (c < 0)
gdb_putpacketz(""); gdb_putpacketz("");
else if (c == 0) else if (c == 0)
@ -392,41 +390,41 @@ static void exec_q_rcmd(const char *packet,int len)
2 * strlen("Failed\n")); 2 * strlen("Failed\n"));
} }
static void static void handle_q_string_reply(const char *reply, const char *param)
handle_q_string_reply(const char *str, const char *param)
{ {
unsigned long addr, len; const size_t reply_length = strlen(reply);
const size_t str_len = strlen(str); uint32_t addr = 0;
uint32_t len = 0;
if (sscanf(param, "%08lx,%08lx", &addr, &len) != 2) { if (sscanf(param, "%08" PRIx32 ",%08" PRIx32, &addr, &len) != 2) {
gdb_putpacketz("E01"); gdb_putpacketz("E01");
return; return;
} }
else if (addr > str_len) { if (addr > reply_length) {
gdb_putpacketz("E01"); gdb_putpacketz("E01");
return; return;
} }
else if (addr == str_len) { if (addr == reply_length) {
gdb_putpacketz("l"); gdb_putpacketz("l");
return; return;
} }
unsigned long output_len = str_len - addr; size_t output_len = reply_length - addr;
if (output_len > len) if (output_len > len)
output_len = len; output_len = len;
gdb_putpacket2("m", 1, str + addr, output_len); gdb_putpacket2("m", 1U, reply + addr, output_len);
} }
static void exec_q_supported(const char *packet, int len) static void exec_q_supported(const char *packet, const size_t length)
{ {
(void)packet; (void)packet;
(void)len; (void)length;
gdb_putpacket_f("PacketSize=%X;qXfer:memory-map:read+;qXfer:features:read+", BUF_SIZE); gdb_putpacket_f("PacketSize=%X;qXfer:memory-map:read+;qXfer:features:read+", BUF_SIZE);
} }
static void exec_q_memory_map(const char *packet, int len) static void exec_q_memory_map(const char *packet, const size_t length)
{ {
(void)packet; (void)packet;
(void)len; (void)length;
/* Read target XML memory map */ /* Read target XML memory map */
if ((!cur_target) && last_target) { if ((!cur_target) && last_target) {
/* Attach to last target if detached. */ /* Attach to last target if detached. */
@ -442,9 +440,9 @@ static void exec_q_memory_map(const char *packet, int len)
handle_q_string_reply(buf, packet); handle_q_string_reply(buf, packet);
} }
static void exec_q_feature_read(const char *packet, int len) static void exec_q_feature_read(const char *packet, const size_t length)
{ {
(void)len; (void)length;
/* Read target description */ /* Read target description */
if ((!cur_target) && last_target) { if ((!cur_target) && last_target) {
/* Attach to last target if detached. */ /* Attach to last target if detached. */
@ -457,18 +455,18 @@ static void exec_q_feature_read(const char *packet, int len)
handle_q_string_reply(target_tdesc(cur_target), packet); handle_q_string_reply(target_tdesc(cur_target), packet);
} }
static void exec_q_crc(const char *packet, int len) static void exec_q_crc(const char *packet, const size_t length)
{ {
(void)len; (void)length;
uint32_t addr, alen; uint32_t addr;
if (sscanf(packet, "%" PRIx32 ",%" PRIx32, &addr, &alen) == 2) { uint32_t addr_length;
if (sscanf(packet, "%" PRIx32 ",%" PRIx32, &addr, &addr_length) == 2) {
if (!cur_target) { if (!cur_target) {
gdb_putpacketz("E01"); gdb_putpacketz("E01");
return; return;
} }
uint32_t crc; uint32_t crc;
int res = generic_crc32(cur_target, &crc, addr, alen); if (generic_crc32(cur_target, &crc, addr, addr_length))
if (res)
gdb_putpacketz("E03"); gdb_putpacketz("E03");
else else
gdb_putpacket_f("C%lx", crc); gdb_putpacket_f("C%lx", crc);
@ -485,23 +483,22 @@ static const cmd_executer q_commands[]=
{NULL, NULL}, {NULL, NULL},
}; };
static void static void handle_q_packet(char *packet, const size_t length)
handle_q_packet(char *packet, int len)
{ {
if (exec_command(packet, len, q_commands)) if (exec_command(packet, length, q_commands))
return; return;
DEBUG_GDB("*** Unsupported packet: %s\n", packet); DEBUG_GDB("*** Unsupported packet: %s\n", packet);
gdb_putpacket("", 0); gdb_putpacket("", 0);
} }
static void static void handle_v_packet(char *packet, const size_t plen)
handle_v_packet(char *packet, int plen)
{ {
unsigned long addr, len; uint32_t addr = 0;
uint32_t len = 0;
int bin; int bin;
static uint8_t flash_mode = 0; static uint8_t flash_mode = 0;
if (sscanf(packet, "vAttach;%08lx", &addr) == 1) { if (sscanf(packet, "vAttach;%08" PRIx32, &addr) == 1) {
/* Attach to remote target processor */ /* Attach to remote target processor */
cur_target = target_attach_n(addr, &gdb_controller); cur_target = target_attach_n(addr, &gdb_controller);
if(cur_target) { if(cur_target) {
@ -565,9 +562,9 @@ handle_v_packet(char *packet, int plen)
} else } else
gdb_putpacketz("E01"); gdb_putpacketz("E01");
} else if (sscanf(packet, "vFlashErase:%08lx,%08lx", &addr, &len) == 2) { } else if (sscanf(packet, "vFlashErase:%08" PRIx32 ",%08" PRIx32, &addr, &len) == 2) {
/* Erase Flash Memory */ /* Erase Flash Memory */
DEBUG_GDB("Flash Erase %08lX %08lX\n", addr, len); DEBUG_GDB("Flash Erase %08zX %08zX\n", addr, len);
if (!cur_target) { if (!cur_target) {
gdb_putpacketz("EFF"); gdb_putpacketz("EFF");
return; return;
@ -586,11 +583,11 @@ handle_v_packet(char *packet, int plen)
gdb_putpacketz("EFF"); gdb_putpacketz("EFF");
} }
} else if (sscanf(packet, "vFlashWrite:%08lx:%n", &addr, &bin) == 1) { } else if (sscanf(packet, "vFlashWrite:%08" PRIx32 ":%n", &addr, &bin) == 1) {
/* Write Flash Memory */ /* Write Flash Memory */
len = plen - bin; const size_t count = plen - bin;
DEBUG_GDB("Flash Write %08lX %08lX\n", addr, len); DEBUG_GDB("Flash Write %08zX %08zX\n", addr, count);
if (cur_target && target_flash_write(cur_target, addr, (void*)packet + bin, len) == 0) if (cur_target && target_flash_write(cur_target, addr, (void*)packet + bin, count) == 0)
gdb_putpacketz("OK"); gdb_putpacketz("OK");
else { else {
flash_mode = 0; flash_mode = 0;
@ -608,18 +605,17 @@ handle_v_packet(char *packet, int plen)
} }
} }
static void static void handle_z_packet(char *packet, const size_t plen)
handle_z_packet(char *packet, int plen)
{ {
(void)plen; (void)plen;
uint8_t set = (packet[0] == 'Z') ? 1 : 0; uint32_t type;
int type, len; uint32_t len;
uint32_t addr; uint32_t addr;
int ret; sscanf(packet, "%*[zZ]%" PRIu32 ",%08" PRIx32 ",%" PRIu32, &type, &addr, &len);
sscanf(packet, "%*[zZ]%d,%08" PRIx32 ",%d", &type, &addr, &len); int ret = 0;
if(set) if (packet[0] == 'Z')
ret = target_breakwatch_set(cur_target, type, addr, len); ret = target_breakwatch_set(cur_target, type, addr, len);
else else
ret = target_breakwatch_clear(cur_target, type, addr, len); ret = target_breakwatch_clear(cur_target, type, addr, len);