X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fserver%2Fgdb_server.c;h=e417bf45ca4228d4120a5d05a96e890259943cc4;hb=35fdbdcecd4fb829e6f31bfd95b874979e0abd6f;hp=a930ec4106b845603b722afcafa1012769fc3c6f;hpb=c6216201b249e6a97fcc085e413e3d34e0de6fb7;p=fw%2Fopenocd diff --git a/src/server/gdb_server.c b/src/server/gdb_server.c index a930ec410..e417bf45c 100644 --- a/src/server/gdb_server.c +++ b/src/server/gdb_server.c @@ -60,6 +60,11 @@ * found in most modern embedded processors. */ +struct target_desc_format { + char *tdesc; + uint32_t tdesc_length; +}; + /* private connection data for GDB */ struct gdb_connection { char buffer[GDB_BUFFER_SIZE]; @@ -85,6 +90,8 @@ struct gdb_connection { * normally we reply with a S reply via gdb_last_signal_packet. * as a side note this behaviour only effects gdb > 6.8 */ bool attached; + /* temporarily used for target description support */ + struct target_desc_format target_desc; }; #if 0 @@ -97,8 +104,8 @@ static int gdb_breakpoint_override; static enum breakpoint_type gdb_breakpoint_override_type; static int gdb_error(struct connection *connection, int retval); -static const char *gdb_port; -static const char *gdb_port_next; +static char *gdb_port; +static char *gdb_port_next; static void gdb_log_callback(void *priv, const char *file, unsigned line, const char *function, const char *string); @@ -610,11 +617,21 @@ static int gdb_get_packet_inner(struct connection *connection, case '$': break; case '+': - /* gdb sends a dummy ack '+' at every remote connect - see - * remote_start_remote (remote.c) - * in case anyone tries to debug why they receive this - * warning every time */ - LOG_WARNING("acknowledgment received, but no packet pending"); + /* According to the GDB documentation + * (https://sourceware.org/gdb/onlinedocs/gdb/Packet-Acknowledgment.html): + * "gdb sends a final `+` acknowledgment of the stub's `OK` + * response, which can be safely ignored by the stub." + * However OpenOCD server already is in noack mode at this + * point and instead of ignoring this it was emitting a + * warning. This code makes server ignore the first ACK + * that will be received after going into noack mode, + * warning only about subsequent ACK's. */ + if (gdb_con->noack_mode > 1) { + LOG_WARNING("acknowledgment received, but no packet pending"); + } else { + LOG_DEBUG("Received first acknowledgment after entering noack mode. Ignoring it."); + gdb_con->noack_mode = 2; + } break; case '-': LOG_WARNING("negative acknowledgment, but no packet pending"); @@ -721,15 +738,15 @@ static void gdb_signal_reply(struct target *target, struct connection *connectio switch (hit_wp_type) { case WPT_WRITE: snprintf(stop_reason, sizeof(stop_reason), - "watch:%08x;", hit_wp_address); + "watch:%08" PRIx32 ";", hit_wp_address); break; case WPT_READ: snprintf(stop_reason, sizeof(stop_reason), - "rwatch:%08x;", hit_wp_address); + "rwatch:%08" PRIx32 ";", hit_wp_address); break; case WPT_ACCESS: snprintf(stop_reason, sizeof(stop_reason), - "awatch:%08x;", hit_wp_address); + "awatch:%08" PRIx32 ";", hit_wp_address); break; default: break; @@ -754,64 +771,64 @@ static void gdb_fileio_reply(struct target *target, struct connection *connectio bool program_exited = false; if (strcmp(target->fileio_info->identifier, "open") == 0) - sprintf(fileio_command, "F%s,%x/%x,%x,%x", target->fileio_info->identifier, + sprintf(fileio_command, "F%s,%" PRIx32 "/%" PRIx32 ",%" PRIx32 ",%" PRIx32, target->fileio_info->identifier, target->fileio_info->param_1, target->fileio_info->param_2, target->fileio_info->param_3, target->fileio_info->param_4); else if (strcmp(target->fileio_info->identifier, "close") == 0) - sprintf(fileio_command, "F%s,%x", target->fileio_info->identifier, + sprintf(fileio_command, "F%s,%" PRIx32, target->fileio_info->identifier, target->fileio_info->param_1); else if (strcmp(target->fileio_info->identifier, "read") == 0) - sprintf(fileio_command, "F%s,%x,%x,%x", target->fileio_info->identifier, + sprintf(fileio_command, "F%s,%" PRIx32 ",%" PRIx32 ",%" PRIx32, target->fileio_info->identifier, target->fileio_info->param_1, target->fileio_info->param_2, target->fileio_info->param_3); else if (strcmp(target->fileio_info->identifier, "write") == 0) - sprintf(fileio_command, "F%s,%x,%x,%x", target->fileio_info->identifier, + sprintf(fileio_command, "F%s,%" PRIx32 ",%" PRIx32 ",%" PRIx32, target->fileio_info->identifier, target->fileio_info->param_1, target->fileio_info->param_2, target->fileio_info->param_3); else if (strcmp(target->fileio_info->identifier, "lseek") == 0) - sprintf(fileio_command, "F%s,%x,%x,%x", target->fileio_info->identifier, + sprintf(fileio_command, "F%s,%" PRIx32 ",%" PRIx32 ",%" PRIx32, target->fileio_info->identifier, target->fileio_info->param_1, target->fileio_info->param_2, target->fileio_info->param_3); else if (strcmp(target->fileio_info->identifier, "rename") == 0) - sprintf(fileio_command, "F%s,%x/%x,%x/%x", target->fileio_info->identifier, + sprintf(fileio_command, "F%s,%" PRIx32 "/%" PRIx32 ",%" PRIx32 "/%" PRIx32, target->fileio_info->identifier, target->fileio_info->param_1, target->fileio_info->param_2, target->fileio_info->param_3, target->fileio_info->param_4); else if (strcmp(target->fileio_info->identifier, "unlink") == 0) - sprintf(fileio_command, "F%s,%x/%x", target->fileio_info->identifier, + sprintf(fileio_command, "F%s,%" PRIx32 "/%" PRIx32, target->fileio_info->identifier, target->fileio_info->param_1, target->fileio_info->param_2); else if (strcmp(target->fileio_info->identifier, "stat") == 0) - sprintf(fileio_command, "F%s,%x/%x,%x", target->fileio_info->identifier, + sprintf(fileio_command, "F%s,%" PRIx32 "/%" PRIx32 ",%" PRIx32, target->fileio_info->identifier, target->fileio_info->param_1, target->fileio_info->param_2, target->fileio_info->param_3); else if (strcmp(target->fileio_info->identifier, "fstat") == 0) - sprintf(fileio_command, "F%s,%x,%x", target->fileio_info->identifier, + sprintf(fileio_command, "F%s,%" PRIx32 ",%" PRIx32, target->fileio_info->identifier, target->fileio_info->param_1, target->fileio_info->param_2); else if (strcmp(target->fileio_info->identifier, "gettimeofday") == 0) - sprintf(fileio_command, "F%s,%x,%x", target->fileio_info->identifier, + sprintf(fileio_command, "F%s,%" PRIx32 ",%" PRIx32, target->fileio_info->identifier, target->fileio_info->param_1, target->fileio_info->param_2); else if (strcmp(target->fileio_info->identifier, "isatty") == 0) - sprintf(fileio_command, "F%s,%x", target->fileio_info->identifier, + sprintf(fileio_command, "F%s,%" PRIx32, target->fileio_info->identifier, target->fileio_info->param_1); else if (strcmp(target->fileio_info->identifier, "system") == 0) - sprintf(fileio_command, "F%s,%x/%x", target->fileio_info->identifier, + sprintf(fileio_command, "F%s,%" PRIx32 "/%" PRIx32, target->fileio_info->identifier, target->fileio_info->param_1, target->fileio_info->param_2); else if (strcmp(target->fileio_info->identifier, "exit") == 0) { /* If target hits exit syscall, report to GDB the program is terminated. * In addition, let target run its own exit syscall handler. */ program_exited = true; - sprintf(fileio_command, "W%02x", target->fileio_info->param_1); + sprintf(fileio_command, "W%02" PRIx32, target->fileio_info->param_1); } else { LOG_DEBUG("Unknown syscall: %s", target->fileio_info->identifier); @@ -909,6 +926,8 @@ static int gdb_new_connection(struct connection *connection) gdb_connection->sync = false; gdb_connection->mem_write_error = false; gdb_connection->attached = true; + gdb_connection->target_desc.tdesc = NULL; + gdb_connection->target_desc.tdesc_length = 0; /* send ACK to GDB for debug request */ gdb_write(connection, "+", 1); @@ -948,6 +967,9 @@ static int gdb_new_connection(struct connection *connection) int i; for (i = 0; i < flash_get_bank_count(); i++) { struct flash_bank *p; + p = get_flash_bank_by_num_noprobe(i); + if (p->target != gdb_service->target) + continue; retval = get_flash_bank_by_num(i, &p); if (retval != ERROR_OK) { LOG_ERROR("Connect failed. Consider setting up a gdb-attach event for the target " \ @@ -1022,7 +1044,7 @@ static void gdb_send_error(struct connection *connection, uint8_t the_error) } static int gdb_last_signal_packet(struct connection *connection, - char *packet, int packet_size) + char const *packet, int packet_size) { struct target *target = get_target_from_connection(connection); struct gdb_connection *gdb_con = connection->priv; @@ -1079,7 +1101,7 @@ static void gdb_str_to_target(struct target *target, /* copy over in register buffer */ static void gdb_target_to_reg(struct target *target, - char *tstr, int str_len, uint8_t *bin) + char const *tstr, int str_len, uint8_t *bin) { if (str_len % 2) { LOG_ERROR("BUG: gdb value with uneven number of characters encountered"); @@ -1100,7 +1122,7 @@ static void gdb_target_to_reg(struct target *target, } static int gdb_get_registers_packet(struct connection *connection, - char *packet, int packet_size) + char const *packet, int packet_size) { struct target *target = get_target_from_connection(connection); struct reg **reg_list; @@ -1156,14 +1178,14 @@ static int gdb_get_registers_packet(struct connection *connection, } static int gdb_set_registers_packet(struct connection *connection, - char *packet, int packet_size) + char const *packet, int packet_size) { struct target *target = get_target_from_connection(connection); int i; struct reg **reg_list; int reg_list_size; int retval; - char *packet_p; + char const *packet_p; #ifdef _DEBUG_GDB_IO_ LOG_DEBUG("-"); @@ -1211,7 +1233,7 @@ static int gdb_set_registers_packet(struct connection *connection, } static int gdb_get_register_packet(struct connection *connection, - char *packet, int packet_size) + char const *packet, int packet_size) { struct target *target = get_target_from_connection(connection); char *reg_packet; @@ -1250,7 +1272,7 @@ static int gdb_get_register_packet(struct connection *connection, } static int gdb_set_register_packet(struct connection *connection, - char *packet, int packet_size) + char const *packet, int packet_size) { struct target *target = get_target_from_connection(connection); char *separator; @@ -1316,7 +1338,7 @@ static int gdb_error(struct connection *connection, int retval) * 8191 bytes by the looks of it. Why 8191 bytes instead of 8192????? */ static int gdb_read_memory_packet(struct connection *connection, - char *packet, int packet_size) + char const *packet, int packet_size) { struct target *target = get_target_from_connection(connection); char *separator; @@ -1340,6 +1362,12 @@ static int gdb_read_memory_packet(struct connection *connection, len = strtoul(separator + 1, NULL, 16); + if (!len) { + LOG_WARNING("invalid read memory packet received (len == 0)"); + gdb_put_packet(connection, NULL, 0); + return ERROR_OK; + } + buffer = malloc(len); LOG_DEBUG("addr: 0x%8.8" PRIx32 ", len: 0x%8.8" PRIx32 "", addr, len); @@ -1381,7 +1409,7 @@ static int gdb_read_memory_packet(struct connection *connection, } static int gdb_write_memory_packet(struct connection *connection, - char *packet, int packet_size) + char const *packet, int packet_size) { struct target *target = get_target_from_connection(connection); char *separator; @@ -1428,7 +1456,7 @@ static int gdb_write_memory_packet(struct connection *connection, } static int gdb_write_memory_binary_packet(struct connection *connection, - char *packet, int packet_size) + char const *packet, int packet_size) { struct target *target = get_target_from_connection(connection); char *separator; @@ -1485,7 +1513,7 @@ static int gdb_write_memory_binary_packet(struct connection *connection, } static int gdb_step_continue_packet(struct connection *connection, - char *packet, int packet_size) + char const *packet, int packet_size) { struct target *target = get_target_from_connection(connection); int current = 0; @@ -1494,10 +1522,9 @@ static int gdb_step_continue_packet(struct connection *connection, LOG_DEBUG("-"); - if (packet_size > 1) { - packet[packet_size] = 0; + if (packet_size > 1) address = strtoul(packet + 1, NULL, 16); - } else + else current = 1; gdb_running_type = packet[0]; @@ -1514,7 +1541,7 @@ static int gdb_step_continue_packet(struct connection *connection, } static int gdb_breakpoint_watchpoint_packet(struct connection *connection, - char *packet, int packet_size) + char const *packet, int packet_size) { struct target *target = get_target_from_connection(connection); int type; @@ -1642,29 +1669,41 @@ static void xml_printf(int *retval, char **xml, int *pos, int *size, } } -static int decode_xfer_read(char *buf, char **annex, int *ofs, unsigned int *len) +static int decode_xfer_read(char const *_buf, char **annex, int *ofs, unsigned int *len) { + int ret = 0; + char *buf = strdup(_buf); + char *_annex; char *separator; /* Extract and NUL-terminate the annex. */ - *annex = buf; + _annex = buf; while (*buf && *buf != ':') buf++; - if (*buf == '\0') - return -1; + if (*buf == '\0') { + ret = -1; + goto out; + } *buf++ = 0; + /* Return annex as copy because "buf" will be freed in this function */ + *annex = strdup(_annex); + /* After the read marker and annex, qXfer looks like a * traditional 'm' packet. */ *ofs = strtoul(buf, &separator, 16); - if (*separator != ',') - return -1; + if (*separator != ',') { + ret = -1; + goto out; + } *len = strtoul(separator + 1, NULL, 16); - return 0; +out: + free(buf); + return ret; } static int compare_bank(const void *a, const void *b) @@ -1682,7 +1721,7 @@ static int compare_bank(const void *a, const void *b) } static int gdb_memory_map(struct connection *connection, - char *packet, int packet_size) + char const *packet, int packet_size) { /* We get away with only specifying flash here. Regions that are not * specified are treated as if we provided no memory map(if not we @@ -1723,14 +1762,16 @@ static int gdb_memory_map(struct connection *connection, banks = malloc(sizeof(struct flash_bank *)*flash_get_bank_count()); for (i = 0; i < flash_get_bank_count(); i++) { + p = get_flash_bank_by_num_noprobe(i); + if (p->target != target) + continue; retval = get_flash_bank_by_num(i, &p); if (retval != ERROR_OK) { free(banks); gdb_error(connection, retval); return retval; } - if (p->target == target) - banks[target_flash_banks++] = p; + banks[target_flash_banks++] = p; } qsort(banks, target_flash_banks, sizeof(struct flash_bank *), @@ -1967,7 +2008,7 @@ static int gdb_generate_reg_type_description(struct target *target, /* Get a list of available target registers features. feature_list must * be freed by caller. */ -int get_reg_features_list(struct target *target, char **feature_list[], int *feature_list_size, +static int get_reg_features_list(struct target *target, char **feature_list[], int *feature_list_size, struct reg **reg_list, int reg_list_size) { int tbl_sz = 0; @@ -1979,7 +2020,8 @@ int get_reg_features_list(struct target *target, char **feature_list[], int *fea if (reg_list[i]->exist == false) continue; - if ((reg_list[i]->feature->name != NULL) + if (reg_list[i]->feature != NULL + && reg_list[i]->feature->name != NULL && (strcmp(reg_list[i]->feature->name, ""))) { /* We found a feature, check if the feature is already in the * table. If not, allocate a new entry for the table and @@ -2005,46 +2047,53 @@ int get_reg_features_list(struct target *target, char **feature_list[], int *fea return ERROR_OK; } -static int gdb_generate_target_description(struct target *target, char **tdesc) +static int gdb_generate_target_description(struct target *target, char **tdesc_out) { int retval = ERROR_OK; - struct reg **reg_list; + struct reg **reg_list = NULL; int reg_list_size; + char **features = NULL; + int feature_list_size = 0; + char *tdesc = NULL; int pos = 0; int size = 0; - xml_printf(&retval, tdesc, &pos, &size, - "\n" - "\n" - "\n"); - retval = target_get_gdb_reg_list(target, ®_list, ®_list_size, REG_CLASS_ALL); if (retval != ERROR_OK) { LOG_ERROR("get register list failed"); - return ERROR_FAIL; + retval = ERROR_FAIL; + goto error; } - if (reg_list_size <= 0) - return ERROR_FAIL; + if (reg_list_size <= 0) { + LOG_ERROR("get register list failed"); + retval = ERROR_FAIL; + goto error; + } - char **features = NULL; /* Get a list of available target registers features */ - retval = get_reg_features_list(target, &features, NULL, reg_list, reg_list_size); + retval = get_reg_features_list(target, &features, &feature_list_size, reg_list, reg_list_size); if (retval != ERROR_OK) { LOG_ERROR("Can't get the registers feature list"); - return ERROR_FAIL; + retval = ERROR_FAIL; + goto error; } /* If we found some features associated with registers, create sections */ int current_feature = 0; + xml_printf(&retval, &tdesc, &pos, &size, + "\n" + "\n" + "\n"); + /* generate target description according to register list */ if (features != NULL) { while (features[current_feature]) { - xml_printf(&retval, tdesc, &pos, &size, + xml_printf(&retval, &tdesc, &pos, &size, "\n", features[current_feature]); @@ -2061,7 +2110,7 @@ static int gdb_generate_target_description(struct target *target, char **tdesc) if (reg_list[i]->reg_data_type != NULL) { if (reg_list[i]->reg_data_type->type == REG_TYPE_ARCH_DEFINED) { /* generate reg_data_type); type_str = reg_list[i]->reg_data_type->id; @@ -2075,57 +2124,74 @@ static int gdb_generate_target_description(struct target *target, char **tdesc) type_str = "int"; } - xml_printf(&retval, tdesc, &pos, &size, + xml_printf(&retval, &tdesc, &pos, &size, "name); - xml_printf(&retval, tdesc, &pos, &size, + xml_printf(&retval, &tdesc, &pos, &size, " bitsize=\"%d\"", reg_list[i]->size); - xml_printf(&retval, tdesc, &pos, &size, + xml_printf(&retval, &tdesc, &pos, &size, " regnum=\"%d\"", reg_list[i]->number); if (reg_list[i]->caller_save) - xml_printf(&retval, tdesc, &pos, &size, + xml_printf(&retval, &tdesc, &pos, &size, " save-restore=\"yes\""); else - xml_printf(&retval, tdesc, &pos, &size, + xml_printf(&retval, &tdesc, &pos, &size, " save-restore=\"no\""); - xml_printf(&retval, tdesc, &pos, &size, + xml_printf(&retval, &tdesc, &pos, &size, " type=\"%s\"", type_str); if (reg_list[i]->group != NULL) - xml_printf(&retval, tdesc, &pos, &size, + xml_printf(&retval, &tdesc, &pos, &size, " group=\"%s\"", reg_list[i]->group); - xml_printf(&retval, tdesc, &pos, &size, + xml_printf(&retval, &tdesc, &pos, &size, "/>\n"); } - xml_printf(&retval, tdesc, &pos, &size, + xml_printf(&retval, &tdesc, &pos, &size, "\n"); current_feature++; } } - xml_printf(&retval, tdesc, &pos, &size, + xml_printf(&retval, &tdesc, &pos, &size, "\n"); - if (reg_list != NULL) - free(reg_list); +error: - if (features != NULL) - free(features); + /* note: features[] contains (feature_list_size + 1) elements */ + for (int j = feature_list_size; j >= 0; j--) + free(features[j]); + free(features); + free(reg_list); - return ERROR_OK; + if (retval == ERROR_OK) + *tdesc_out = tdesc; + else + free(tdesc); + + return retval; } -static int gdb_get_target_description_chunk(struct target *target, char **chunk, - int32_t offset, uint32_t length) +static int gdb_get_target_description_chunk(struct target *target, struct target_desc_format *target_desc, + char **chunk, int32_t offset, uint32_t length) { - static char *tdesc; - static uint32_t tdesc_length; + if (target_desc == NULL) { + LOG_ERROR("Unable to Generate Target Description"); + return ERROR_FAIL; + } + + char *tdesc = target_desc->tdesc; + uint32_t tdesc_length = target_desc->tdesc_length; if (tdesc == NULL) { - gdb_generate_target_description(target, &tdesc); + int retval = gdb_generate_target_description(target, &tdesc); + if (retval != ERROR_OK) { + LOG_ERROR("Unable to Generate Target Description"); + return ERROR_FAIL; + } + tdesc_length = strlen(tdesc); } @@ -2137,6 +2203,11 @@ static int gdb_get_target_description_chunk(struct target *target, char **chunk, transfer_type = 'l'; *chunk = malloc(length + 2); + if (*chunk == NULL) { + LOG_ERROR("Unable to allocate memory"); + return ERROR_FAIL; + } + (*chunk)[0] = transfer_type; if (transfer_type == 'm') { strncpy((*chunk) + 1, tdesc + offset, length); @@ -2151,6 +2222,9 @@ static int gdb_get_target_description_chunk(struct target *target, char **chunk, tdesc_length = 0; } + target_desc->tdesc = tdesc; + target_desc->tdesc_length = tdesc_length; + return ERROR_OK; } @@ -2159,6 +2233,7 @@ static int gdb_target_description_supported(struct target *target, int *supporte int retval = ERROR_OK; struct reg **reg_list = NULL; int reg_list_size = 0; + char **features = NULL; int feature_list_size = 0; retval = target_get_gdb_reg_list(target, ®_list, @@ -2169,11 +2244,11 @@ static int gdb_target_description_supported(struct target *target, int *supporte } if (reg_list_size <= 0) { + LOG_ERROR("get register list failed"); retval = ERROR_FAIL; goto error; } - char **features = NULL; /* Get a list of available target registers features */ retval = get_reg_features_list(target, &features, &feature_list_size, reg_list, reg_list_size); if (retval != ERROR_OK) { @@ -2189,17 +2264,19 @@ static int gdb_target_description_supported(struct target *target, int *supporte } error: - if (reg_list != NULL) - free(reg_list); - if (features != NULL) - free(features); + /* note: features[] contains (feature_list_size + 1) elements */ + for (int j = feature_list_size; j >= 0; j--) + free(features[j]); + free(features); + + free(reg_list); return retval; } static int gdb_query_packet(struct connection *connection, - char *packet, int packet_size) + char const *packet, int packet_size) { struct command_context *cmd_ctx = connection->cmd_ctx; struct gdb_connection *gdb_connection = connection->priv; @@ -2310,7 +2387,7 @@ static int gdb_query_packet(struct connection *connection, int offset; unsigned int length; - char *annex; + char *annex = NULL; /* skip command character */ packet += 20; @@ -2319,13 +2396,15 @@ static int gdb_query_packet(struct connection *connection, gdb_send_error(connection, 01); return ERROR_OK; } + free(annex); /* Target should prepare correct target description for annex. * The first character of returned xml is 'm' or 'l'. 'm' for * there are *more* chunks to transfer. 'l' for it is the *last* * chunk of target description. */ - retval = gdb_get_target_description_chunk(target, &xml, offset, length); + retval = gdb_get_target_description_chunk(target, &gdb_connection->target_desc, + &xml, offset, length); if (retval != ERROR_OK) { gdb_error(connection, retval); return retval; @@ -2346,7 +2425,7 @@ static int gdb_query_packet(struct connection *connection, } static int gdb_v_packet(struct connection *connection, - char *packet, int packet_size) + char const *packet, int packet_size) { struct gdb_connection *gdb_connection = connection->priv; struct gdb_service *gdb_service = connection->service->priv; @@ -2363,20 +2442,20 @@ static int gdb_v_packet(struct connection *connection, unsigned long addr; unsigned long length; - char *parse = packet + 12; + char const *parse = packet + 12; if (*parse == '\0') { LOG_ERROR("incomplete vFlashErase packet received, dropping connection"); return ERROR_SERVER_REMOTE_CLOSED; } - addr = strtoul(parse, &parse, 16); + addr = strtoul(parse, (char **)&parse, 16); if (*(parse++) != ',' || *parse == '\0') { LOG_ERROR("incomplete vFlashErase packet received, dropping connection"); return ERROR_SERVER_REMOTE_CLOSED; } - length = strtoul(parse, &parse, 16); + length = strtoul(parse, (char **)&parse, 16); if (*parse != '\0') { LOG_ERROR("incomplete vFlashErase packet received, dropping connection"); @@ -2419,13 +2498,13 @@ static int gdb_v_packet(struct connection *connection, int retval; unsigned long addr; unsigned long length; - char *parse = packet + 12; + char const *parse = packet + 12; if (*parse == '\0') { LOG_ERROR("incomplete vFlashErase packet received, dropping connection"); return ERROR_SERVER_REMOTE_CLOSED; } - addr = strtoul(parse, &parse, 16); + addr = strtoul(parse, (char **)&parse, 16); if (*(parse++) != ':') { LOG_ERROR("incomplete vFlashErase packet received, dropping connection"); return ERROR_SERVER_REMOTE_CLOSED; @@ -2440,7 +2519,7 @@ static int gdb_v_packet(struct connection *connection, /* create new section with content from packet buffer */ retval = image_add_section(gdb_connection->vflash_image, - addr, length, 0x0, (uint8_t *)parse); + addr, length, 0x0, (uint8_t const *)parse); if (retval != ERROR_OK) return retval; @@ -2492,7 +2571,7 @@ static int gdb_detach(struct connection *connection) * Fretcode,errno,Ctrl-C flag;call-specific attachment */ static int gdb_fileio_response_packet(struct connection *connection, - char *packet, int packet_size) + char const *packet, int packet_size) { struct target *target = get_target_from_connection(connection); char *separator; @@ -2564,7 +2643,7 @@ static int gdb_input_inner(struct connection *connection) struct gdb_service *gdb_service = connection->service->priv; struct target *target = gdb_service->target; - char *packet = gdb_packet_buffer; + char const *packet = gdb_packet_buffer; int packet_size; int retval; struct gdb_connection *gdb_con = connection->priv; @@ -2583,12 +2662,12 @@ static int gdb_input_inner(struct connection *connection) */ do { packet_size = GDB_BUFFER_SIZE-1; - retval = gdb_get_packet(connection, packet, &packet_size); + retval = gdb_get_packet(connection, gdb_packet_buffer, &packet_size); if (retval != ERROR_OK) return retval; /* terminate with zero */ - packet[packet_size] = 0; + gdb_packet_buffer[packet_size] = '\0'; if (LOG_LEVEL_IS(LOG_LVL_DEBUG)) { if (packet[0] == 'X') { @@ -2866,7 +2945,7 @@ static int gdb_target_add_one(struct target *target) portnumber = strtol(gdb_port_next, &end, 0); if (!*end) { if (parse_long(gdb_port_next, &portnumber) == ERROR_OK) { - free((void *)gdb_port_next); + free(gdb_port_next); gdb_port_next = alloc_printf("%d", portnumber+1); } } @@ -2913,7 +2992,7 @@ COMMAND_HANDLER(handle_gdb_port_command) { int retval = CALL_COMMAND_HANDLER(server_pipe_command, &gdb_port); if (ERROR_OK == retval) { - free((void *)gdb_port_next); + free(gdb_port_next); gdb_port_next = strdup(gdb_port); } return retval; @@ -2981,41 +3060,46 @@ COMMAND_HANDLER(handle_gdb_target_description_command) COMMAND_HANDLER(handle_gdb_save_tdesc_command) { - static char *tdesc; - static uint32_t tdesc_length; + char *tdesc; + uint32_t tdesc_length; struct target *target = get_current_target(CMD_CTX); - char *tdesc_filename; - if (tdesc == NULL) { - gdb_generate_target_description(target, &tdesc); - tdesc_length = strlen(tdesc); + int retval = gdb_generate_target_description(target, &tdesc); + if (retval != ERROR_OK) { + LOG_ERROR("Unable to Generate Target Description"); + return ERROR_FAIL; } + tdesc_length = strlen(tdesc); + struct fileio fileio; size_t size_written; - tdesc_filename = malloc(strlen(target_type_name(target)) + 5); - sprintf(tdesc_filename, "%s.xml", target_type_name(target)); + char *tdesc_filename = alloc_printf("%s.xml", target_type_name(target)); + if (tdesc_filename == NULL) { + retval = ERROR_FAIL; + goto out; + } - int retval = fileio_open(&fileio, tdesc_filename, FILEIO_WRITE, FILEIO_TEXT); + retval = fileio_open(&fileio, tdesc_filename, FILEIO_WRITE, FILEIO_TEXT); if (retval != ERROR_OK) { - LOG_WARNING("Can't open %s for writing", tdesc_filename); - free(tdesc_filename); - return ERROR_FAIL; + LOG_ERROR("Can't open %s for writing", tdesc_filename); + goto out; } retval = fileio_write(&fileio, tdesc_length, tdesc, &size_written); fileio_close(&fileio); - free(tdesc_filename); - if (retval != ERROR_OK) { - LOG_WARNING("Error while writing the tdesc file"); - return ERROR_FAIL; - } + if (retval != ERROR_OK) + LOG_ERROR("Error while writing the tdesc file"); - return ERROR_OK; +out: + free(tdesc_filename); + free(tdesc); + + return retval; } static const struct command_registration gdb_command_handlers[] = {