#include "jtag.h"
#include "breakpoints.h"
#include "flash.h"
+#include "target.h"
#include "target_request.h"
#include "configuration.h"
tv.tv_sec = timeout_s;
tv.tv_usec = 0;
- if (select(connection->fd + 1, &read_fds, NULL, NULL, &tv) == 0)
+ if (socket_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
for (;;)
{
- 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 (connection->service->type == CONNECTION_PIPE)
+ {
+ gdb_con->buf_cnt = read(connection->fd, gdb_con->buffer, GDB_BUFFER_SIZE);
+ }
+ else
+ {
+ 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)
{
break;
if (gdb_con->closed)
return ERROR_SERVER_REMOTE_CLOSED;
- if (write_socket(connection->fd, data, len) == len)
+ if (connection->service->type == CONNECTION_PIPE)
{
- return ERROR_OK;
+ /* write to stdout */
+ if (write(STDOUT_FILENO, data, len) == len)
+ {
+ return ERROR_OK;
+ }
+ }
+ else
+ {
+ if (write_socket(connection->fd, data, len) == len)
+ {
+ return ERROR_OK;
+ }
}
gdb_con->closed = 1;
return ERROR_SERVER_REMOTE_CLOSED;
break;
if ((retval = gdb_get_char(connection, &reply)) != ERROR_OK)
return retval;
+ if( reply == '$' ){
+ /* fix a problem with some IAR tools */
+ gdb_putback_char( connection, reply );
+ LOG_DEBUG("Unexpected start of new packet");
+ break;
+ }
+
LOG_WARNING("Discard unexpected char %c", reply);
}
#endif
char local_buffer[1024];
local_buffer[0] = '$';
- if (len+4 <= sizeof(local_buffer))
+ 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++);
local_buffer[len++] = '#';
local_buffer[len++] = DIGITS[(my_checksum >> 4) & 0xf];
local_buffer[len++] = DIGITS[my_checksum & 0xf];
- gdb_write(connection, local_buffer, len);
+ if((retval = gdb_write(connection, local_buffer, len)) != ERROR_OK)
+ {
+ return retval;
+ }
}
else
{
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);
+ if((retval = gdb_write(connection, local_buffer, 1)) != ERROR_OK)
+ {
+ return retval;
+ }
+ if((retval = gdb_write(connection, buffer, len)) != ERROR_OK)
+ {
+ return retval;
+ }
+ if((retval = gdb_write(connection, local_buffer+1, 3)) != ERROR_OK)
+ {
+ return retval;
+ }
}
if (gdb_con->noack_mode)
log_remove_callback(gdb_log_callback, connection);
LOG_WARNING("negative reply, retrying");
}
- else
- {
- LOG_ERROR("unknown character 0x%2.2x in reply, dropping connection", reply);
+ else if( reply == '$' ){
+ LOG_ERROR("GDB missing ack(1) - assumed good");
+ 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;
return ERROR_SERVER_REMOTE_CLOSED;
}
}
+ else if( reply == '$' ){
+ LOG_ERROR("GDB missing ack(2) - assumed good");
+ gdb_putback_char( connection, reply );
+ return ERROR_OK;
+ }
else
{
- LOG_ERROR("unknown character 0x%2.2x in reply, dropping connection", reply);
+ LOG_ERROR("unknown character(2) 0x%2.2x in reply, dropping connection", reply);
gdb_con->closed=1;
return ERROR_SERVER_REMOTE_CLOSED;
}
- int checksum_ok;
+ int checksum_ok = 0;
/* explicit code expansion here to get faster inlined code in -O3 by not
* calculating checksum
*/
}
if (checksum_ok)
{
- gdb_write(connection, "+", 1);
+ if ((retval = gdb_write(connection, "+", 1)) != ERROR_OK)
+ {
+ return retval;
+ }
break;
}
}
snprintf(hex_buffer + 1 + i*2, 3, "%2.2x", line[i]);
hex_buffer[bin_size*2+1] = 0;
- gdb_put_packet(connection, hex_buffer, bin_size*2 + 1);
+ int retval = gdb_put_packet(connection, hex_buffer, bin_size*2 + 1);
free(hex_buffer);
- return ERROR_OK;
+ return retval;
}
int gdb_output(struct command_context_s *context, const char* line)
{
char sig_reply[4];
int signal;
+
/* stop forwarding log packets! */
log_remove_callback(gdb_log_callback, connection);
int gdb_target_callback_event_handler(struct target_s *target, enum target_event event, void *priv)
{
+ int retval;
connection_t *connection = priv;
target_handle_event( target, event );
switch (event)
{
- case TARGET_EVENT_HALTED:
+ case TARGET_EVENT_EARLY_HALTED:
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 );
- jtag_execute_queue();
+ if((retval = jtag_execute_queue()) != ERROR_OK)
+ {
+ return retval;
+ }
break;
default:
break;
return ERROR_OK;
}
-
int gdb_new_connection(connection_t *connection)
{
gdb_connection_t *gdb_connection = malloc(sizeof(gdb_connection_t));
}
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 );
+
return ERROR_OK;
}
return ERROR_OK;
}
-/* Convert register to string of bits. NB! The # of bits in the
+static int gdb_reg_pos(target_t *target, int pos, int len)
+{
+ if (target->endianness == TARGET_LITTLE_ENDIAN)
+ return pos;
+ else
+ return len - 1 - pos;
+}
+
+/* Convert register to string of bytes. NB! The # of bits in the
* register might be non-divisible by 8(a byte), in which
- * case an entire byte is shown. */
+ * case an entire byte is shown.
+ *
+ * NB! the format on the wire is the target endianess
+ *
+ * The format of reg->value is little endian
+ *
+ */
void gdb_str_to_target(target_t *target, char *tstr, reg_t *reg)
{
int i;
for (i = 0; i < buf_len; i++)
{
- tstr[i*2] = DIGITS[(buf[i]>>4) & 0xf];
- tstr[i*2+1] = DIGITS[buf[i]&0xf];
+ 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];
}
}
-void gdb_target_to_str(target_t *target, char *tstr, char *str)
+static int hextoint(char c)
{
- int str_len = strlen(tstr);
- int i;
+ if (c>='0'&&c<='9')
+ {
+ return c-'0';
+ }
+ c=toupper(c);
+ if (c>='A'&&c<='F')
+ {
+ return c-'A'+10;
+ }
+ LOG_ERROR("BUG: invalid register value %08x", c);
+ return 0;
+}
+/* copy over in register buffer */
+void gdb_target_to_reg(target_t *target, char *tstr, int str_len, u8 *bin)
+{
if (str_len % 2)
{
LOG_ERROR("BUG: gdb value with uneven number of characters encountered");
exit(-1);
}
+ int i;
for (i = 0; i < str_len; i+=2)
{
- str[str_len - i - 1] = tstr[i + 1];
- str[str_len - i - 2] = tstr[i];
+ u8 t = hextoint(tstr[i])<<4;
+ t |= hextoint(tstr[i+1]);
+
+ int j = gdb_reg_pos(target, i/2, str_len/2);
+ bin[j] = t;
}
}
for (i = 0; i < reg_list_size; i++)
{
u8 *bin_buf;
- char *hex_buf;
- reg_arch_type_t *arch_type;
+ int chars = (CEIL(reg_list[i]->size, 8) * 2);
- /* convert from GDB-string (target-endian) to hex-string (big-endian) */
- hex_buf = malloc(CEIL(reg_list[i]->size, 8) * 2);
- gdb_target_to_str(target, packet_p, hex_buf);
+ if (packet_p + chars > packet + packet_size)
+ {
+ LOG_ERROR("BUG: register packet is too small for registers");
+ }
- /* convert hex-string to binary buffer */
+ reg_arch_type_t *arch_type;
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);
+ gdb_target_to_reg(target, packet_p, chars, bin_buf);
/* get register arch_type, and call set method */
arch_type = register_get_arch_type(reg_list[i]->arch_type);
- if (arch_type == NULL)
- {
- LOG_ERROR("BUG: encountered unregistered arch type");
- exit(-1);
- }
+
arch_type->set(reg_list[i], bin_buf);
/* advance packet pointer */
- packet_p += (CEIL(reg_list[i]->size, 8) * 2);
+ packet_p += chars;
+
free(bin_buf);
- free(hex_buf);
}
/* free reg_t *reg_list[] array allocated by get_gdb_reg_list */
int gdb_set_register_packet(connection_t *connection, target_t *target, char *packet, int packet_size)
{
char *separator;
- char *hex_buf;
u8 *bin_buf;
int reg_num = strtoul(packet + 1, &separator, 16);
reg_t **reg_list;
}
/* convert from GDB-string (target-endian) to hex-string (big-endian) */
- hex_buf = malloc(CEIL(reg_list[reg_num]->size, 8) * 2);
- gdb_target_to_str(target, separator + 1, hex_buf);
-
- /* convert hex-string to binary buffer */
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);
+ int chars = (CEIL(reg_list[reg_num]->size, 8) * 2);
+
+ /* fix!!! add some sanity checks on packet size here */
+
+ gdb_target_to_reg(target, separator + 1, chars, bin_buf);
- /* 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)
- {
- LOG_ERROR("BUG: encountered unregistered arch type");
- exit(-1);
- }
arch_type->set(reg_list[reg_num], bin_buf);
gdb_put_packet(connection, "OK", 2);
free(bin_buf);
- free(hex_buf);
free(reg_list);
return ERROR_OK;
retval = target_read_buffer(target, addr, len, buffer);
- if ((retval == ERROR_TARGET_DATA_ABORT) && (!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.
{
hex_buffer = malloc(len * 2 + 1);
- int i;
+ u32 i;
for (i = 0; i < len; i++)
{
u8 t = buffer[i];
u8 *buffer;
- int i;
+ u32 i;
int retval;
/* skip command character */
int gdb_calc_blocksize(flash_bank_t *bank)
{
- int i;
- int block_size = 0xffffffff;
+ u32 i;
+ u32 block_size = 0xffffffff;
/* loop through all sectors and return smallest sector size */
- for (i = 0; i < bank->num_sectors; i++)
+ for (i = 0; i < (u32)bank->num_sectors; i++)
{
if (bank->sectors[i].size < block_size)
block_size = bank->sectors[i].size;
if (strstr(packet, "vFlashWrite:"))
{
+ int retval;
unsigned long addr;
unsigned long length;
char *parse = packet + 12;
}
/* create new section with content from packet buffer */
- image_add_section(gdb_connection->vflash_image, addr, length, 0x0, (u8*)parse);
+ if((retval = image_add_section(gdb_connection->vflash_image, addr, length, 0x0, (u8*)parse)) != ERROR_OK)
+ {
+ return retval;
+ }
gdb_put_packet(connection, "OK", 2);
/* terminate with zero */
packet[packet_size] = 0;
- LOG_DEBUG("received packet: '%s'", packet);
+ 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++ ){
+ buf[x] = packet[x];
+ }
+ buf[x] = 0;
+ LOG_DEBUG("received packet: '%s:<binary-data>'", buf );
+ } else {
+ LOG_DEBUG("received packet: '%s'", packet );
+ }
+ }
if (packet_size > 0)
{
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)
{
if (retval == ERROR_SERVER_REMOTE_CLOSED)
return retval;
- /* logging does not propagate the error, yet can set th gdb_con->closed flag */
+ /* logging does not propagate the error, yet can set the gdb_con->closed flag */
if (gdb_con->closed)
return ERROR_SERVER_REMOTE_CLOSED;
return ERROR_OK;
}
- if (gdb_port == 0)
+ if (gdb_port == 0 && server_use_pipes == 0)
{
LOG_WARNING("no gdb port specified, using default port 3333");
gdb_port = 3333;
}
- while (target)
+ if (server_use_pipes)
{
- char service_name[8];
-
- snprintf(service_name, 8, "gdb-%2.2i", target->target_number);
+ /* only a single gdb connection when using a pipe */
gdb_service = malloc(sizeof(gdb_service_t));
gdb_service->target = target;
- add_service("gdb", CONNECTION_GDB,
- gdb_port + target->target_number,
- 1, gdb_new_connection, gdb_input,
- gdb_connection_closed,
- gdb_service);
+ add_service("gdb", CONNECTION_PIPE, 0, 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 using pipes", target->type->name);
+ }
+ else
+ {
+ while (target)
+ {
+ gdb_service = malloc(sizeof(gdb_service_t));
+ gdb_service->target = target;
- target = target->next;
+ add_service("gdb", CONNECTION_TCP, gdb_port + target->target_number, 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);
+ target = target->next;
+ }
}
return ERROR_OK;
int handle_gdb_port_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
{
if (argc == 0)
+ {
+ command_print(cmd_ctx, "%d", gdb_port);
return ERROR_OK;
+ }
/* only if the port wasn't overwritten by cmdline */
if (gdb_port == 0)
detach_mode = GDB_DETACH_NOTHING;
return ERROR_OK;
}
+ else
+ LOG_WARNING("invalid gdb_detach configuration directive: %s", args[0]);
}
- LOG_WARNING("invalid gdb_detach configuration directive: %s", args[0]);
- return ERROR_OK;
+ return ERROR_COMMAND_SYNTAX_ERROR;
}
int handle_gdb_memory_map_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
gdb_use_memory_map = 0;
return ERROR_OK;
}
+ else
+ LOG_WARNING("invalid gdb_memory_map configuration directive %s", args[0]);
}
- LOG_WARNING("invalid gdb_memory_map configuration directive: %s", args[0]);
- return ERROR_OK;
+ return ERROR_COMMAND_SYNTAX_ERROR;
}
int handle_gdb_flash_program_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
gdb_flash_program = 0;
return ERROR_OK;
}
+ else
+ LOG_WARNING("invalid gdb_flash_program configuration directive: %s", args[0]);
}
- LOG_WARNING("invalid gdb_memory_map configuration directive: %s", args[0]);
- return ERROR_OK;
+ return ERROR_COMMAND_SYNTAX_ERROR;
}
int handle_gdb_report_data_abort_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
gdb_report_data_abort = 0;
return ERROR_OK;
}
+ else
+ LOG_WARNING("invalid gdb_report_data_abort configuration directive: %s", args[0]);
}
- LOG_WARNING("invalid gdb_report_data_abort configuration directive: %s", args[0]);
- return ERROR_OK;
+ return ERROR_COMMAND_SYNTAX_ERROR;
}
-/* daemon configuration command gdb_port */
+/* gdb_breakpoint_override */
int handle_gdb_breakpoint_override_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
{
if (argc == 0)
return ERROR_OK;
}
-
int gdb_register_commands(command_context_t *command_context)
{
register_command(command_context, NULL, "gdb_port", handle_gdb_port_command,
- COMMAND_CONFIG, "");
+ COMMAND_ANY, "daemon configuration command gdb_port");
register_command(command_context, NULL, "gdb_detach", handle_gdb_detach_command,
COMMAND_CONFIG, "");
register_command(command_context, NULL, "gdb_memory_map", handle_gdb_memory_map_command,
- COMMAND_CONFIG, "");
+ COMMAND_CONFIG, "enable or disable memory map");
register_command(command_context, NULL, "gdb_flash_program", handle_gdb_flash_program_command,
- COMMAND_CONFIG, "");
+ COMMAND_CONFIG, "enable or disable flash program");
register_command(command_context, NULL, "gdb_report_data_abort", handle_gdb_report_data_abort_command,
- COMMAND_CONFIG, "");
+ COMMAND_CONFIG, "enable or disable report data");
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."
+ COMMAND_EXEC, "hard/soft/disable - 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");
Code Review / openocd.git / blobdiff