X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fserver%2Fgdb_server.c;h=8fb3b64f954f1c539516f14cc7024e6585f6600e;hp=6c9936eec98f273d20a5b2136717d29d15388899;hb=8d73c2a9b0c00c870694a57f7cfbc23e354855ac;hpb=0689e3dd6752f45f493eceb3edf040fbc7849846 diff --git a/src/server/gdb_server.c b/src/server/gdb_server.c index 6c9936eec9..8fb3b64f95 100644 --- a/src/server/gdb_server.c +++ b/src/server/gdb_server.c @@ -2,6 +2,9 @@ * Copyright (C) 2005 by Dominic Rath * * Dominic.Rath@gmx.de * * * + * Copyright (C) 2007,2008 Øyvind Harboe * + * oyvind.harboe@zylin.com * + * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation; either version 2 of the License, or * @@ -43,11 +46,15 @@ #define _DEBUG_GDB_IO_ #endif +static int gdb_breakpoint_override; +static enum breakpoint_type gdb_breakpoint_override_type; + +extern int gdb_error(connection_t *connection, int retval); 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 *format, va_list args); +static void gdb_log_callback(void *priv, const char *file, int line, + const char *function, const char *string); enum gdb_detach_mode { @@ -62,8 +69,10 @@ enum gdb_detach_mode detach_mode = GDB_DETACH_RESUME; /* set if we are sending a memory map to gdb * via qXfer:memory-map:read packet */ -int gdb_use_memory_map = 0; -int gdb_flash_program = 0; +/* enabled by default*/ +int gdb_use_memory_map = 1; +/* enabled by default*/ +int gdb_flash_program = 1; /* 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 */ @@ -84,14 +93,56 @@ int gdb_last_signal(target_t *target) case DBG_REASON_NOTHALTED: return 0x0; /* no signal... shouldn't happen */ default: - ERROR("BUG: undefined debug reason"); - exit(-1); + LOG_USER("undefined debug reason %d - target needs reset", target->debug_reason); + return 0x0; } } +int check_pending(connection_t *connection, int timeout_s, int *got_data) +{ + /* 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; + gdb_connection_t *gdb_con = connection->priv; + int t; + if (got_data==NULL) + got_data=&t; + *got_data=0; + + if (gdb_con->buf_cnt>0) + { + *got_data = 1; + return ERROR_OK; + } + + FD_ZERO(&read_fds); + FD_SET(connection->fd, &read_fds); + + tv.tv_sec = timeout_s; + 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 + */ + if (timeout_s>0) + { + return ERROR_GDB_TIMEOUT; + } else + { + return ERROR_OK; + } + } + *got_data=FD_ISSET(connection->fd, &read_fds)!=0; + return ERROR_OK; +} + int gdb_get_char(connection_t *connection, int* next_char) { gdb_connection_t *gdb_con = connection->priv; + int retval=ERROR_OK; #ifdef _DEBUG_GDB_IO_ char *debug_buffer; @@ -106,7 +157,7 @@ int gdb_get_char(connection_t *connection, int* next_char) connection->input_pending = 0; #ifdef _DEBUG_GDB_IO_ - DEBUG("returned char '%c' (0x%2.2x)", *next_char, *next_char); + LOG_DEBUG("returned char '%c' (0x%2.2x)", *next_char, *next_char); #endif return ERROR_OK; @@ -114,26 +165,9 @@ int gdb_get_char(connection_t *connection, int* next_char) 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 + retval=check_pending(connection, 1, NULL); + if (retval!=ERROR_OK) + return retval; gdb_con->buf_cnt = read_socket(connection->fd, gdb_con->buffer, GDB_BUFFER_SIZE); if (gdb_con->buf_cnt > 0) { @@ -154,11 +188,13 @@ int gdb_get_char(connection_t *connection, int* next_char) usleep(1000); break; case WSAECONNABORTED: + gdb_con->closed = 1; return ERROR_SERVER_REMOTE_CLOSED; case WSAECONNRESET: + gdb_con->closed = 1; return ERROR_SERVER_REMOTE_CLOSED; default: - ERROR("read: %d", errno); + LOG_ERROR("read: %d", errno); exit(-1); } #else @@ -168,11 +204,14 @@ int gdb_get_char(connection_t *connection, int* next_char) usleep(1000); break; case ECONNABORTED: + gdb_con->closed = 1; return ERROR_SERVER_REMOTE_CLOSED; case ECONNRESET: + gdb_con->closed = 1; return ERROR_SERVER_REMOTE_CLOSED; default: - ERROR("read: %s", strerror(errno)); + LOG_ERROR("read: %s", strerror(errno)); + gdb_con->closed = 1; return ERROR_SERVER_REMOTE_CLOSED; } #endif @@ -182,7 +221,7 @@ int gdb_get_char(connection_t *connection, int* next_char) debug_buffer = malloc(gdb_con->buf_cnt + 1); memcpy(debug_buffer, gdb_con->buffer, gdb_con->buf_cnt); debug_buffer[gdb_con->buf_cnt] = 0; - DEBUG("received '%s'", debug_buffer); + LOG_DEBUG("received '%s'", debug_buffer); free(debug_buffer); #endif @@ -192,12 +231,12 @@ 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); + LOG_DEBUG("returned char '%c' (0x%2.2x)", *next_char, *next_char); #endif - return ERROR_OK; + return retval; } int gdb_putback_char(connection_t *connection, int last_char) @@ -211,7 +250,7 @@ int gdb_putback_char(connection_t *connection, int last_char) } else { - ERROR("BUG: couldn't put character back"); + LOG_ERROR("BUG: couldn't put character back"); } return ERROR_OK; @@ -248,53 +287,61 @@ int gdb_put_packet_inner(connection_t *connection, char *buffer, int len) for (i = 0; i < len; i++) my_checksum += buffer[i]; +#ifdef _DEBUG_GDB_IO_ + /* + * At this point we should have nothing in the input queue from GDB, + * however sometimes '-' is sent even though we've already received + * an ACK (+) for everything we've sent off. + */ + int gotdata; + for (;;) + { + if ((retval=check_pending(connection, 0, &gotdata))!=ERROR_OK) + return retval; + if (!gotdata) + break; + if ((retval = gdb_get_char(connection, &reply)) != ERROR_OK) + return retval; + LOG_WARNING("Discard unexpected char %c", reply); + } +#endif + while (1) { #ifdef _DEBUG_GDB_IO_ debug_buffer = malloc(len + 1); memcpy(debug_buffer, buffer, len); debug_buffer[len] = 0; - DEBUG("sending packet '$%s#%2.2x'", debug_buffer, my_checksum); + LOG_DEBUG("sending packet '$%s#%2.2x'", debug_buffer, my_checksum); free(debug_buffer); #endif -#if 0 - char checksum[3]; - gdb_write(connection, "$", 1); - if (len > 0) - gdb_write(connection, buffer, len); - gdb_write(connection, "#", 1); - - snprintf(checksum, 3, "%2.2x", my_checksum); - - 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)) + + char local_buffer[1024]; + local_buffer[0] = '$'; + if (len+4 <= sizeof(local_buffer)) { - allocated = malloc(totalLen); - t = allocated; - if (allocated == NULL) - { - ERROR("Ran out of memory trying to reply packet %d\n", totalLen); - exit(-1); - } + /* performance gain on smaller packets by only a single call to gdb_write() */ + memcpy(local_buffer+1, buffer, len++); + local_buffer[len++] = '#'; + local_buffer[len++] = DIGITS[(my_checksum >> 4) & 0xf]; + local_buffer[len++] = DIGITS[my_checksum & 0xf]; + gdb_write(connection, local_buffer, len); } - 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) + else { - free(allocated); + /* larger packets are transmitted directly from caller supplied buffer + by several calls to gdb_write() to avoid dynamic allocation */ + local_buffer[1] = '#'; + local_buffer[2] = DIGITS[(my_checksum >> 4) & 0xf]; + local_buffer[3] = DIGITS[my_checksum & 0xf]; + gdb_write(connection, local_buffer, 1); + gdb_write(connection, buffer, len); + gdb_write(connection, local_buffer+1, 3); } -#endif + + if (gdb_con->noack_mode) + break; + if ((retval = gdb_get_char(connection, &reply)) != ERROR_OK) return retval; @@ -304,7 +351,7 @@ int gdb_put_packet_inner(connection_t *connection, char *buffer, int len) { /* Stop sending output packets for now */ log_remove_callback(gdb_log_callback, connection); - WARNING("negative reply, retrying"); + LOG_WARNING("negative reply, retrying"); } else if (reply == 0x3) { @@ -317,17 +364,19 @@ int gdb_put_packet_inner(connection_t *connection, char *buffer, int len) { /* Stop sending output packets for now */ log_remove_callback(gdb_log_callback, connection); - WARNING("negative reply, retrying"); + LOG_WARNING("negative reply, retrying"); } else { - ERROR("unknown character 0x%2.2x in reply, dropping connection", reply); + LOG_ERROR("unknown character 0x%2.2x in reply, dropping connection", reply); + gdb_con->closed=1; return ERROR_SERVER_REMOTE_CLOSED; } } else { - ERROR("unknown character 0x%2.2x in reply, dropping connection", reply); + LOG_ERROR("unknown character 0x%2.2x in reply, dropping connection", reply); + gdb_con->closed=1; return ERROR_SERVER_REMOTE_CLOSED; } } @@ -363,7 +412,7 @@ int gdb_get_packet_inner(connection_t *connection, char *buffer, int *len) return retval; #ifdef _DEBUG_GDB_IO_ - DEBUG("character: '%c'", character); + LOG_DEBUG("character: '%c'", character); #endif switch (character) @@ -371,37 +420,39 @@ int gdb_get_packet_inner(connection_t *connection, char *buffer, int *len) case '$': break; case '+': - WARNING("acknowledgment received, but no packet pending"); + /* gdb sends a dummy ack '+' at every remote connect - see remote_start_remote (remote.c) + * incase anyone tries to debug why they receive this warning every time */ + LOG_WARNING("acknowledgment received, but no packet pending"); break; case '-': - WARNING("negative acknowledgment, but no packet pending"); + LOG_WARNING("negative acknowledgment, but no packet pending"); break; case 0x3: gdb_con->ctrl_c = 1; *len = 0; return ERROR_OK; default: - WARNING("ignoring character 0x%x", character); + LOG_WARNING("ignoring character 0x%x", character); break; } } 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; @@ -413,13 +464,13 @@ int gdb_get_packet_inner(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) @@ -429,7 +480,8 @@ int gdb_get_packet_inner(connection_t *connection, char *buffer, int *len) i++; my_checksum += character & 0xff; buffer[count++] = (character ^ 0x20) & 0xff; - } else + } + else { my_checksum += character & 0xff; buffer[count++] = character & 0xff; @@ -437,15 +489,15 @@ int gdb_get_packet_inner(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"); + LOG_ERROR("packet buffer too small"); return ERROR_GDB_BUFFER_TOO_SMALL; } - + if ((retval = gdb_get_char(connection, &character)) != ERROR_OK) return retval; @@ -467,7 +519,6 @@ int gdb_get_packet_inner(connection_t *connection, char *buffer, int *len) my_checksum += character & 0xff; buffer[count++] = character & 0xff; } - } *len = count; @@ -482,12 +533,22 @@ int gdb_get_packet_inner(connection_t *connection, char *buffer, int *len) if (my_checksum == strtoul(checksum, NULL, 16)) { + if (gdb_con->noack_mode) + break; gdb_write(connection, "+", 1); break; } - WARNING("checksum error, requesting retransmission"); - gdb_write(connection, "-", 1); + if (!gdb_con->noack_mode) + { + LOG_WARNING("checksum error, requesting retransmission"); + gdb_write(connection, "-", 1); + } + else + { + LOG_WARNING("checksum error, no-ack-mode"); + break; + } } if (gdb_con->closed) return ERROR_SERVER_REMOTE_CLOSED; @@ -503,8 +564,8 @@ int gdb_get_packet(connection_t *connection, char *buffer, int *len) gdb_con->busy = 0; return retval; } - -int gdb_output_con(connection_t *connection, char* line) + +int gdb_output_con(connection_t *connection, const char* line) { char *hex_buffer; int i, bin_size; @@ -512,6 +573,8 @@ int gdb_output_con(connection_t *connection, char* line) bin_size = strlen(line); hex_buffer = malloc(bin_size*2 + 2); + if (hex_buffer == NULL) + return ERROR_GDB_BUFFER_TOO_SMALL; hex_buffer[0] = 'O'; for (i=0; ipriv; - if (target->gdb_program_script) - { - script = open_file_from_path(cmd_ctx, target->gdb_program_script, "r"); - if (!script) + /* 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) + { + char sig_reply[4]; + int signal; + /* stop forwarding log packets! */ + log_remove_callback(gdb_log_callback, connection); + + if (gdb_connection->ctrl_c) { - ERROR("couldn't open script file %s", target->gdb_program_script); - return ERROR_OK; + signal = 0x2; + gdb_connection->ctrl_c = 0; + } + else + { + signal = gdb_last_signal(target); } - INFO("executing gdb_program script '%s'", target->gdb_program_script); - command_run_file(cmd_ctx, script, COMMAND_EXEC); - fclose(script); - - jtag_execute_queue(); + snprintf(sig_reply, 4, "T%2.2x", signal); + gdb_put_packet(connection, sig_reply, 3); + gdb_connection->frontend_state = TARGET_HALTED; } - - return ERROR_OK; } int gdb_target_callback_event_handler(struct target_s *target, enum target_event event, void *priv) { connection_t *connection = priv; - gdb_connection_t *gdb_connection = connection->priv; - char sig_reply[4]; - int signal; 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; - gdb_connection->ctrl_c = 0; - } - else - { - signal = gdb_last_signal(target); - } - - snprintf(sig_reply, 4, "T%2.2x", signal); - gdb_put_packet(connection, sig_reply, 3); - gdb_connection->frontend_state = TARGET_HALTED; - } + gdb_frontend_halted(target, connection); break; - case TARGET_EVENT_GDB_PROGRAM: + case TARGET_EVENT_GDB_FLASH_ERASE_START: gdb_program_handler(target, event, connection->cmd_ctx); break; default: @@ -603,8 +658,8 @@ 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)); @@ -622,28 +677,55 @@ int gdb_new_connection(connection_t *connection) gdb_connection->vflash_image = NULL; gdb_connection->closed = 0; gdb_connection->busy = 0; + gdb_connection->noack_mode = 0; + /* send ACK to GDB for debug request */ + gdb_write(connection, "+", 1); + /* output goes through gdb connection */ command_set_output_handler(connection->cmd_ctx, gdb_output, connection); + /* we must remove all breakpoints registered to the target as a previous + * GDB session could leave dangling breakpoints if e.g. communication + * timed out. + */ + breakpoint_clear_target(gdb_service->target); + watchpoint_clear_target(gdb_service->target); + /* register callback to be informed about target events */ - 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(%d) when trying to halt target, falling back to \"reset halt\"", retval); - command_run_line(connection->cmd_ctx, "reset halt"); - } - - /* This will time out after 1 second */ - command_run_line(connection->cmd_ctx, "wait_halt 1"); - + target_register_event_callback(gdb_target_callback_event_handler, connection); + + /* a gdb session just attached, try to put the target in halt mode. + * + * DANGER!!!! + * + * If the halt fails(e.g. target needs a reset, JTAG communication not + * working, etc.), then the GDB connect will succeed as + * the get_gdb_reg_list() will lie and return a register list with + * dummy values. + * + * This allows GDB monitor commands to be run from a GDB init script to + * initialize the target + * + * Also, since the halt() is asynchronous target connect will be + * instantaneous and thus avoiding annoying timeout problems during + * connect. + */ + target_halt(gdb_service->target); + /* FIX!!!! could extended-remote work better here? + * + * wait a tiny bit for halted state or we just continue. The + * GDB register packet will then contain garbage + */ + target_wait_state(gdb_service->target, TARGET_HALTED, 500); + /* remove the initial ACK from the incoming buffer */ if ((retval = gdb_get_char(connection, &initial_ack)) != ERROR_OK) return retval; + /* FIX!!!??? would we actually ever receive a + here??? + * Not observed. + */ if (initial_ack != '+') gdb_putback_char(connection, initial_ack); @@ -665,7 +747,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); @@ -673,7 +755,7 @@ int gdb_connection_closed(connection_t *connection) } else { - ERROR("BUG: connection->priv == NULL"); + LOG_ERROR("BUG: connection->priv == NULL"); } target_unregister_event_callback(gdb_target_callback_event_handler, connection); @@ -712,24 +794,13 @@ void gdb_str_to_target(target_t *target, char *tstr, reg_t *reg) 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) + for (i = 0; i < buf_len; i++) { - for (i = 0; i < buf_len; i++) - { - tstr[i*2] = DIGITS[(buf[i]>>4) & 0xf]; - tstr[i*2+1] = DIGITS[buf[i]&0xf]; - } + tstr[i*2] = DIGITS[(buf[i]>>4) & 0xf]; + tstr[i*2+1] = DIGITS[buf[i]&0xf]; } - else - { - for (i = 0; i < buf_len; i++) - { - 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) @@ -739,25 +810,15 @@ void gdb_target_to_str(target_t *target, char *tstr, char *str) if (str_len % 2) { - ERROR("BUG: gdb value with uneven number of characters encountered"); + LOG_ERROR("BUG: gdb value with uneven number of characters encountered"); exit(-1); } - if (target->endianness == TARGET_LITTLE_ENDIAN) + for (i = 0; i < str_len; i+=2) { - for (i = 0; i < str_len; i+=2) - { - str[str_len - i - 1] = tstr[i + 1]; - str[str_len - i - 2] = tstr[i]; - } + str[str_len - i - 1] = tstr[i + 1]; + str[str_len - i - 2] = tstr[i]; } - else - { - for (i = 0; i < str_len; i++) - { - str[i] = tstr[i]; - } - } } int gdb_get_registers_packet(connection_t *connection, target_t *target, char* packet, int packet_size) @@ -771,21 +832,12 @@ int gdb_get_registers_packet(connection_t *connection, target_t *target, char* p int i; #ifdef _DEBUG_GDB_IO_ - DEBUG("-"); + LOG_DEBUG("-"); #endif if ((retval = target->type->get_gdb_reg_list(target, ®_list, ®_list_size)) != ERROR_OK) { - switch (retval) - { - case ERROR_TARGET_NOT_HALTED: - ERROR("gdb requested registers but we're not halted, dropping connection"); - return ERROR_SERVER_REMOTE_CLOSED; - default: - /* this is a bug condition - get_gdb_reg_list() may not return any other error */ - ERROR("BUG: unexpected error returned by get_gdb_reg_list()"); - exit(-1); - } + return gdb_error(connection, retval); } for (i = 0; i < reg_list_size; i++) @@ -806,7 +858,7 @@ int gdb_get_registers_packet(connection_t *connection, target_t *target, char* p { char *reg_packet_p; reg_packet_p = strndup(reg_packet, CEIL(reg_packet_size, 8) * 2); - DEBUG("reg_packet: %s", reg_packet_p); + LOG_DEBUG("reg_packet: %s", reg_packet_p); free(reg_packet_p); } #endif @@ -828,7 +880,7 @@ int gdb_set_registers_packet(connection_t *connection, target_t *target, char *p char *packet_p; #ifdef _DEBUG_GDB_IO_ - DEBUG("-"); + LOG_DEBUG("-"); #endif /* skip command character */ @@ -837,22 +889,13 @@ int gdb_set_registers_packet(connection_t *connection, target_t *target, char *p if (packet_size % 2) { - WARNING("GDB set_registers packet with uneven characters received, dropping connection"); + LOG_WARNING("GDB set_registers packet with uneven characters received, dropping connection"); return ERROR_SERVER_REMOTE_CLOSED; } if ((retval = target->type->get_gdb_reg_list(target, ®_list, ®_list_size)) != ERROR_OK) { - switch (retval) - { - case ERROR_TARGET_NOT_HALTED: - ERROR("gdb tried to registers but we're not halted, dropping connection"); - return ERROR_SERVER_REMOTE_CLOSED; - default: - /* this is a bug condition - get_gdb_reg_list() may not return any other error */ - ERROR("BUG: unexpected error returned by get_gdb_reg_list()"); - exit(-1); - } + return gdb_error(connection, retval); } packet_p = packet; @@ -870,23 +913,23 @@ 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) { - ERROR("BUG: encountered unregistered arch type"); + LOG_ERROR("BUG: encountered unregistered arch type"); exit(-1); } 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); @@ -903,26 +946,17 @@ int gdb_get_register_packet(connection_t *connection, target_t *target, char *pa int retval; #ifdef _DEBUG_GDB_IO_ - DEBUG("-"); + LOG_DEBUG("-"); #endif if ((retval = target->type->get_gdb_reg_list(target, ®_list, ®_list_size)) != ERROR_OK) { - switch (retval) - { - case ERROR_TARGET_NOT_HALTED: - ERROR("gdb requested registers but we're not halted, dropping connection"); - return ERROR_SERVER_REMOTE_CLOSED; - default: - /* this is a bug condition - get_gdb_reg_list() may not return any other error */ - ERROR("BUG: unexpected error returned by get_gdb_reg_list()"); - exit(-1); - } + return gdb_error(connection, retval); } if (reg_list_size <= reg_num) { - ERROR("gdb requested a non-existing register"); + LOG_ERROR("gdb requested a non-existing register"); exit(-1); } @@ -949,31 +983,22 @@ int gdb_set_register_packet(connection_t *connection, target_t *target, char *pa int retval; reg_arch_type_t *arch_type; - DEBUG("-"); + LOG_DEBUG("-"); if ((retval = target->type->get_gdb_reg_list(target, ®_list, ®_list_size)) != ERROR_OK) { - switch (retval) - { - case ERROR_TARGET_NOT_HALTED: - ERROR("gdb tried to set a register but we're not halted, dropping connection"); - return ERROR_SERVER_REMOTE_CLOSED; - default: - /* this is a bug condition - get_gdb_reg_list() may not return any other error */ - ERROR("BUG: unexpected error returned by get_gdb_reg_list()"); - exit(-1); - } + return gdb_error(connection, retval); } if (reg_list_size < reg_num) { - ERROR("gdb requested a non-existing register"); - return ERROR_SERVER_REMOTE_CLOSED; + LOG_ERROR("gdb requested a non-existing register"); + return ERROR_SERVER_REMOTE_CLOSED; } if (*separator != '=') { - ERROR("GDB 'set register packet', but no '=' following the register number"); + LOG_ERROR("GDB 'set register packet', but no '=' following the register number"); return ERROR_SERVER_REMOTE_CLOSED; } @@ -985,11 +1010,11 @@ 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) { - ERROR("BUG: encountered unregistered arch type"); + LOG_ERROR("BUG: encountered unregistered arch type"); exit(-1); } arch_type->set(reg_list[reg_num], bin_buf); @@ -1003,13 +1028,10 @@ int gdb_set_register_packet(connection_t *connection, target_t *target, char *pa return ERROR_OK; } -int gdb_memory_packet_error(connection_t *connection, int retval) +int gdb_error(connection_t *connection, int retval) { switch (retval) { - case ERROR_TARGET_NOT_HALTED: - ERROR("gdb tried to read memory but we're not halted, dropping connection"); - return ERROR_SERVER_REMOTE_CLOSED; case ERROR_TARGET_DATA_ABORT: gdb_send_error(connection, EIO); break; @@ -1019,10 +1041,14 @@ int gdb_memory_packet_error(connection_t *connection, int retval) case ERROR_TARGET_UNALIGNED_ACCESS: gdb_send_error(connection, EFAULT); break; + case ERROR_TARGET_NOT_HALTED: + gdb_send_error(connection, EFAULT); + break; default: /* This could be that the target reset itself. */ - ERROR("unexpected error %i. Dropping connection.", retval); - return ERROR_SERVER_REMOTE_CLOSED; + LOG_ERROR("unexpected error %i", retval); + gdb_send_error(connection, EFAULT); + break; } return ERROR_OK; @@ -1030,7 +1056,7 @@ int gdb_memory_packet_error(connection_t *connection, int retval) /* 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) @@ -1051,7 +1077,7 @@ int gdb_read_memory_packet(connection_t *connection, target_t *target, char *pac if (*separator != ',') { - ERROR("incomplete read memory packet received, dropping connection"); + LOG_ERROR("incomplete read memory packet received, dropping connection"); return ERROR_SERVER_REMOTE_CLOSED; } @@ -1059,7 +1085,7 @@ int gdb_read_memory_packet(connection_t *connection, target_t *target, char *pac buffer = malloc(len); - DEBUG("addr: 0x%8.8x, len: 0x%8.8x", addr, len); + LOG_DEBUG("addr: 0x%8.8x, len: 0x%8.8x", addr, len); retval = target_read_buffer(target, addr, len, buffer); @@ -1067,11 +1093,11 @@ int gdb_read_memory_packet(connection_t *connection, target_t *target, char *pac { /* 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. @@ -1099,7 +1125,7 @@ int gdb_read_memory_packet(connection_t *connection, target_t *target, char *pac } else { - retval = gdb_memory_packet_error(connection, retval); + retval = gdb_error(connection, retval); } free(buffer); @@ -1125,7 +1151,7 @@ int gdb_write_memory_packet(connection_t *connection, target_t *target, char *pa if (*separator != ',') { - ERROR("incomplete write memory packet received, dropping connection"); + LOG_ERROR("incomplete write memory packet received, dropping connection"); return ERROR_SERVER_REMOTE_CLOSED; } @@ -1133,13 +1159,13 @@ int gdb_write_memory_packet(connection_t *connection, target_t *target, char *pa if (*(separator++) != ':') { - ERROR("incomplete write memory packet received, dropping connection"); + LOG_ERROR("incomplete write memory packet received, dropping connection"); return ERROR_SERVER_REMOTE_CLOSED; } buffer = malloc(len); - DEBUG("addr: 0x%8.8x, len: 0x%8.8x", addr, len); + LOG_DEBUG("addr: 0x%8.8x, len: 0x%8.8x", addr, len); for (i=0; i 1) { @@ -1232,33 +1258,16 @@ void gdb_step_continue_packet(connection_t *connection, target_t *target, char * if (packet[0] == 'c') { - DEBUG("continue"); - target->type->resume(target, current, address, 0, 0); /* resume at current address, don't handle breakpoints, not debugging */ + LOG_DEBUG("continue"); + target_invoke_script(connection->cmd_ctx, target, "pre_resume"); + retval=target_resume(target, current, address, 0, 0); /* resume at current address, don't handle breakpoints, not debugging */ } else if (packet[0] == 's') { - DEBUG("step"); - target->type->step(target, current, address, 0); /* step at current or address, don't handle breakpoints */ - } -} - -int gdb_bp_wp_packet_error(connection_t *connection, int retval) -{ - switch (retval) - { - case ERROR_TARGET_NOT_HALTED: - ERROR("gdb tried to set a breakpoint but we're not halted, dropping connection"); - return ERROR_SERVER_REMOTE_CLOSED; - break; - case ERROR_TARGET_RESOURCE_NOT_AVAILABLE: - gdb_send_error(connection, EBUSY); - break; - default: - ERROR("BUG: unexpected error %i", retval); - exit(-1); + LOG_DEBUG("step"); + retval=target->type->step(target, current, address, 0); /* step at current or address, don't handle breakpoints */ } - - return ERROR_OK; + return retval; } int gdb_breakpoint_watchpoint_packet(connection_t *connection, target_t *target, char *packet, int packet_size) @@ -1271,7 +1280,7 @@ int gdb_breakpoint_watchpoint_packet(connection_t *connection, target_t *target, char *separator; int retval; - DEBUG("-"); + LOG_DEBUG("-"); type = strtoul(packet + 1, &separator, 16); @@ -1285,10 +1294,15 @@ int gdb_breakpoint_watchpoint_packet(connection_t *connection, target_t *target, wp_type = WPT_READ; else if (type == 4) /* access watchpoint */ wp_type = WPT_ACCESS; + + if (gdb_breakpoint_override&&((bp_type==BKPT_SOFT)||(bp_type==BKPT_HARD))) + { + bp_type=gdb_breakpoint_override_type; + } if (*separator != ',') { - ERROR("incomplete breakpoint/watchpoint packet received, dropping connection"); + LOG_ERROR("incomplete breakpoint/watchpoint packet received, dropping connection"); return ERROR_SERVER_REMOTE_CLOSED; } @@ -1296,7 +1310,7 @@ int gdb_breakpoint_watchpoint_packet(connection_t *connection, target_t *target, if (*separator != ',') { - ERROR("incomplete breakpoint/watchpoint packet received, dropping connection"); + LOG_ERROR("incomplete breakpoint/watchpoint packet received, dropping connection"); return ERROR_SERVER_REMOTE_CLOSED; } @@ -1310,7 +1324,7 @@ int gdb_breakpoint_watchpoint_packet(connection_t *connection, target_t *target, { if ((retval = breakpoint_add(target, address, size, bp_type)) != ERROR_OK) { - if ((retval = gdb_bp_wp_packet_error(connection, retval)) != ERROR_OK) + if ((retval = gdb_error(connection, retval)) != ERROR_OK) return retval; } else @@ -1332,7 +1346,7 @@ int gdb_breakpoint_watchpoint_packet(connection_t *connection, target_t *target, { if ((retval = watchpoint_add(target, address, size, type-2, 0, 0xffffffffu)) != ERROR_OK) { - if ((retval = gdb_bp_wp_packet_error(connection, retval)) != ERROR_OK) + if ((retval = gdb_error(connection, retval)) != ERROR_OK) return retval; } else @@ -1362,14 +1376,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); @@ -1381,26 +1395,26 @@ void xml_printf(int *retval, char **xml, int *pos, int *size, const char *fmt, . return; } } - - va_list ap; - int ret; - va_start(ap, fmt); - ret = vsnprintf(*xml + *pos, *size - *pos, fmt, ap); - va_end(ap); - if ((ret > 0) && ((ret + 1) < *size - *pos)) - { - *pos += ret; - return; - } - /* there was just enough or not enough space, allocate more. */ - first = 0; + + va_list ap; + int ret; + va_start(ap, fmt); + ret = vsnprintf(*xml + *pos, *size - *pos, fmt, ap); + va_end(ap); + if ((ret > 0) && ((ret + 1) < *size - *pos)) + { + *pos += ret; + return; + } + /* there was just enough or not enough space, allocate more. */ + first = 0; } } 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 != ':') @@ -1408,17 +1422,17 @@ static int decode_xfer_read(char *buf, char **annex, int *ofs, unsigned int *len 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; } @@ -1426,21 +1440,40 @@ 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; } +static int compare_bank (const void * a, const void * b) +{ + flash_bank_t *b1, *b2; + b1=*((flash_bank_t **)a); + b2=*((flash_bank_t **)b); + + if (b1->base==b2->base) + { + return 0; + } else if (b1->base>b2->base) + { + return 1; + } else + { + return -1; + } +} + int gdb_query_packet(connection_t *connection, target_t *target, char *packet, int packet_size) { command_context_t *cmd_ctx = connection->cmd_ctx; + gdb_connection_t *gdb_connection = connection->priv; if (strstr(packet, "qRcmd,")) { @@ -1456,11 +1489,13 @@ 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(); + target_call_timer_callbacks_now(); command_run_line(cmd_ctx, cmd); + target_call_timer_callbacks_now(); + log_remove_callback(gdb_log_callback, connection); free(cmd); } gdb_put_packet(connection, "OK", 2); @@ -1476,22 +1511,22 @@ int gdb_query_packet(connection_t *connection, target_t *target, char *packet, i 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"); + LOG_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); @@ -1499,10 +1534,10 @@ 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; + if ((retval = gdb_error(connection, retval)) != ERROR_OK) + return retval; } - + return ERROR_OK; } } @@ -1515,66 +1550,105 @@ 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, - "PacketSize=%x;qXfer:memory-map:read%c;qXfer:features:read-", - (GDB_BUFFER_SIZE - 1), gdb_use_memory_map == 1 ? '+' : '-'); - + xml_printf(&retval, &buffer, &pos, &size, + "PacketSize=%x;qXfer:memory-map:read%c;qXfer:features:read-;QStartNoAckMode+", + (GDB_BUFFER_SIZE - 1), ((gdb_use_memory_map == 1)&&(flash_get_bank_count()>0)) ? '+' : '-'); + 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::")) + else if (strstr(packet, "qXfer:memory-map:read::")&&(flash_get_bank_count()>0)) { /* 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"); + + /* + sort banks in ascending order, we need to make non-flash memory be ram(or rather + read/write) by default for GDB. + GDB does not have a concept of non-cacheable read/write memory. + */ + flash_bank_t **banks=malloc(sizeof(flash_bank_t *)*flash_get_bank_count()); + int i; - int i = 0; - for (;;) + for (i=0; ibase) + { + xml_printf(&retval, &xml, &pos, &size, "\n", + ram_start, p->base-ram_start); + } /* 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, blocksize); - i++; + ram_start=p->base+p->size; + } + if (ram_start!=0) + { + xml_printf(&retval, &xml, &pos, &size, "\n", + ram_start, 0-ram_start); + } else + { + /* a flash chip could be at the very end of the 32 bit address space, in which case + ram_start will be precisely 0 */ } + free(banks); + banks = NULL; + xml_printf(&retval, &xml, &pos, &size, "\n"); if (retval != ERROR_OK) @@ -1582,7 +1656,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; @@ -1592,52 +1666,58 @@ 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; unsigned int length; char *annex; - + /* skip command character */ packet += 20; - + 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); - + + gdb_put_packet(connection, xml, strlen(xml)); + free(xml); return ERROR_OK; } - + else if (strstr(packet, "QStartNoAckMode")) + { + gdb_connection->noack_mode = 1; + gdb_put_packet(connection, "OK", 2); + return ERROR_OK; + } + gdb_put_packet(connection, "", 0); return ERROR_OK; } @@ -1649,22 +1729,22 @@ 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') { - ERROR("incomplete vFlashErase packet received, dropping connection"); + LOG_ERROR("incomplete vFlashErase packet received, dropping connection"); return ERROR_SERVER_REMOTE_CLOSED; } @@ -1672,7 +1752,7 @@ int gdb_v_packet(connection_t *connection, target_t *target, char *packet, int p if (*(parse++) != ',' || *parse == '\0') { - ERROR("incomplete vFlashErase packet received, dropping connection"); + LOG_ERROR("incomplete vFlashErase packet received, dropping connection"); return ERROR_SERVER_REMOTE_CLOSED; } @@ -1680,17 +1760,17 @@ int gdb_v_packet(connection_t *connection, target_t *target, char *packet, int p if (*parse != '\0') { - ERROR("incomplete vFlashErase packet received, dropping connection"); + LOG_ERROR("incomplete vFlashErase packet received, dropping connection"); return ERROR_SERVER_REMOTE_CLOSED; } - + /* 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); - + target_call_event_callbacks(gdb_service->target, TARGET_EVENT_GDB_FLASH_ERASE_START); + /* perform erase */ if ((result = flash_erase_address_range(gdb_service->target, addr, length)) != ERROR_OK) { @@ -1698,11 +1778,11 @@ int gdb_v_packet(connection_t *connection, target_t *target, char *packet, int p * treat a failed erase as an I/O error */ gdb_send_error(connection, EIO); - ERROR("flash_erase returned %i", result); + LOG_ERROR("flash_erase returned %i", result); } else gdb_put_packet(connection, "OK", 2); - + return ERROR_OK; } @@ -1714,17 +1794,17 @@ int gdb_v_packet(connection_t *connection, target_t *target, char *packet, int p if (*parse == '\0') { - ERROR("incomplete vFlashErase packet received, dropping connection"); + LOG_ERROR("incomplete vFlashErase packet received, dropping connection"); return ERROR_SERVER_REMOTE_CLOSED; } addr = strtoul(parse, &parse, 16); if (*(parse++) != ':') { - ERROR("incomplete vFlashErase packet received, dropping connection"); + LOG_ERROR("incomplete vFlashErase packet received, dropping connection"); return ERROR_SERVER_REMOTE_CLOSED; } length = packet_size - (parse - packet); - + /* create a new image if there isn't already one */ if (gdb_connection->vflash_image == NULL) { @@ -1755,14 +1835,14 @@ int gdb_v_packet(connection_t *connection, target_t *target, char *packet, int p } else { - DEBUG("wrote %u bytes from vFlash image to flash", written); + LOG_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; - + return ERROR_OK; } @@ -1775,52 +1855,59 @@ int gdb_detach(connection_t *connection, target_t *target) switch( detach_mode ) { case GDB_DETACH_RESUME: - target->type->resume(target, 1, 0, 1, 0); + target_invoke_script(connection->cmd_ctx, target, "pre_resume"); + target_resume(target, 1, 0, 1, 0); break; - + case GDB_DETACH_RESET: - target_process_reset(connection->cmd_ctx); + /* FIX?? make this configurable?? */ + target_process_reset(connection->cmd_ctx, RESET_HALT); break; - + case GDB_DETACH_HALT: - target->type->halt(target); + target_halt(target); break; - + case GDB_DETACH_NOTHING: break; } - + gdb_put_packet(connection, "OK", 2); - + return ERROR_OK; } -static void gdb_log_callback(void *priv, const char *file, int line, - const char *function, const char *format, va_list args) +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; } - char *t = alloc_printf(format, args); - if (t == NULL) - return; - - gdb_output_con(connection, t); - - free(t); + gdb_output_con(connection, string); +} + +/* Do not allocate this on the stack */ +char gdb_packet_buffer[GDB_BUFFER_SIZE]; + +static void gdb_sig_halted(connection_t *connection) +{ + char sig_reply[4]; + snprintf(sig_reply, 4, "T%2.2x", 2); + gdb_put_packet(connection, sig_reply, 3); + } int gdb_input_inner(connection_t *connection) { gdb_service_t *gdb_service = connection->service->priv; target_t *target = gdb_service->target; - char packet[GDB_BUFFER_SIZE]; + char *packet=gdb_packet_buffer; int packet_size; int retval; gdb_connection_t *gdb_con = connection->priv; @@ -1838,7 +1925,7 @@ int gdb_input_inner(connection_t *connection) /* terminate with zero */ packet[packet_size] = 0; - DEBUG("received packet: '%s'", packet); + LOG_DEBUG("received packet: '%s'", packet); if (packet_size > 0) { @@ -1846,11 +1933,12 @@ int gdb_input_inner(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; case 'q': + case 'Q': retval = gdb_query_packet(connection, target, packet, packet_size); break; case 'g': @@ -1881,12 +1969,27 @@ int gdb_input_inner(connection_t *connection) case 'c': case 's': { - /* 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); + if (target->state != TARGET_HALTED) + { + /* If the target isn't in the halted state, then we can't + * step/continue. This might be early setup, etc. + */ + gdb_sig_halted(connection); + } else + { + /* 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); + int retval=gdb_step_continue_packet(connection, target, packet, packet_size); + if (retval!=ERROR_OK) + { + /* we'll never receive a halted condition... issue a false one.. */ + gdb_frontend_halted(target, connection); + } + } } break; case 'v': @@ -1912,11 +2015,13 @@ int gdb_input_inner(connection_t *connection) break; case 'R': /* handle extended restart packet */ - target_process_reset(connection->cmd_ctx); + breakpoint_clear_target(gdb_service->target); + watchpoint_clear_target(gdb_service->target); + command_run_linef(connection->cmd_ctx, "ocd_gdb_restart %d", get_num_by_target(target)); break; default: /* ignore unkown packets */ - DEBUG("ignoring 0x%2.2x packet", packet[0]); + LOG_DEBUG("ignoring 0x%2.2x packet", packet[0]); gdb_put_packet(connection, NULL, 0); break; } @@ -1930,7 +2035,7 @@ int gdb_input_inner(connection_t *connection) { if (target->state == TARGET_RUNNING) { - target->type->halt(target); + target_halt(target); gdb_con->ctrl_c = 0; } } @@ -1943,27 +2048,32 @@ int gdb_input_inner(connection_t *connection) int gdb_input(connection_t *connection) { int retval = gdb_input_inner(connection); + gdb_connection_t *gdb_con = connection->priv; if (retval == ERROR_SERVER_REMOTE_CLOSED) return retval; + + /* logging does not propagate the error, yet can set th gdb_con->closed flag */ + if (gdb_con->closed) + return ERROR_SERVER_REMOTE_CLOSED; + /* we'll recover from any other errors(e.g. temporary timeouts, etc.) */ return ERROR_OK; } -int gdb_init() +int gdb_init(void) { gdb_service_t *gdb_service; - target_t *target = targets; - int i = 0; + target_t *target = all_targets; if (!target) { - WARNING("no gdb ports allocated as no target has been specified"); + LOG_WARNING("no gdb ports allocated as no target has been specified"); return ERROR_OK; } if (gdb_port == 0) { - WARNING("no gdb port specified, using default port 3333"); + LOG_WARNING("no gdb port specified, using default port 3333"); gdb_port = 3333; } @@ -1971,16 +2081,21 @@ int gdb_init() { char service_name[8]; - snprintf(service_name, 8, "gdb-%2.2i", i); + snprintf(service_name, 8, "gdb-%2.2i", target->target_number); gdb_service = malloc(sizeof(gdb_service_t)); gdb_service->target = target; - add_service("gdb", CONNECTION_GDB, gdb_port + i, 1, gdb_new_connection, gdb_input, gdb_connection_closed, gdb_service); + add_service("gdb", CONNECTION_GDB, + gdb_port + target->target_number, + 1, gdb_new_connection, gdb_input, + gdb_connection_closed, + gdb_service); - DEBUG("gdb service for target %s at port %i", target->type->name, gdb_port + i); + LOG_DEBUG("gdb service for target %s at port %i", + target->type->name, + gdb_port + target->target_number); - i++; target = target->next; } @@ -2025,8 +2140,8 @@ 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]); + + LOG_WARNING("invalid gdb_detach configuration directive: %s", args[0]); return ERROR_OK; } @@ -2045,8 +2160,8 @@ 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]); + + LOG_WARNING("invalid gdb_memory_map configuration directive: %s", args[0]); return ERROR_OK; } @@ -2065,8 +2180,8 @@ 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]); + + LOG_WARNING("invalid gdb_memory_map configuration directive: %s", args[0]); return ERROR_OK; } @@ -2085,11 +2200,46 @@ int handle_gdb_report_data_abort_command(struct command_context_s *cmd_ctx, char return ERROR_OK; } } + + LOG_WARNING("invalid gdb_report_data_abort configuration directive: %s", args[0]); + return ERROR_OK; +} + +/* daemon configuration command gdb_port */ +int handle_gdb_breakpoint_override_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) +{ + if (argc == 0) + { + + } else if (argc==1) + { + gdb_breakpoint_override = 1; + if (strcmp(args[0], "hard")==0) + { + gdb_breakpoint_override_type=BKPT_HARD; + } else if (strcmp(args[0], "soft")==0) + { + gdb_breakpoint_override_type=BKPT_SOFT; + } else if (strcmp(args[0], "disable") == 0) + { + gdb_breakpoint_override = 0; + } + } else + { + return ERROR_COMMAND_SYNTAX_ERROR; + } + if (gdb_breakpoint_override) + { + LOG_USER("force %s breakpoints", (gdb_breakpoint_override_type==BKPT_HARD)?"hard":"soft"); + } else + { + LOG_USER("breakpoint type is not overriden"); + } - 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, @@ -2102,5 +2252,10 @@ int gdb_register_commands(command_context_t *command_context) COMMAND_CONFIG, ""); register_command(command_context, NULL, "gdb_report_data_abort", handle_gdb_report_data_abort_command, COMMAND_CONFIG, ""); + register_command(command_context, NULL, "gdb_breakpoint_override", handle_gdb_breakpoint_override_command, + COMMAND_EXEC, "hard/soft/disabled - force breakpoint type for gdb 'break' commands." + "The raison d'etre for this option is to support GDB GUI's without " + "a hard/soft breakpoint concept where the default OpenOCD behaviour " + "is not sufficient"); return ERROR_OK; }