* Copyright (C) 2005 by Dominic Rath *
* Dominic.Rath@gmx.de *
* *
- * Copyright (C) 2007,2008 Øyvind Harboe *
+ * Copyright (C) 2007,2008 Øyvind Harboe *
* oyvind.harboe@zylin.com *
* *
* Copyright (C) 2008 by Spencer Oliver *
#define _DEBUG_GDB_IO_
#endif
+static gdb_connection_t *current_gdb_connection;
+
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 unsigned short gdb_port = 3333;
static const char *DIGITS = "0123456789abcdef";
static void gdb_log_callback(void *priv, const char *file, int line,
fd_set read_fds;
gdb_connection_t *gdb_con = connection->priv;
int t;
- if (got_data==NULL)
+ if (got_data == NULL)
got_data=&t;
- *got_data=0;
+ *got_data = 0;
- if (gdb_con->buf_cnt>0)
+ if (gdb_con->buf_cnt > 0)
{
*got_data = 1;
return ERROR_OK;
/* This can typically be because a "monitor" command took too long
* before printing any progress messages
*/
- if (timeout_s>0)
+ if (timeout_s > 0)
{
return ERROR_GDB_TIMEOUT;
} else
return ERROR_OK;
}
}
- *got_data=FD_ISSET(connection->fd, &read_fds)!=0;
+ *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;
+ int retval = ERROR_OK;
#ifdef _DEBUG_GDB_IO_
char *debug_buffer;
#ifdef _WIN32
errno = WSAGetLastError();
- switch(errno)
+ switch (errno)
{
case WSAEWOULDBLOCK:
usleep(1000);
exit(-1);
}
#else
- switch(errno)
+ switch (errno)
{
case EAGAIN:
usleep(1000);
int gotdata;
for (;;)
{
- if ((retval=check_pending(connection, 0, &gotdata))!=ERROR_OK)
+ 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;
- if( reply == '$' ){
+ if (reply == '$') {
/* fix a problem with some IAR tools */
- gdb_putback_char( connection, reply );
+ gdb_putback_char(connection, reply);
LOG_DEBUG("Unexpected start of new packet");
break;
}
if ((size_t)len + 4 <= sizeof(local_buffer))
{
/* performance gain on smaller packets by only a single call to gdb_write() */
- memcpy(local_buffer+1, buffer, len++);
+ memcpy(local_buffer + 1, buffer, len++);
local_buffer[len++] = '#';
local_buffer[len++] = DIGITS[(my_checksum >> 4) & 0xf];
local_buffer[len++] = DIGITS[my_checksum & 0xf];
- if((retval = gdb_write(connection, local_buffer, len)) != ERROR_OK)
+ if ((retval = gdb_write(connection, local_buffer, len)) != ERROR_OK)
{
return retval;
}
local_buffer[1] = '#';
local_buffer[2] = DIGITS[(my_checksum >> 4) & 0xf];
local_buffer[3] = DIGITS[my_checksum & 0xf];
- if((retval = gdb_write(connection, local_buffer, 1)) != ERROR_OK)
+ if ((retval = gdb_write(connection, local_buffer, 1)) != ERROR_OK)
{
return retval;
}
- if((retval = gdb_write(connection, buffer, len)) != ERROR_OK)
+ if ((retval = gdb_write(connection, buffer, len)) != ERROR_OK)
{
return retval;
}
- if((retval = gdb_write(connection, local_buffer+1, 3)) != ERROR_OK)
+ if ((retval = gdb_write(connection, local_buffer + 1, 3)) != ERROR_OK)
{
return retval;
}
log_remove_callback(gdb_log_callback, connection);
LOG_WARNING("negative reply, retrying");
}
- else if( reply == '$' ){
+ else if (reply == '$') {
LOG_ERROR("GDB missing ack(1) - assumed good");
- gdb_putback_char( connection, reply );
+ gdb_putback_char(connection, reply);
return ERROR_OK;
} else {
LOG_ERROR("unknown character(1) 0x%2.2x in reply, dropping connection", reply);
- gdb_con->closed=1;
+ gdb_con->closed = 1;
return ERROR_SERVER_REMOTE_CLOSED;
}
}
- else if( reply == '$' ){
+ else if (reply == '$') {
LOG_ERROR("GDB missing ack(2) - assumed good");
- gdb_putback_char( connection, reply );
+ gdb_putback_char(connection, reply);
return ERROR_OK;
}
else
{
LOG_ERROR("unknown character(2) 0x%2.2x in reply, dropping connection", reply);
- gdb_con->closed=1;
+ gdb_con->closed = 1;
return ERROR_SERVER_REMOTE_CLOSED;
}
}
* We need to leave at least 2 bytes in the buffer to have
* gdb_get_char() update various bits and bobs correctly.
*/
- if ((gdb_con->buf_cnt > 2) && ((gdb_con->buf_cnt+count) < *len))
+ 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
if (!noack)
{
- *checksum_ok=(my_checksum == strtoul(checksum, NULL, 16));
+ *checksum_ok = (my_checksum == strtoul(checksum, NULL, 16));
}
return ERROR_OK;
*/
if (gdb_con->noack_mode)
{
- if ((retval=fetch_packet(connection, &checksum_ok, 1, len, buffer))!=ERROR_OK)
+ if ((retval = fetch_packet(connection, &checksum_ok, 1, len, buffer)) != ERROR_OK)
return retval;
} else
{
- if ((retval=fetch_packet(connection, &checksum_ok, 0, len, buffer))!=ERROR_OK)
+ if ((retval = fetch_packet(connection, &checksum_ok, 0, len, buffer)) != ERROR_OK)
return retval;
}
return ERROR_GDB_BUFFER_TOO_SMALL;
hex_buffer[0] = 'O';
- for (i=0; i<bin_size; i++)
+ for (i = 0; i < bin_size; i++)
snprintf(hex_buffer + 1 + i*2, 3, "%2.2x", line[i]);
- hex_buffer[bin_size*2+1] = 0;
+ hex_buffer[bin_size*2 + 1] = 0;
int retval = gdb_put_packet(connection, hex_buffer, bin_size*2 + 1);
{
gdb_connection_t *gdb_connection = connection->priv;
- /* In the GDB protocol when we are stepping or coninuing execution,
+ /* In the GDB protocol when we are stepping or continuing 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.
int retval;
connection_t *connection = priv;
- target_handle_event( target, event );
+ target_handle_event(target, event);
switch (event)
{
- case TARGET_EVENT_EARLY_HALTED:
+ case TARGET_EVENT_GDB_HALT:
gdb_frontend_halted(target, connection);
break;
case TARGET_EVENT_HALTED:
target_call_event_callbacks(target, TARGET_EVENT_GDB_END);
break;
case TARGET_EVENT_GDB_FLASH_ERASE_START:
- target_handle_event( target, TARGET_EVENT_OLD_gdb_program_config );
- if((retval = jtag_execute_queue()) != ERROR_OK)
+ target_handle_event(target, TARGET_EVENT_OLD_gdb_program_config);
+ if ((retval = jtag_execute_queue()) != ERROR_OK)
{
return retval;
}
gdb_connection->closed = 0;
gdb_connection->busy = 0;
gdb_connection->noack_mode = 0;
+ gdb_connection->sync = true;
/* send ACK to GDB for debug request */
gdb_write(connection, "+", 1);
/* register callback to be informed about target events */
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;
*/
if (initial_ack != '+')
gdb_putback_char(connection, initial_ack);
- target_call_event_callbacks(gdb_service->target, TARGET_EVENT_GDB_ATTACH );
+ target_call_event_callbacks(gdb_service->target, TARGET_EVENT_GDB_ATTACH);
gdb_actual_connections++;
+ LOG_DEBUG("New GDB Connection: %d, Target %s, state: %s",
+ gdb_actual_connections,
+ gdb_service->target->cmd_name,
+ target_state_name(gdb_service->target));
return ERROR_OK;
}
gdb_service_t *gdb_service = connection->service->priv;
gdb_connection_t *gdb_connection = connection->priv;
+ /* we're done forwarding messages. Tear down callback before
+ * cleaning up connection.
+ */
+ log_remove_callback(gdb_log_callback, connection);
+
gdb_actual_connections--;
+ LOG_DEBUG("GDB Close, Target: %s, state: %s, gdb_actual_connections=%d",
+ gdb_service->target->cmd_name,
+ target_state_name(gdb_service->target),
+ gdb_actual_connections);
/* see if an image built with vFlash commands is left */
if (gdb_connection->vflash_image)
LOG_ERROR("BUG: connection->priv == NULL");
}
+
target_unregister_event_callback(gdb_target_callback_event_handler, connection);
+
target_call_event_callbacks(gdb_service->target, TARGET_EVENT_GDB_END);
- log_remove_callback(gdb_log_callback, connection);
- target_call_event_callbacks(gdb_service->target, TARGET_EVENT_GDB_DETACH );
+ target_call_event_callbacks(gdb_service->target, TARGET_EVENT_GDB_DETACH);
return ERROR_OK;
}
-void gdb_send_error(connection_t *connection, u8 the_error)
+void gdb_send_error(connection_t *connection, uint8_t the_error)
{
char err[4];
- snprintf(err, 4, "E%2.2X", the_error );
+ snprintf(err, 4, "E%2.2X", the_error);
gdb_put_packet(connection, err, 3);
}
{
int i;
- u8 *buf;
+ uint8_t *buf;
int buf_len;
buf = reg->value;
buf_len = CEIL(reg->size, 8);
{
int j = gdb_reg_pos(target, i, buf_len);
tstr[i*2] = DIGITS[(buf[j]>>4) & 0xf];
- tstr[i*2+1] = DIGITS[buf[j]&0xf];
+ tstr[i*2 + 1] = DIGITS[buf[j]&0xf];
}
}
{
return c-'0';
}
- c=toupper(c);
+ c = toupper(c);
if (c>='A'&&c<='F')
{
return c-'A'+10;
}
/* copy over in register buffer */
-void gdb_target_to_reg(target_t *target, char *tstr, int str_len, u8 *bin)
+void gdb_target_to_reg(target_t *target, char *tstr, int str_len, uint8_t *bin)
{
if (str_len % 2)
{
}
int i;
- for (i = 0; i < str_len; i+=2)
+ for (i = 0; i < str_len; i += 2)
{
- u8 t = hextoint(tstr[i])<<4;
- t |= hextoint(tstr[i+1]);
+ uint8_t t = hextoint(tstr[i]) << 4;
+ t |= hextoint(tstr[i + 1]);
int j = gdb_reg_pos(target, i/2, str_len/2);
bin[j] = t;
packet_p = packet;
for (i = 0; i < reg_list_size; i++)
{
- u8 *bin_buf;
+ uint8_t *bin_buf;
int chars = (CEIL(reg_list[i]->size, 8) * 2);
if (packet_p + chars > packet + packet_size)
int gdb_set_register_packet(connection_t *connection, target_t *target, char *packet, int packet_size)
{
char *separator;
- u8 *bin_buf;
+ uint8_t *bin_buf;
int reg_num = strtoul(packet + 1, &separator, 16);
reg_t **reg_list;
int reg_list_size;
int gdb_read_memory_packet(connection_t *connection, target_t *target, char *packet, int packet_size)
{
char *separator;
- u32 addr = 0;
- u32 len = 0;
+ uint32_t addr = 0;
+ uint32_t len = 0;
- u8 *buffer;
+ uint8_t *buffer;
char *hex_buffer;
int retval = ERROR_OK;
return ERROR_SERVER_REMOTE_CLOSED;
}
- len = strtoul(separator+1, NULL, 16);
+ len = strtoul(separator + 1, NULL, 16);
buffer = malloc(len);
- LOG_DEBUG("addr: 0x%8.8x, len: 0x%8.8x", addr, len);
+ LOG_DEBUG("addr: 0x%8.8" PRIx32 ", len: 0x%8.8" PRIx32 "", addr, len);
retval = target_read_buffer(target, addr, len, buffer);
- if ((retval!=ERROR_OK)&&!gdb_report_data_abort)
+ if ((retval != ERROR_OK)&&!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.
* 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
+ * 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.
{
hex_buffer = malloc(len * 2 + 1);
- u32 i;
+ uint32_t i;
for (i = 0; i < len; i++)
{
- u8 t = buffer[i];
+ uint8_t t = buffer[i];
hex_buffer[2 * i] = DIGITS[(t >> 4) & 0xf];
hex_buffer[2 * i + 1] = DIGITS[t & 0xf];
}
int gdb_write_memory_packet(connection_t *connection, target_t *target, char *packet, int packet_size)
{
char *separator;
- u32 addr = 0;
- u32 len = 0;
+ uint32_t addr = 0;
+ uint32_t len = 0;
- u8 *buffer;
+ uint8_t *buffer;
- u32 i;
+ uint32_t i;
int retval;
/* skip command character */
return ERROR_SERVER_REMOTE_CLOSED;
}
- len = strtoul(separator+1, &separator, 16);
+ len = strtoul(separator + 1, &separator, 16);
if (*(separator++) != ':')
{
buffer = malloc(len);
- LOG_DEBUG("addr: 0x%8.8x, len: 0x%8.8x", addr, len);
+ LOG_DEBUG("addr: 0x%8.8" PRIx32 ", len: 0x%8.8" PRIx32 "", addr, len);
- for (i=0; i<len; i++)
+ for (i = 0; i < len; i++)
{
- u32 tmp;
- sscanf(separator + 2*i, "%2x", &tmp);
+ uint32_t tmp;
+ sscanf(separator + 2*i, "%2" SCNx32 , &tmp);
buffer[i] = tmp;
}
int gdb_write_memory_binary_packet(connection_t *connection, target_t *target, char *packet, int packet_size)
{
char *separator;
- u32 addr = 0;
- u32 len = 0;
+ uint32_t addr = 0;
+ uint32_t len = 0;
int retval;
return ERROR_SERVER_REMOTE_CLOSED;
}
- len = strtoul(separator+1, &separator, 16);
+ len = strtoul(separator + 1, &separator, 16);
if (*(separator++) != ':')
{
retval = ERROR_OK;
if (len)
{
- LOG_DEBUG("addr: 0x%8.8x, len: 0x%8.8x", addr, len);
+ LOG_DEBUG("addr: 0x%8.8" PRIx32 ", len: 0x%8.8" PRIx32 "", addr, len);
- retval = target_write_buffer(target, addr, len, (u8*)separator);
+ retval = target_write_buffer(target, addr, len, (uint8_t*)separator);
}
if (retval == ERROR_OK)
int gdb_step_continue_packet(connection_t *connection, target_t *target, char *packet, int packet_size)
{
int current = 0;
- u32 address = 0x0;
- int retval=ERROR_OK;
+ uint32_t address = 0x0;
+ int retval = ERROR_OK;
LOG_DEBUG("-");
if (packet[0] == 'c')
{
LOG_DEBUG("continue");
- target_handle_event( target, TARGET_EVENT_OLD_pre_resume );
- retval=target_resume(target, current, address, 0, 0); /* resume at current address, don't handle breakpoints, not debugging */
+ target_handle_event(target, TARGET_EVENT_OLD_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')
{
LOG_DEBUG("step");
- retval=target->type->step(target, current, address, 0); /* step at current or address, don't handle breakpoints */
+ /* step at current or address, don't handle breakpoints */
+ retval = target_step(target, current, address, 0);
}
return retval;
}
int type;
enum breakpoint_type bp_type = BKPT_SOFT /* dummy init to avoid warning */;
enum watchpoint_rw wp_type;
- u32 address;
- u32 size;
+ uint32_t address;
+ uint32_t size;
char *separator;
int retval;
else if (type == 4) /* access watchpoint */
wp_type = WPT_ACCESS;
- if (gdb_breakpoint_override&&((bp_type==BKPT_SOFT)||(bp_type==BKPT_HARD)))
+ if (gdb_breakpoint_override && ((bp_type == BKPT_SOFT)||(bp_type == BKPT_HARD)))
{
- bp_type=gdb_breakpoint_override_type;
+ bp_type = gdb_breakpoint_override_type;
}
if (*separator != ',')
return ERROR_SERVER_REMOTE_CLOSED;
}
- address = strtoul(separator+1, &separator, 16);
+ address = strtoul(separator + 1, &separator, 16);
if (*separator != ',')
{
return ERROR_SERVER_REMOTE_CLOSED;
}
- size = strtoul(separator+1, &separator, 16);
+ size = strtoul(separator + 1, &separator, 16);
switch (type)
{
if (*separator != ',')
return -1;
- *len = strtoul(separator+1, NULL, 16);
+ *len = strtoul(separator + 1, NULL, 16);
return 0;
}
int gdb_calc_blocksize(flash_bank_t *bank)
{
- u32 i;
- u32 block_size = 0xffffffff;
+ uint32_t i;
+ uint32_t block_size = 0xffffffff;
/* loop through all sectors and return smallest sector size */
- for (i = 0; i < (u32)bank->num_sectors; i++)
+ for (i = 0; i < (uint32_t)bank->num_sectors; i++)
{
if (bank->sectors[i].size < block_size)
block_size = bank->sectors[i].size;
b1=*((flash_bank_t **)a);
b2=*((flash_bank_t **)b);
- if (b1->base==b2->base)
+ if (b1->base == b2->base)
{
return 0;
- } else if (b1->base>b2->base)
+ } else if (b1->base > b2->base)
{
return 1;
} else
char *cmd;
int i;
cmd = malloc((packet_size - 6)/2 + 1);
- for (i=0; i < (packet_size - 6)/2; i++)
+ for (i = 0; i < (packet_size - 6)/2; i++)
{
- u32 tmp;
- sscanf(packet + 6 + 2*i, "%2x", &tmp);
+ uint32_t tmp;
+ sscanf(packet + 6 + 2*i, "%2" SCNx32 , &tmp);
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_now();
+ /* some commands need to know the GDB connection, make note of current
+ * GDB connection. */
+ current_gdb_connection = gdb_connection;
command_run_line(cmd_ctx, cmd);
+ current_gdb_connection = NULL;
target_call_timer_callbacks_now();
log_remove_callback(gdb_log_callback, connection);
free(cmd);
int retval;
char gdb_reply[10];
char *separator;
- u32 checksum;
- u32 addr = 0;
- u32 len = 0;
+ uint32_t checksum;
+ uint32_t addr = 0;
+ uint32_t len = 0;
/* skip command character */
packet += 5;
if (retval == ERROR_OK)
{
- snprintf(gdb_reply, 10, "C%8.8x", checksum);
+ snprintf(gdb_reply, 10, "C%8.8" PRIx32 "", checksum);
gdb_put_packet(connection, gdb_reply, 9);
}
else
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)) ? '+' : '-');
+ (GDB_BUFFER_SIZE - 1), ((gdb_use_memory_map == 1) && (flash_get_bank_count() > 0)) ? '+' : '-');
if (retval != ERROR_OK)
{
return ERROR_OK;
}
- else if (strstr(packet, "qXfer:memory-map:read::")&&(flash_get_bank_count()>0))
+ 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
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());
+ flash_bank_t **banks = malloc(sizeof(flash_bank_t *)*flash_get_bank_count());
int i;
- for (i=0; i<flash_get_bank_count(); i++)
+ for (i = 0; i < flash_get_bank_count(); i++)
{
p = get_flash_bank_by_num(i);
if (p == NULL)
qsort(banks, flash_get_bank_count(), sizeof(flash_bank_t *), compare_bank);
- u32 ram_start=0;
- for (i=0; i<flash_get_bank_count(); i++)
+ uint32_t ram_start = 0;
+ for (i = 0; i < flash_get_bank_count(); i++)
{
p = banks[i];
- if (ram_start<p->base)
+ if (ram_start < p->base)
{
xml_printf(&retval, &xml, &pos, &size, "<memory type=\"ram\" start=\"0x%x\" length=\"0x%x\"/>\n",
ram_start, p->base-ram_start);
"<property name=\"blocksize\">0x%x</property>\n" \
"</memory>\n", \
p->base, p->size, blocksize);
- ram_start=p->base+p->size;
+ ram_start = p->base + p->size;
}
- if (ram_start!=0)
+ if (ram_start != 0)
{
xml_printf(&retval, &xml, &pos, &size, "<memory type=\"ram\" start=\"0x%x\" length=\"0x%x\"/>\n",
ram_start, 0-ram_start);
}
xml_printf(&retval, &xml, &pos, &size, \
- "l<target version=\"1.0\">\n<architecture>arm</architecture>\n</target>\n");
+ "l < target version=\"1.0\">\n < architecture > arm</architecture>\n</target>\n");
if (retval != ERROR_OK)
{
/* perform any target specific operations before the erase */
target_call_event_callbacks(gdb_service->target, TARGET_EVENT_GDB_FLASH_ERASE_START);
- result = flash_erase_address_range(gdb_service->target, addr, length );
+ result = flash_erase_address_range(gdb_service->target, addr, length);
target_call_event_callbacks(gdb_service->target, TARGET_EVENT_GDB_FLASH_ERASE_END);
/* perform erase */
}
/* create new section with content from packet buffer */
- if((retval = image_add_section(gdb_connection->vflash_image, addr, length, 0x0, (u8*)parse)) != ERROR_OK)
+ if ((retval = image_add_section(gdb_connection->vflash_image, addr, length, 0x0, (uint8_t*)parse)) != ERROR_OK)
{
return retval;
}
if (!strcmp(packet, "vFlashDone"))
{
- u32 written;
+ uint32_t written;
/* process the flashing buffer. No need to erase as GDB
* always issues a vFlashErase first. */
target_call_event_callbacks(gdb_service->target, TARGET_EVENT_GDB_FLASH_WRITE_START);
result = flash_write(gdb_service->target, gdb_connection->vflash_image, &written, 0);
target_call_event_callbacks(gdb_service->target, TARGET_EVENT_GDB_FLASH_WRITE_END);
- if ( result != ERROR_OK)
+ if (result != ERROR_OK)
{
if (result == ERROR_FLASH_DST_OUT_OF_BANK)
gdb_put_packet(connection, "E.memtype", 9);
}
else
{
- LOG_DEBUG("wrote %u bytes from vFlash image to flash", written);
+ LOG_DEBUG("wrote %u bytes from vFlash image to flash", (unsigned)written);
gdb_put_packet(connection, "OK", 2);
}
int gdb_detach(connection_t *connection, target_t *target)
{
- switch( detach_mode )
+ switch (detach_mode)
{
case GDB_DETACH_RESUME:
- target_handle_event( target, TARGET_EVENT_OLD_pre_resume );
+ target_handle_event(target, TARGET_EVENT_OLD_pre_resume);
target_resume(target, 1, 0, 1, 0);
break;
{
gdb_service_t *gdb_service = connection->service->priv;
target_t *target = gdb_service->target;
- char *packet=gdb_packet_buffer;
+ char *packet = gdb_packet_buffer;
int packet_size;
int retval;
gdb_connection_t *gdb_con = connection->priv;
/* terminate with zero */
packet[packet_size] = 0;
- if( LOG_LEVEL_IS( LOG_LVL_DEBUG ) ){
- if( packet[0] == 'X' ){
+ if (LOG_LEVEL_IS(LOG_LVL_DEBUG)) {
+ if (packet[0] == 'X') {
// binary packets spew junk into the debug log stream
char buf[ 50 ];
int x;
- for( x = 0 ; (x < 49) && (packet[x] != ':') ; x++ ){
+ for (x = 0 ; (x < 49) && (packet[x] != ':') ; x++) {
buf[x] = packet[x];
}
buf[x] = 0;
- LOG_DEBUG("received packet: '%s:<binary-data>'", buf );
+ LOG_DEBUG("received packet: '%s:<binary-data>'", buf);
} else {
- LOG_DEBUG("received packet: '%s'", packet );
+ LOG_DEBUG("received packet: '%s'", packet);
}
}
case 'c':
case 's':
{
- if (target->state != TARGET_HALTED)
+ int retval = ERROR_OK;
+
+ gdb_connection_t *gdb_con = connection->priv;
+ log_add_callback(gdb_log_callback, connection);
+
+ bool nostep = false;
+ if (target->state == TARGET_RUNNING)
{
- /* If the target isn't in the halted state, then we can't
+ LOG_WARNING("The target is already running. Halt target before stepi/continue.");
+ retval = target_halt(target);
+ if (retval == ERROR_OK)
+ retval = target_wait_state(target, TARGET_HALTED, 100);
+ } else if (target->state != TARGET_HALTED)
+ {
+ LOG_WARNING("The target is not in the halted nor running stated, stepi/continue ignored.");
+ nostep = true;
+ } else if ((packet[0] == 's') && gdb_con->sync)
+ {
+ /* Hmm..... when you issue a continue in GDB, then a "stepi" is
+ * sent by GDB first to OpenOCD, thus defeating the check to
+ * make only the single stepping have the sync feature...
+ */
+ nostep = true;
+ LOG_WARNING("stepi ignored. GDB will now fetch the register state from the target.");
+ }
+ gdb_con->sync = false;
+
+ if ((retval!=ERROR_OK) || nostep)
+ {
+ /* Either the target isn't in the halted state, then we can't
* step/continue. This might be early setup, etc.
+ *
+ * Or we want to allow GDB to pick up a fresh set of
+ * register values without modifying the target state.
+ *
*/
gdb_sig_halted(connection);
+
+ /* stop forwarding log packets! */
+ log_remove_callback(gdb_log_callback, 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);
target_call_event_callbacks(target, TARGET_EVENT_GDB_START);
- int retval=gdb_step_continue_packet(connection, target, packet, packet_size);
- if (retval!=ERROR_OK)
+ 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);
/* handle extended restart packet */
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));
+ command_run_linef(connection->cmd_ctx,
+ "ocd_gdb_restart %s",
+ target->cmd_name);
break;
default:
/* ignore unkown packets */
{
if (target->state == TARGET_RUNNING)
{
- target_halt(target);
+ retval = target_halt(target);
+ if (retval != ERROR_OK)
+ {
+ target_call_event_callbacks(target, TARGET_EVENT_GDB_HALT);
+ }
gdb_con->ctrl_c = 0;
+ } else
+ {
+ LOG_INFO("The target is not running when halt was requested, stopping GDB.");
+ target_call_event_callbacks(target, TARGET_EVENT_GDB_HALT);
}
}
if (gdb_port == 0 && server_use_pipes == 0)
{
- LOG_DEBUG("no gdb port specified, using default port 3333");
- gdb_port = 3333;
+ LOG_INFO("gdb port disabled");
+ return ERROR_OK;
}
if (server_use_pipes)
add_service("gdb", CONNECTION_PIPE, 0, 1, gdb_new_connection, gdb_input, gdb_connection_closed, gdb_service);
- LOG_DEBUG("gdb service for target %s using pipes", target->type->name);
+ LOG_DEBUG("gdb service for target %s using pipes",
+ target_get_name(target));
}
else
{
+ unsigned short port = gdb_port;
+
while (target)
{
gdb_service = malloc(sizeof(gdb_service_t));
gdb_service->target = target;
- add_service("gdb", CONNECTION_TCP, gdb_port + target->target_number, 1, gdb_new_connection, gdb_input, gdb_connection_closed, gdb_service);
+ add_service("gdb", CONNECTION_TCP,
+ port, 1,
+ gdb_new_connection, gdb_input,
+ gdb_connection_closed, gdb_service);
- LOG_DEBUG("gdb service for target %s at port %i", target->type->name, gdb_port + target->target_number);
+ LOG_DEBUG("gdb service for target %s at TCP port %i",
+ target_get_name(target),
+ port);
target = target->next;
+ port++;
}
}
return ERROR_OK;
}
+int handle_gdb_sync_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+{
+ if (argc != 0)
+ {
+ return ERROR_COMMAND_SYNTAX_ERROR;
+ }
+
+ if (current_gdb_connection == NULL)
+ {
+ command_print(cmd_ctx,
+ "gdb_sync command can only be run from within gdb using \"monitor gdb_sync\"");
+ return ERROR_FAIL;
+ }
+
+ current_gdb_connection->sync = true;
+
+ return ERROR_OK;
+}
+
/* daemon configuration command gdb_port */
int handle_gdb_port_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
{
return ERROR_OK;
}
- /* only if the port wasn't overwritten by cmdline */
- if (gdb_port == 0)
- gdb_port = strtoul(args[0], NULL, 0);
+ gdb_port = strtoul(args[0], NULL, 0);
return ERROR_OK;
}
if (argc == 0)
{
- } else if (argc==1)
+ } else if (argc == 1)
{
gdb_breakpoint_override = 1;
- if (strcmp(args[0], "hard")==0)
+ if (strcmp(args[0], "hard") == 0)
{
- gdb_breakpoint_override_type=BKPT_HARD;
- } else if (strcmp(args[0], "soft")==0)
+ gdb_breakpoint_override_type = BKPT_HARD;
+ } else if (strcmp(args[0], "soft") == 0)
{
- gdb_breakpoint_override_type=BKPT_SOFT;
+ gdb_breakpoint_override_type = BKPT_SOFT;
} else if (strcmp(args[0], "disable") == 0)
{
gdb_breakpoint_override = 0;
}
if (gdb_breakpoint_override)
{
- LOG_USER("force %s breakpoints", (gdb_breakpoint_override_type==BKPT_HARD)?"hard":"soft");
+ LOG_USER("force %s breakpoints", (gdb_breakpoint_override_type == BKPT_HARD)?"hard":"soft");
} else
{
LOG_USER("breakpoint type is not overriden");
int gdb_register_commands(command_context_t *command_context)
{
+ register_command(command_context, NULL, "gdb_sync", handle_gdb_sync_command,
+ COMMAND_ANY, "next stepi will return immediately allowing GDB fetch register state without affecting target state");
register_command(command_context, NULL, "gdb_port", handle_gdb_port_command,
COMMAND_ANY, "daemon configuration command gdb_port");
register_command(command_context, NULL, "gdb_detach", handle_gdb_detach_command,