#define _DEBUG_GDB_IO_
#endif
-static gdb_connection_t *current_gdb_connection;
+static struct gdb_connection *current_gdb_connection;
static int gdb_breakpoint_override;
static enum breakpoint_type gdb_breakpoint_override_type;
static unsigned short gdb_port = 3333;
static const char *DIGITS = "0123456789abcdef";
-static void gdb_log_callback(void *priv, const char *file, int line,
+static void gdb_log_callback(void *priv, const char *file, unsigned line,
const char *function, const char *string);
-enum gdb_detach_mode
-{
- GDB_DETACH_RESUME,
- GDB_DETACH_RESET,
- GDB_DETACH_HALT,
- GDB_DETACH_NOTHING
-};
-
-/* target behaviour on gdb detach */
-enum gdb_detach_mode detach_mode = GDB_DETACH_RESUME;
-
/* number of gdb connections, mainly to supress gdb related debugging spam
* in helper/log.c when no gdb connections are actually active */
int gdb_actual_connections;
*/
struct timeval tv;
fd_set read_fds;
- gdb_connection_t *gdb_con = connection->priv;
+ struct gdb_connection *gdb_con = connection->priv;
int t;
if (got_data == NULL)
got_data=&t;
int gdb_get_char(connection_t *connection, int* next_char)
{
- gdb_connection_t *gdb_con = connection->priv;
+ struct gdb_connection *gdb_con = connection->priv;
int retval = ERROR_OK;
#ifdef _DEBUG_GDB_IO_
int gdb_putback_char(connection_t *connection, int last_char)
{
- gdb_connection_t *gdb_con = connection->priv;
+ struct gdb_connection *gdb_con = connection->priv;
if (gdb_con->buf_p > gdb_con->buffer)
{
* succeed. Shudder! */
int gdb_write(connection_t *connection, void *data, int len)
{
- gdb_connection_t *gdb_con = connection->priv;
+ struct gdb_connection *gdb_con = connection->priv;
if (gdb_con->closed)
return ERROR_SERVER_REMOTE_CLOSED;
#endif
int reply;
int retval;
- gdb_connection_t *gdb_con = connection->priv;
+ struct gdb_connection *gdb_con = connection->priv;
for (i = 0; i < len; i++)
my_checksum += buffer[i];
int gdb_put_packet(connection_t *connection, char *buffer, int len)
{
- gdb_connection_t *gdb_con = connection->priv;
+ struct gdb_connection *gdb_con = connection->priv;
gdb_con->busy = 1;
int retval = gdb_put_packet_inner(connection, buffer, len);
gdb_con->busy = 0;
int character;
int retval;
- gdb_connection_t *gdb_con = connection->priv;
+ struct gdb_connection *gdb_con = connection->priv;
my_checksum = 0;
int count = 0;
count = 0;
{
int character;
int retval;
- gdb_connection_t *gdb_con = connection->priv;
+ struct gdb_connection *gdb_con = connection->priv;
while (1)
{
int gdb_get_packet(connection_t *connection, char *buffer, int *len)
{
- gdb_connection_t *gdb_con = connection->priv;
+ struct gdb_connection *gdb_con = connection->priv;
gdb_con->busy = 1;
int retval = gdb_get_packet_inner(connection, buffer, len);
gdb_con->busy = 0;
static void gdb_frontend_halted(struct target_s *target, connection_t *connection)
{
- gdb_connection_t *gdb_connection = connection->priv;
+ struct gdb_connection *gdb_connection = connection->priv;
/* In the GDB protocol when we are stepping or continuing execution,
* we have a lingering reply. Upon receiving a halted event
int gdb_new_connection(connection_t *connection)
{
- gdb_connection_t *gdb_connection = malloc(sizeof(gdb_connection_t));
+ struct gdb_connection *gdb_connection = malloc(sizeof(struct gdb_connection));
gdb_service_t *gdb_service = connection->service->priv;
int retval;
int initial_ack;
int gdb_connection_closed(connection_t *connection)
{
gdb_service_t *gdb_service = connection->service->priv;
- gdb_connection_t *gdb_connection = connection->priv;
+ struct gdb_connection *gdb_connection = connection->priv;
/* we're done forwarding messages. Tear down callback before
* cleaning up connection.
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;
+ struct gdb_connection *gdb_connection = connection->priv;
if (strstr(packet, "qRcmd,"))
{
int gdb_v_packet(connection_t *connection, target_t *target, char *packet, int packet_size)
{
- gdb_connection_t *gdb_connection = connection->priv;
+ struct gdb_connection *gdb_connection = connection->priv;
gdb_service_t *gdb_service = connection->service->priv;
int result;
int gdb_detach(connection_t *connection, target_t *target)
{
+ gdb_service_t *gdb_service = connection->service->priv;
- switch (detach_mode)
- {
- case GDB_DETACH_RESUME:
- target_handle_event(target, TARGET_EVENT_OLD_pre_resume);
- target_resume(target, 1, 0, 1, 0);
- break;
-
- case GDB_DETACH_RESET:
- /* FIX?? make this configurable?? */
- target_process_reset(connection->cmd_ctx, RESET_HALT);
- break;
-
- case GDB_DETACH_HALT:
- target_halt(target);
- break;
-
- case GDB_DETACH_NOTHING:
- break;
- }
+ target_call_event_callbacks(gdb_service->target, TARGET_EVENT_GDB_DETACH);
- gdb_put_packet(connection, "OK", 2);
- return ERROR_OK;
+ return gdb_put_packet(connection, "OK", 2);
}
-static void gdb_log_callback(void *priv, const char *file, int line,
+static void gdb_log_callback(void *priv, const char *file, unsigned line,
const char *function, const char *string)
{
connection_t *connection = priv;
- gdb_connection_t *gdb_con = connection->priv;
+ struct gdb_connection *gdb_con = connection->priv;
if (gdb_con->busy)
{
char *packet = gdb_packet_buffer;
int packet_size;
int retval;
- gdb_connection_t *gdb_con = connection->priv;
+ struct gdb_connection *gdb_con = connection->priv;
static int extended_protocol = 0;
/* drain input buffer */
{
int retval = ERROR_OK;
- gdb_connection_t *gdb_con = connection->priv;
+ struct gdb_connection *gdb_con = connection->priv;
log_add_callback(gdb_log_callback, connection);
bool nostep = false;
{
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);
}
}
int gdb_input(connection_t *connection)
{
int retval = gdb_input_inner(connection);
- gdb_connection_t *gdb_con = connection->priv;
+ struct gdb_connection *gdb_con = connection->priv;
if (retval == ERROR_SERVER_REMOTE_CLOSED)
return retval;
return ERROR_OK;
}
-int handle_gdb_sync_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(handle_gdb_sync_command)
{
if (argc != 0)
{
}
/* daemon configuration command gdb_port */
-int handle_gdb_port_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(handle_gdb_port_command)
{
- if (argc == 0)
- {
- command_print(cmd_ctx, "%d", gdb_port);
- return ERROR_OK;
- }
-
- gdb_port = strtoul(args[0], NULL, 0);
-
- return ERROR_OK;
-}
-
-int handle_gdb_detach_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
-{
- if (argc == 1)
- {
- if (strcmp(args[0], "resume") == 0)
- {
- detach_mode = GDB_DETACH_RESUME;
- return ERROR_OK;
- }
- else if (strcmp(args[0], "reset") == 0)
- {
- detach_mode = GDB_DETACH_RESET;
- return ERROR_OK;
- }
- else if (strcmp(args[0], "halt") == 0)
- {
- detach_mode = GDB_DETACH_HALT;
- return ERROR_OK;
- }
- else if (strcmp(args[0], "nothing") == 0)
- {
- detach_mode = GDB_DETACH_NOTHING;
- return ERROR_OK;
- }
- else
- LOG_WARNING("invalid gdb_detach configuration directive: %s", args[0]);
- }
-
- return ERROR_COMMAND_SYNTAX_ERROR;
+ return CALL_COMMAND_HANDLER(server_port_command, &gdb_port);
}
-int handle_gdb_memory_map_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(handle_gdb_memory_map_command)
{
if (argc == 1)
{
return ERROR_COMMAND_SYNTAX_ERROR;
}
-int handle_gdb_flash_program_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(handle_gdb_flash_program_command)
{
if (argc == 1)
{
return ERROR_COMMAND_SYNTAX_ERROR;
}
-int handle_gdb_report_data_abort_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(handle_gdb_report_data_abort_command)
{
if (argc == 1)
{
}
/* gdb_breakpoint_override */
-int handle_gdb_breakpoint_override_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(handle_gdb_breakpoint_override_command)
{
if (argc == 0)
{
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,
- COMMAND_CONFIG, "resume/reset/halt/nothing - "
- "specify behavior when GDB detaches from the target");
- register_command(command_context, NULL, "gdb_memory_map", handle_gdb_memory_map_command,
- COMMAND_CONFIG, "enable or disable memory map");
- register_command(command_context, NULL, "gdb_flash_program", handle_gdb_flash_program_command,
- COMMAND_CONFIG, "enable or disable flash program");
- register_command(command_context, NULL, "gdb_report_data_abort", handle_gdb_report_data_abort_command,
- COMMAND_CONFIG, "enable or disable reporting data aborts");
- register_command(command_context, NULL, "gdb_breakpoint_override", handle_gdb_breakpoint_override_command,
- COMMAND_EXEC, "hard/soft/disable - force breakpoint type for gdb 'break' commands.");
+ register_command(command_context, NULL, "gdb_sync",
+ handle_gdb_sync_command, COMMAND_ANY,
+ "next stepi will return immediately allowing GDB to "
+ "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_memory_map",
+ handle_gdb_memory_map_command, COMMAND_CONFIG,
+ "enable or disable memory map");
+ register_command(command_context, NULL, "gdb_flash_program",
+ handle_gdb_flash_program_command, COMMAND_CONFIG,
+ "enable or disable flash program");
+ register_command(command_context, NULL, "gdb_report_data_abort",
+ handle_gdb_report_data_abort_command, COMMAND_CONFIG,
+ "enable or disable reporting data aborts");
+ register_command(command_context, NULL, "gdb_breakpoint_override",
+ handle_gdb_breakpoint_override_command, COMMAND_EXEC,
+ "hard/soft/disable - force type of breakpoint "
+ "used by gdb 'break' commands.");
return ERROR_OK;
}