X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fserver%2Fgdb_server.c;h=9558aef9484662c3cb9c37c22bc9315271b937ef;hp=01d09791ad97cc6f3118b29e80c233a04630ca5d;hb=82eda37fe39e6c101212a0918efb0d209b6000af;hpb=5eedf3e1cef2f2b440519f867c9cb449f616b8cd diff --git a/src/server/gdb_server.c b/src/server/gdb_server.c index 01d09791ad..9558aef948 100644 --- a/src/server/gdb_server.c +++ b/src/server/gdb_server.c @@ -32,17 +32,22 @@ #include "breakpoints.h" #include "flash.h" #include "target_request.h" +#include "configuration.h" #include #include #include #include -#if 1 +#if 0 #define _DEBUG_GDB_IO_ #endif static unsigned short gdb_port; +static const char *DIGITS = "0123456789abcdef"; + +static void gdb_log_callback(void *priv, const char *file, int line, + const char *function, const char *string); enum gdb_detach_mode { @@ -60,6 +65,10 @@ enum gdb_detach_mode detach_mode = GDB_DETACH_RESUME; int gdb_use_memory_map = 0; int gdb_flash_program = 0; +/* if set, data aborts cause an error to be reported in memory read packets + * see the code in gdb_read_memory_packet() for further explanations */ +int gdb_report_data_abort = 0; + int gdb_last_signal(target_t *target) { switch (target->debug_reason) @@ -103,10 +112,38 @@ int gdb_get_char(connection_t *connection, int* next_char) return ERROR_OK; } - while ((gdb_con->buf_cnt = read_socket(connection->fd, gdb_con->buffer, GDB_BUFFER_SIZE)) <= 0) + for (;;) { +#ifndef _WIN32 + /* a non-blocking socket will block if there is 0 bytes available on the socket, + * but return with as many bytes as are available immediately + */ + struct timeval tv; + fd_set read_fds; + + FD_ZERO(&read_fds); + FD_SET(connection->fd, &read_fds); + + tv.tv_sec = 1; + tv.tv_usec = 0; + if (select(connection->fd + 1, &read_fds, NULL, NULL, &tv) == 0) + { + /* This can typically be because a "monitor" command took too long + * before printing any progress messages + */ + return ERROR_GDB_TIMEOUT; + } +#endif + gdb_con->buf_cnt = read_socket(connection->fd, gdb_con->buffer, GDB_BUFFER_SIZE); + if (gdb_con->buf_cnt > 0) + { + break; + } if (gdb_con->buf_cnt == 0) + { + gdb_con->closed = 1; return ERROR_SERVER_REMOTE_CLOSED; + } #ifdef _WIN32 errno = WSAGetLastError(); @@ -136,7 +173,7 @@ int gdb_get_char(connection_t *connection, int* next_char) return ERROR_SERVER_REMOTE_CLOSED; default: ERROR("read: %s", strerror(errno)); - exit(-1); + return ERROR_SERVER_REMOTE_CLOSED; } #endif } @@ -155,7 +192,7 @@ int gdb_get_char(connection_t *connection, int* next_char) if (gdb_con->buf_cnt > 0) connection->input_pending = 1; else - connection->input_pending = 0; + connection->input_pending = 0; #ifdef _DEBUG_GDB_IO_ DEBUG("returned char '%c' (0x%2.2x)", *next_char, *next_char); #endif @@ -174,17 +211,33 @@ int gdb_putback_char(connection_t *connection, int last_char) } else { - ERROR("BUG: couldn't put character back"); + ERROR("BUG: couldn't put character back"); } return ERROR_OK; } -int gdb_put_packet(connection_t *connection, char *buffer, int len) +/* The only way we can detect that the socket is closed is the first time + * we write to it, we will fail. Subsequent write operations will + * succeed. Shudder! */ +int gdb_write(connection_t *connection, void *data, int len) +{ + gdb_connection_t *gdb_con = connection->priv; + if (gdb_con->closed) + return ERROR_SERVER_REMOTE_CLOSED; + + if (write_socket(connection->fd, data, len) == len) + { + return ERROR_OK; + } + gdb_con->closed = 1; + return ERROR_SERVER_REMOTE_CLOSED; +} + +int gdb_put_packet_inner(connection_t *connection, char *buffer, int len) { int i; unsigned char my_checksum = 0; - char checksum[3]; #ifdef _DEBUG_GDB_IO_ char *debug_buffer; #endif @@ -204,22 +257,55 @@ int gdb_put_packet(connection_t *connection, char *buffer, int len) DEBUG("sending packet '$%s#%2.2x'", debug_buffer, my_checksum); free(debug_buffer); #endif - write_socket(connection->fd, "$", 1); +#if 0 + char checksum[3]; + gdb_write(connection, "$", 1); if (len > 0) - write_socket(connection->fd, buffer, len); - write_socket(connection->fd, "#", 1); + gdb_write(connection, buffer, len); + gdb_write(connection, "#", 1); snprintf(checksum, 3, "%2.2x", my_checksum); - write_socket(connection->fd, checksum, 2); + gdb_write(connection, checksum, 2); +#else + void *allocated = NULL; + char stackAlloc[1024]; + char *t = stackAlloc; + int totalLen = 1 + len + 1 + 2; + if (totalLen > sizeof(stackAlloc)) + { + allocated = malloc(totalLen); + t = allocated; + if (allocated == NULL) + { + ERROR("Ran out of memory trying to reply packet %d\n", totalLen); + exit(-1); + } + } + t[0] = '$'; + memcpy(t + 1, buffer, len); + t[1 + len] = '#'; + t[1 + len + 1] = DIGITS[(my_checksum >> 4) & 0xf]; + t[1 + len + 2] = DIGITS[my_checksum & 0xf]; + + gdb_write(connection, t, totalLen); + if (allocated) + { + free(allocated); + } +#endif if ((retval = gdb_get_char(connection, &reply)) != ERROR_OK) return retval; if (reply == '+') break; else if (reply == '-') + { + /* Stop sending output packets for now */ + log_remove_callback(gdb_log_callback, connection); WARNING("negative reply, retrying"); + } else if (reply == 0x3) { gdb_con->ctrl_c = 1; @@ -228,7 +314,11 @@ int gdb_put_packet(connection_t *connection, char *buffer, int len) if (reply == '+') break; else if (reply == '-') + { + /* Stop sending output packets for now */ + log_remove_callback(gdb_log_callback, connection); WARNING("negative reply, retrying"); + } else { ERROR("unknown character 0x%2.2x in reply, dropping connection", reply); @@ -241,11 +331,22 @@ int gdb_put_packet(connection_t *connection, char *buffer, int len) return ERROR_SERVER_REMOTE_CLOSED; } } + if (gdb_con->closed) + return ERROR_SERVER_REMOTE_CLOSED; return ERROR_OK; } -int gdb_get_packet(connection_t *connection, char *buffer, int *len) +int gdb_put_packet(connection_t *connection, char *buffer, int len) +{ + gdb_connection_t *gdb_con = connection->priv; + gdb_con->busy = 1; + int retval = gdb_put_packet_inner(connection, buffer, len); + gdb_con->busy = 0; + return retval; +} + +int gdb_get_packet_inner(connection_t *connection, char *buffer, int *len) { int character; int count = 0; @@ -286,19 +387,21 @@ int gdb_get_packet(connection_t *connection, char *buffer, int *len) } while (character != '$'); my_checksum = 0; - + + count = 0; + gdb_connection_t *gdb_con = connection->priv; for (;;) { /* The common case is that we have an entire packet with no escape chars. * We need to leave at least 2 bytes in the buffer to have - * gdb_get_char() update various bits and bobs correctly. + * gdb_get_char() update various bits and bobs correctly. */ if ((gdb_con->buf_cnt > 2) && ((gdb_con->buf_cnt+count) < *len)) { /* The compiler will struggle a bit with constant propagation and * aliasing, so we help it by showing that these values do not - * change inside the loop - */ + * change inside the loop + */ int i; char *buf = gdb_con->buf_p; int run = gdb_con->buf_cnt - 2; @@ -310,13 +413,13 @@ int gdb_get_packet(connection_t *connection, char *buffer, int *len) i++; if (character == '#') { - /* Danger! character can be '#' when esc is + /* Danger! character can be '#' when esc is * used so we need an explicit boolean for done here. */ done = 1; break; } - + if (character == '}') { /* data transmitted in binary mode (X packet) @@ -334,15 +437,15 @@ int gdb_get_packet(connection_t *connection, char *buffer, int *len) } gdb_con->buf_p += i; gdb_con->buf_cnt -= i; - if (done) + if (done) break; - } + } if (count > *len) { ERROR("packet buffer too small"); return ERROR_GDB_BUFFER_TOO_SMALL; } - + if ((retval = gdb_get_char(connection, &character)) != ERROR_OK) return retval; @@ -379,56 +482,65 @@ int gdb_get_packet(connection_t *connection, char *buffer, int *len) if (my_checksum == strtoul(checksum, NULL, 16)) { - write_socket(connection->fd, "+", 1); + gdb_write(connection, "+", 1); break; } WARNING("checksum error, requesting retransmission"); - write_socket(connection->fd, "-", 1); + gdb_write(connection, "-", 1); } + if (gdb_con->closed) + return ERROR_SERVER_REMOTE_CLOSED; return ERROR_OK; } -int gdb_output(struct command_context_s *context, char* line) +int gdb_get_packet(connection_t *connection, char *buffer, int *len) +{ + gdb_connection_t *gdb_con = connection->priv; + gdb_con->busy = 1; + int retval = gdb_get_packet_inner(connection, buffer, len); + gdb_con->busy = 0; + return retval; +} + +int gdb_output_con(connection_t *connection, const char* line) { - connection_t *connection = context->output_handler_priv; - gdb_connection_t *gdb_connection = connection->priv; - char *hex_buffer; int i, bin_size; - /* check if output is enabled */ - if (gdb_connection->output_disable) - { - return ERROR_OK; - } - bin_size = strlen(line); - hex_buffer = malloc(bin_size*2 + 4); + hex_buffer = malloc(bin_size*2 + 2); + if (hex_buffer == NULL) + return ERROR_GDB_BUFFER_TOO_SMALL; hex_buffer[0] = 'O'; for (i=0; igdb_program_script) { - script = fopen(target->gdb_program_script, "r"); + script = open_file_from_path(target->gdb_program_script, "r"); if (!script) { ERROR("couldn't open script file %s", target->gdb_program_script); @@ -438,10 +550,10 @@ int gdb_program_handler(struct target_s *target, enum target_event event, void * INFO("executing gdb_program script '%s'", target->gdb_program_script); command_run_file(cmd_ctx, script, COMMAND_EXEC); fclose(script); - + jtag_execute_queue(); } - + return ERROR_OK; } @@ -455,8 +567,20 @@ int gdb_target_callback_event_handler(struct target_s *target, enum target_event switch (event) { case TARGET_EVENT_HALTED: + /* In the GDB protocol when we are stepping or coninuing execution, + * we have a lingering reply. Upon receiving a halted event + * when we have that lingering packet, we reply to the original + * step or continue packet. + * + * Executing monitor commands can bring the target in and + * out of the running state so we'll see lots of TARGET_EVENT_XXX + * that are to be ignored. + */ if (gdb_connection->frontend_state == TARGET_RUNNING) { + /* stop forwarding log packets! */ + log_remove_callback(gdb_log_callback, connection); + if (gdb_connection->ctrl_c) { signal = 0x2; @@ -472,12 +596,6 @@ int gdb_target_callback_event_handler(struct target_s *target, enum target_event gdb_connection->frontend_state = TARGET_HALTED; } break; - case TARGET_EVENT_RESUMED: - if (gdb_connection->frontend_state == TARGET_HALTED) - { - gdb_connection->frontend_state = TARGET_RUNNING; - } - break; case TARGET_EVENT_GDB_PROGRAM: gdb_program_handler(target, event, connection->cmd_ctx); break; @@ -488,6 +606,7 @@ int gdb_target_callback_event_handler(struct target_s *target, enum target_event return ERROR_OK; } + int gdb_new_connection(connection_t *connection) { gdb_connection_t *gdb_connection = malloc(sizeof(gdb_connection_t)); @@ -503,26 +622,25 @@ int gdb_new_connection(connection_t *connection) gdb_connection->ctrl_c = 0; gdb_connection->frontend_state = TARGET_HALTED; gdb_connection->vflash_image = NULL; - gdb_connection->output_disable = 0; - + gdb_connection->closed = 0; + gdb_connection->busy = 0; + /* output goes through gdb connection */ command_set_output_handler(connection->cmd_ctx, gdb_output, connection); /* register callback to be informed about target events */ - target_register_event_callback(gdb_target_callback_event_handler, connection); + target_register_event_callback(gdb_target_callback_event_handler, connection); /* a gdb session just attached, put the target in halt mode */ if (((retval = gdb_service->target->type->halt(gdb_service->target)) != ERROR_OK) && (retval != ERROR_TARGET_ALREADY_HALTED)) { - ERROR("error when trying to halt target"); - exit(-1); + ERROR("error(%d) when trying to halt target, falling back to \"reset halt\"", retval); + command_run_line(connection->cmd_ctx, "reset halt"); } - while (gdb_service->target->state != TARGET_HALTED) - { - gdb_service->target->type->poll(gdb_service->target); - } + /* This will time out after 1 second */ + command_run_line(connection->cmd_ctx, "wait_halt 1"); /* remove the initial ACK from the incoming buffer */ if ((retval = gdb_get_char(connection, &initial_ack)) != ERROR_OK) @@ -549,7 +667,7 @@ int gdb_connection_closed(connection_t *connection) /* if this connection registered a debug-message receiver delete it */ delete_debug_msg_receiver(connection->cmd_ctx, gdb_service->target); - + if (connection->priv) { free(connection->priv); @@ -561,6 +679,7 @@ int gdb_connection_closed(connection_t *connection) } target_unregister_event_callback(gdb_target_callback_event_handler, connection); + log_remove_callback(gdb_log_callback, connection); return ERROR_OK; } @@ -590,13 +709,12 @@ int gdb_last_signal_packet(connection_t *connection, target_t *target, char* pac * case an entire byte is shown. */ void gdb_str_to_target(target_t *target, char *tstr, reg_t *reg) { - static const char *DIGITS = "0123456789abcdef"; int i; u8 *buf; int buf_len; buf = reg->value; - buf_len = CEIL(reg->size, 8); + buf_len = CEIL(reg->size, 8); if (target->endianness == TARGET_LITTLE_ENDIAN) { @@ -613,7 +731,7 @@ void gdb_str_to_target(target_t *target, char *tstr, reg_t *reg) tstr[(buf_len-1-i)*2] = DIGITS[(buf[i]>>4)&0xf]; tstr[(buf_len-1-i)*2+1] = DIGITS[buf[i]&0xf]; } - } + } } void gdb_target_to_str(target_t *target, char *tstr, char *str) @@ -641,7 +759,7 @@ void gdb_target_to_str(target_t *target, char *tstr, char *str) { str[i] = tstr[i]; } - } + } } int gdb_get_registers_packet(connection_t *connection, target_t *target, char* packet, int packet_size) @@ -754,7 +872,7 @@ int gdb_set_registers_packet(connection_t *connection, target_t *target, char *p bin_buf = malloc(CEIL(reg_list[i]->size, 8)); str_to_buf(hex_buf, CEIL(reg_list[i]->size, 8) * 2, bin_buf, reg_list[i]->size, 16); - /* get register arch_type, and call set method */ + /* get register arch_type, and call set method */ arch_type = register_get_arch_type(reg_list[i]->arch_type); if (arch_type == NULL) { @@ -763,14 +881,14 @@ int gdb_set_registers_packet(connection_t *connection, target_t *target, char *p } arch_type->set(reg_list[i], bin_buf); - /* advance packet pointer */ + /* advance packet pointer */ packet_p += (CEIL(reg_list[i]->size, 8) * 2); free(bin_buf); free(hex_buf); } - /* free reg_t *reg_list[] array allocated by get_gdb_reg_list */ + /* free reg_t *reg_list[] array allocated by get_gdb_reg_list */ free(reg_list); gdb_put_packet(connection, "OK", 2); @@ -869,7 +987,7 @@ int gdb_set_register_packet(connection_t *connection, target_t *target, char *pa bin_buf = malloc(CEIL(reg_list[reg_num]->size, 8)); str_to_buf(hex_buf, CEIL(reg_list[reg_num]->size, 8) * 2, bin_buf, reg_list[reg_num]->size, 16); - /* get register arch_type, and call set method */ + /* get register arch_type, and call set method */ arch_type = register_get_arch_type(reg_list[reg_num]->arch_type); if (arch_type == NULL) { @@ -894,7 +1012,6 @@ int gdb_memory_packet_error(connection_t *connection, int retval) case ERROR_TARGET_NOT_HALTED: ERROR("gdb tried to read memory but we're not halted, dropping connection"); return ERROR_SERVER_REMOTE_CLOSED; - break; case ERROR_TARGET_DATA_ABORT: gdb_send_error(connection, EIO); break; @@ -905,13 +1022,19 @@ int gdb_memory_packet_error(connection_t *connection, int retval) gdb_send_error(connection, EFAULT); break; default: - ERROR("BUG: unexpected error %i", retval); - exit(-1); + /* This could be that the target reset itself. */ + ERROR("unexpected error %i. Dropping connection.", retval); + return ERROR_SERVER_REMOTE_CLOSED; } return ERROR_OK; } +/* We don't have to worry about the default 2 second timeout for GDB packets, + * because GDB breaks up large memory reads into smaller reads. + * + * 8191 bytes by the looks of it. Why 8191 bytes instead of 8192????? + */ int gdb_read_memory_packet(connection_t *connection, target_t *target, char *packet, int packet_size) { char *separator; @@ -921,8 +1044,7 @@ int gdb_read_memory_packet(connection_t *connection, target_t *target, char *pac u8 *buffer; char *hex_buffer; - int i; - int retval; + int retval = ERROR_OK; /* skip command character */ packet++; @@ -941,45 +1063,37 @@ int gdb_read_memory_packet(connection_t *connection, target_t *target, char *pac DEBUG("addr: 0x%8.8x, len: 0x%8.8x", addr, len); - switch (len) - { - case 4: - if ((addr % 4) == 0) - retval = target->type->read_memory(target, addr, 4, 1, buffer); - else - retval = target->type->read_memory(target, addr, 1, len, buffer); - break; - case 2: - if ((addr % 2) == 0) - retval = target->type->read_memory(target, addr, 2, 1, buffer); - else - retval = target->type->read_memory(target, addr, 1, len, buffer); - break; - default: - if (((addr % 4) == 0) && ((len % 4) == 0)) - retval = target->type->read_memory(target, addr, 4, len / 4, buffer); - else - retval = target->type->read_memory(target, addr, 1, len, buffer); - } + retval = target_read_buffer(target, addr, len, buffer); -#if 0 - if (retval == ERROR_TARGET_DATA_ABORT) + if ((retval == ERROR_TARGET_DATA_ABORT) && (!gdb_report_data_abort)) { /* TODO : Here we have to lie and send back all zero's lest stack traces won't work. * At some point this might be fixed in GDB, in which case this code can be removed. + * + * OpenOCD developers are acutely aware of this problem, but there is nothing + * gained by involving the user in this problem that hopefully will get resolved + * eventually + * * http://sourceware.org/cgi-bin/gnatsweb.pl?cmd=view%20audit-trail&database=gdb&pr=2395 + * + * For now, the default is to fix up things to make current GDB versions work. + * This can be overwritten using the gdb_report_data_abort <'enable'|'disable'> command. */ memset(buffer, 0, len); retval = ERROR_OK; } -#endif if (retval == ERROR_OK) { hex_buffer = malloc(len * 2 + 1); - for (i=0; i> 4) & 0xf]; + hex_buffer[2 * i + 1] = DIGITS[t & 0xf]; + } gdb_put_packet(connection, hex_buffer, len * 2); @@ -987,13 +1101,12 @@ int gdb_read_memory_packet(connection_t *connection, target_t *target, char *pac } else { - if ((retval = gdb_memory_packet_error(connection, retval)) != ERROR_OK) - return retval; + retval = gdb_memory_packet_error(connection, retval); } free(buffer); - return ERROR_OK; + return retval; } int gdb_write_memory_packet(connection_t *connection, target_t *target, char *packet, int packet_size) @@ -1037,31 +1150,7 @@ int gdb_write_memory_packet(connection_t *connection, target_t *target, char *pa buffer[i] = tmp; } - retval = ERROR_OK; - switch (len) - { - /* handle sized writes */ - case 4: - if ((addr % 4) == 0) - retval = target->type->write_memory(target, addr, 4, 1, buffer); - else - retval = target->type->write_memory(target, addr, 1, len, buffer); - break; - case 2: - if ((addr % 2) == 0) - retval = target->type->write_memory(target, addr, 2, 1, buffer); - else - retval = target->type->write_memory(target, addr, 1, len, buffer); - break; - case 3: - case 1: - retval = target->type->write_memory(target, addr, 1, len, buffer); - break; - /* handle bulk writes */ - default: - retval = target_write_buffer(target, addr, len, buffer); - break; - } + retval = target_write_buffer(target, addr, len, buffer); if (retval == ERROR_OK) { @@ -1070,7 +1159,7 @@ int gdb_write_memory_packet(connection_t *connection, target_t *target, char *pa else { if ((retval = gdb_memory_packet_error(connection, retval)) != ERROR_OK) - return retval; + return retval; } free(buffer); @@ -1084,7 +1173,6 @@ int gdb_write_memory_binary_packet(connection_t *connection, target_t *target, c u32 addr = 0; u32 len = 0; - u8 *buffer; int retval; /* skip command character */ @@ -1107,38 +1195,11 @@ int gdb_write_memory_binary_packet(connection_t *connection, target_t *target, c } retval = ERROR_OK; - if( len ) { - - buffer = malloc(len); - + if (len) + { DEBUG("addr: 0x%8.8x, len: 0x%8.8x", addr, len); - memcpy( buffer, separator, len ); - - switch (len) - { - case 4: - if ((addr % 4) == 0) - retval = target->type->write_memory(target, addr, 4, 1, buffer); - else - retval = target->type->write_memory(target, addr, 1, len, buffer); - break; - case 2: - if ((addr % 2) == 0) - retval = target->type->write_memory(target, addr, 2, 1, buffer); - else - retval = target->type->write_memory(target, addr, 1, len, buffer); - break; - case 3: - case 1: - retval = target->type->write_memory(target, addr, 1, len, buffer); - break; - default: - retval = target_write_buffer(target, addr, len, buffer); - break; - } - - free(buffer); + retval = target_write_buffer(target, addr, len, (u8*)separator); } if (retval == ERROR_OK) @@ -1148,7 +1209,7 @@ int gdb_write_memory_binary_packet(connection_t *connection, target_t *target, c else { if ((retval = gdb_memory_packet_error(connection, retval)) != ERROR_OK) - return retval; + return retval; } return ERROR_OK; @@ -1303,14 +1364,14 @@ void xml_printf(int *retval, char **xml, int *pos, int *size, const char *fmt, . return; } int first = 1; - + for (;;) { if ((*xml == NULL) || (!first)) { /* start by 0 to exercise all the code paths. * Need minimum 2 bytes to fit 1 char and 0 terminator. */ - + *size = *size * 2 + 2; char *t = *xml; *xml = realloc(*xml, *size); @@ -1322,7 +1383,7 @@ void xml_printf(int *retval, char **xml, int *pos, int *size, const char *fmt, . return; } } - + va_list ap; int ret; va_start(ap, fmt); @@ -1338,10 +1399,10 @@ void xml_printf(int *retval, char **xml, int *pos, int *size, const char *fmt, . } } -static int decode_xfer_read (char *buf, char **annex, int *ofs, unsigned int *len) +static int decode_xfer_read(char *buf, char **annex, int *ofs, unsigned int *len) { char *separator; - + /* Extract and NUL-terminate the annex. */ *annex = buf; while (*buf && *buf != ':') @@ -1349,24 +1410,40 @@ static int decode_xfer_read (char *buf, char **annex, int *ofs, unsigned int *le if (*buf == '\0') return -1; *buf++ = 0; - + /* After the read marker and annex, qXfer looks like a * traditional 'm' packet. */ - + *ofs = strtoul(buf, &separator, 16); if (*separator != ',') return -1; *len = strtoul(separator+1, NULL, 16); - + return 0; } +int gdb_calc_blocksize(flash_bank_t *bank) +{ + int i; + int block_size = 0xffffffff; + + /* loop through all sectors and return smallest sector size */ + + for (i = 0; i < bank->num_sectors; i++) + { + if (bank->sectors[i].size < block_size) + block_size = bank->sectors[i].size; + } + + return block_size; +} + int gdb_query_packet(connection_t *connection, target_t *target, char *packet, int packet_size) { command_context_t *cmd_ctx = connection->cmd_ctx; - + if (strstr(packet, "qRcmd,")) { if (packet_size > 6) @@ -1381,8 +1458,12 @@ int gdb_query_packet(connection_t *connection, target_t *target, char *packet, i cmd[i] = tmp; } cmd[(packet_size - 6)/2] = 0x0; + + /* We want to print all debug output to GDB connection */ + log_add_callback(gdb_log_callback, connection); target_call_timer_callbacks(); command_run_line(cmd_ctx, cmd); + log_remove_callback(gdb_log_callback, connection); free(cmd); } gdb_put_packet(connection, "OK", 2); @@ -1393,27 +1474,27 @@ int gdb_query_packet(connection_t *connection, target_t *target, char *packet, i if (packet_size > 5) { int retval; - u8 gdb_reply[10]; + char gdb_reply[10]; char *separator; u32 checksum; u32 addr = 0; u32 len = 0; - + /* skip command character */ packet += 5; - + addr = strtoul(packet, &separator, 16); - + if (*separator != ',') { ERROR("incomplete read memory packet received, dropping connection"); return ERROR_SERVER_REMOTE_CLOSED; } - + len = strtoul(separator + 1, NULL, 16); - + retval = target_checksum_memory(target, addr, len, &checksum); - + if (retval == ERROR_OK) { snprintf(gdb_reply, 10, "C%8.8x", checksum); @@ -1422,9 +1503,9 @@ int gdb_query_packet(connection_t *connection, target_t *target, char *packet, i else { if ((retval = gdb_memory_packet_error(connection, retval)) != ERROR_OK) - return retval; + return retval; } - + return ERROR_OK; } } @@ -1437,61 +1518,66 @@ int gdb_query_packet(connection_t *connection, target_t *target, char *packet, i int pos = 0; int size = 0; - xml_printf(&retval, &buffer, &pos, &size, + xml_printf(&retval, &buffer, &pos, &size, "PacketSize=%x;qXfer:memory-map:read%c;qXfer:features:read-", (GDB_BUFFER_SIZE - 1), gdb_use_memory_map == 1 ? '+' : '-'); - + if (retval != ERROR_OK) { gdb_send_error(connection, 01); return ERROR_OK; } - + gdb_put_packet(connection, buffer, strlen(buffer)); free(buffer); - + return ERROR_OK; } else if (strstr(packet, "qXfer:memory-map:read::")) { /* 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 + * specified are treated as if we provided no memory map(if not we * could detect the holes and mark them as RAM). * Normally we only execute this code once, but no big deal if we * have to regenerate it a couple of times. */ - + flash_bank_t *p; char *xml = NULL; int size = 0; int pos = 0; int retval = ERROR_OK; - + int offset; int length; char *separator; - + int blocksize; + /* skip command character */ packet += 23; - + offset = strtoul(packet, &separator, 16); length = strtoul(separator + 1, &separator, 16); - + xml_printf(&retval, &xml, &pos, &size, "\n"); - + int i = 0; for (;;) { p = get_flash_bank_by_num(i); if (p == NULL) break; - + + /* if device has uneven sector sizes, eg. str7, lpc + * we pass the smallest sector size to gdb memory map */ + blocksize = gdb_calc_blocksize(p); + xml_printf(&retval, &xml, &pos, &size, "\n" \ "0x%x\n" \ "\n", \ - p->base, p->size, p->size/p->num_sectors); + p->base, p->size, blocksize); i++; } - + xml_printf(&retval, &xml, &pos, &size, "\n"); if (retval != ERROR_OK) @@ -1499,7 +1585,7 @@ int gdb_query_packet(connection_t *connection, target_t *target, char *packet, i gdb_send_error(connection, retval); return retval; } - + if (offset + length > pos) { length = pos - offset; @@ -1509,52 +1595,52 @@ int gdb_query_packet(connection_t *connection, target_t *target, char *packet, i t[0] = 'l'; memcpy(t + 1, xml + offset, length); gdb_put_packet(connection, t, length + 1); - + free(t); free(xml); return ERROR_OK; } else if (strstr(packet, "qXfer:features:read:")) - { + { char *xml = NULL; int size = 0; int pos = 0; int retval = ERROR_OK; - + int offset; - int length; + unsigned int length; char *annex; - + /* skip command character */ packet += 20; - - if (decode_xfer_read( packet, &annex, &offset, &length ) < 0) + + if (decode_xfer_read(packet, &annex, &offset, &length) < 0) { gdb_send_error(connection, 01); return ERROR_OK; } - + if (strcmp(annex, "target.xml") != 0) { gdb_send_error(connection, 01); return ERROR_OK; } - + xml_printf(&retval, &xml, &pos, &size, \ "l\narm\n\n"); - + if (retval != ERROR_OK) { gdb_send_error(connection, retval); return retval; } - + gdb_put_packet(connection, xml, strlen(xml) + 1); - + free(xml); return ERROR_OK; } - + gdb_put_packet(connection, "", 0); return ERROR_OK; } @@ -1566,18 +1652,18 @@ int gdb_v_packet(connection_t *connection, target_t *target, char *packet, int p int result; /* if flash programming disabled - send a empty reply */ - + if (gdb_flash_program == 0) { gdb_put_packet(connection, "", 0); return ERROR_OK; } - + if (strstr(packet, "vFlashErase:")) { unsigned long addr; unsigned long length; - + char *parse = packet + 12; if (*parse == '\0') { @@ -1600,17 +1686,14 @@ int gdb_v_packet(connection_t *connection, target_t *target, char *packet, int p ERROR("incomplete vFlashErase packet received, dropping connection"); return ERROR_SERVER_REMOTE_CLOSED; } - - /* disable gdb output while programming */ - gdb_connection->output_disable = 1; - + /* assume all sectors need erasing - stops any problems * when flash_write is called multiple times */ flash_set_dirty(); - + /* perform any target specific operations before the erase */ target_call_event_callbacks(gdb_service->target, TARGET_EVENT_GDB_PROGRAM); - + /* perform erase */ if ((result = flash_erase_address_range(gdb_service->target, addr, length)) != ERROR_OK) { @@ -1622,10 +1705,7 @@ int gdb_v_packet(connection_t *connection, target_t *target, char *packet, int p } else gdb_put_packet(connection, "OK", 2); - - /* reenable gdb output */ - gdb_connection->output_disable = 0; - + return ERROR_OK; } @@ -1647,10 +1727,7 @@ int gdb_v_packet(connection_t *connection, target_t *target, char *packet, int p return ERROR_SERVER_REMOTE_CLOSED; } length = packet_size - (parse - packet); - - /* disable gdb output while programming */ - gdb_connection->output_disable = 1; - + /* create a new image if there isn't already one */ if (gdb_connection->vflash_image == NULL) { @@ -1663,48 +1740,32 @@ int gdb_v_packet(connection_t *connection, target_t *target, char *packet, int p gdb_put_packet(connection, "OK", 2); - /* reenable gdb output */ - gdb_connection->output_disable = 0; - return ERROR_OK; } if (!strcmp(packet, "vFlashDone")) { u32 written; - char *error_str; - /* disable gdb output while programming */ - gdb_connection->output_disable = 1; - /* process the flashing buffer. No need to erase as GDB * always issues a vFlashErase first. */ - if ((result = flash_write(gdb_service->target, gdb_connection->vflash_image, &written, &error_str, NULL, 0)) != ERROR_OK) + if ((result = flash_write(gdb_service->target, gdb_connection->vflash_image, &written, 0)) != ERROR_OK) { if (result == ERROR_FLASH_DST_OUT_OF_BANK) gdb_put_packet(connection, "E.memtype", 9); else gdb_send_error(connection, EIO); - - if (error_str) - { - ERROR("flash writing failed: %s", error_str); - free(error_str); } - } else { DEBUG("wrote %u bytes from vFlash image to flash", written); gdb_put_packet(connection, "OK", 2); } - + image_close(gdb_connection->vflash_image); free(gdb_connection->vflash_image); gdb_connection->vflash_image = NULL; - - /* reenable gdb output */ - gdb_connection->output_disable = 0; - + return ERROR_OK; } @@ -1719,25 +1780,40 @@ int gdb_detach(connection_t *connection, target_t *target) case GDB_DETACH_RESUME: target->type->resume(target, 1, 0, 1, 0); break; - + case GDB_DETACH_RESET: target_process_reset(connection->cmd_ctx); break; - + case GDB_DETACH_HALT: target->type->halt(target); break; - + case GDB_DETACH_NOTHING: break; } - + gdb_put_packet(connection, "OK", 2); - + return ERROR_OK; } -int gdb_input(connection_t *connection) +static void gdb_log_callback(void *priv, const char *file, int line, + const char *function, const char *string) +{ + connection_t *connection = priv; + gdb_connection_t *gdb_con = connection->priv; + + if (gdb_con->busy) + { + /* do not reply this using the O packet */ + return; + } + + gdb_output_con(connection, string); +} + +int gdb_input_inner(connection_t *connection) { gdb_service_t *gdb_service = connection->service->priv; target_t *target = gdb_service->target; @@ -1753,17 +1829,7 @@ int gdb_input(connection_t *connection) packet_size = GDB_BUFFER_SIZE-1; if ((retval = gdb_get_packet(connection, packet, &packet_size)) != ERROR_OK) { - switch (retval) - { - case ERROR_GDB_BUFFER_TOO_SMALL: - ERROR("BUG: buffer supplied for gdb packet was too small"); - exit(-1); - case ERROR_SERVER_REMOTE_CLOSED: - return ERROR_SERVER_REMOTE_CLOSED; - default: - ERROR("BUG: unexpected error"); - exit(-1); - } + return retval; } /* terminate with zero */ @@ -1777,7 +1843,7 @@ int gdb_input(connection_t *connection) switch (packet[0]) { case 'H': - /* Hct... -- set thread + /* Hct... -- set thread * we don't have threads, send empty reply */ gdb_put_packet(connection, NULL, 0); break; @@ -1811,7 +1877,14 @@ int gdb_input(connection_t *connection) break; case 'c': case 's': - gdb_step_continue_packet(connection, target, packet, packet_size); + { + /* We're running/stepping, in which case we can + * forward log output until the target is halted */ + gdb_connection_t *gdb_con = connection->priv; + gdb_con->frontend_state = TARGET_RUNNING; + log_add_callback(gdb_log_callback, connection); + gdb_step_continue_packet(connection, target, packet, packet_size); + } break; case 'v': retval = gdb_v_packet(connection, target, packet, packet_size); @@ -1864,6 +1937,15 @@ int gdb_input(connection_t *connection) return ERROR_OK; } +int gdb_input(connection_t *connection) +{ + int retval = gdb_input_inner(connection); + if (retval == ERROR_SERVER_REMOTE_CLOSED) + return retval; + /* we'll recover from any other errors(e.g. temporary timeouts, etc.) */ + return ERROR_OK; +} + int gdb_init() { gdb_service_t *gdb_service; @@ -1940,7 +2022,7 @@ int handle_gdb_detach_command(struct command_context_s *cmd_ctx, char *cmd, char return ERROR_OK; } } - + WARNING("invalid gdb_detach configuration directive: %s", args[0]); return ERROR_OK; } @@ -1960,7 +2042,7 @@ int handle_gdb_memory_map_command(struct command_context_s *cmd_ctx, char *cmd, return ERROR_OK; } } - + WARNING("invalid gdb_memory_map configuration directive: %s", args[0]); return ERROR_OK; } @@ -1980,11 +2062,31 @@ int handle_gdb_flash_program_command(struct command_context_s *cmd_ctx, char *cm return ERROR_OK; } } - + WARNING("invalid gdb_memory_map configuration directive: %s", args[0]); return ERROR_OK; } +int handle_gdb_report_data_abort_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) +{ + if (argc == 1) + { + if (strcmp(args[0], "enable") == 0) + { + gdb_report_data_abort = 1; + return ERROR_OK; + } + else if (strcmp(args[0], "disable") == 0) + { + gdb_report_data_abort = 0; + return ERROR_OK; + } + } + + WARNING("invalid gdb_report_data_abort configuration directive: %s", args[0]); + return ERROR_OK; +} + int gdb_register_commands(command_context_t *command_context) { register_command(command_context, NULL, "gdb_port", handle_gdb_port_command, @@ -1995,5 +2097,7 @@ int gdb_register_commands(command_context_t *command_context) COMMAND_CONFIG, ""); register_command(command_context, NULL, "gdb_flash_program", handle_gdb_flash_program_command, COMMAND_CONFIG, ""); + register_command(command_context, NULL, "gdb_report_data_abort", handle_gdb_report_data_abort_command, + COMMAND_CONFIG, ""); return ERROR_OK; }