X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fserver%2Fgdb_server.c;h=fe916c2677c2373a9906e5243b030a5a421fe3fb;hb=45a165a432eae2eb74b97ec5196736a352923a12;hp=00de5fc6fe942b2ab7ac2b6bb5b80623f5da6f8a;hpb=c3428f5b7ac2c555a52009cee04d0d1593a4a20c;p=fw%2Fopenocd diff --git a/src/server/gdb_server.c b/src/server/gdb_server.c index 00de5fc6f..fe916c267 100644 --- a/src/server/gdb_server.c +++ b/src/server/gdb_server.c @@ -40,7 +40,7 @@ #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; @@ -49,20 +49,9 @@ extern int gdb_error(connection_t *connection, int retval); 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; @@ -105,7 +94,7 @@ int check_pending(connection_t *connection, int timeout_s, int *got_data) */ 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; @@ -141,7 +130,7 @@ int check_pending(connection_t *connection, int timeout_s, int *got_data) 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_ @@ -249,7 +238,7 @@ int gdb_get_char(connection_t *connection, int* next_char) 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) { @@ -269,7 +258,7 @@ int gdb_putback_char(connection_t *connection, int last_char) * 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; @@ -301,7 +290,7 @@ int gdb_put_packet_inner(connection_t *connection, char *buffer, int len) #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]; @@ -435,7 +424,7 @@ int gdb_put_packet_inner(connection_t *connection, char *buffer, int len) int gdb_put_packet(connection_t *connection, char *buffer, int len) { - gdb_connection_t *gdb_con = connection->priv; + struct gdb_connection *gdb_con = connection->priv; gdb_con->busy = 1; int retval = gdb_put_packet_inner(connection, buffer, len); gdb_con->busy = 0; @@ -453,7 +442,7 @@ static __inline__ int fetch_packet(connection_t *connection, int *checksum_ok, i 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; @@ -559,7 +548,7 @@ int gdb_get_packet_inner(connection_t *connection, char *buffer, int *len) { int character; int retval; - gdb_connection_t *gdb_con = connection->priv; + struct gdb_connection *gdb_con = connection->priv; while (1) { @@ -632,7 +621,7 @@ int gdb_get_packet_inner(connection_t *connection, char *buffer, int *len) 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; @@ -671,7 +660,7 @@ int gdb_output(struct command_context_s *context, const char* line) 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 @@ -736,8 +725,8 @@ int gdb_target_callback_event_handler(struct target_s *target, enum target_event int gdb_new_connection(connection_t *connection) { - gdb_connection_t *gdb_connection = malloc(sizeof(gdb_connection_t)); - gdb_service_t *gdb_service = connection->service->priv; + struct gdb_connection *gdb_connection = malloc(sizeof(struct gdb_connection)); + struct gdb_service *gdb_service = connection->service->priv; int retval; int initial_ack; @@ -792,8 +781,8 @@ int gdb_new_connection(connection_t *connection) int gdb_connection_closed(connection_t *connection) { - gdb_service_t *gdb_service = connection->service->priv; - gdb_connection_t *gdb_connection = connection->priv; + struct gdb_service *gdb_service = connection->service->priv; + struct gdb_connection *gdb_connection = connection->priv; /* we're done forwarding messages. Tear down callback before * cleaning up connection. @@ -1568,7 +1557,7 @@ static int compare_bank (const void * a, const void * b) 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,")) { @@ -1823,8 +1812,8 @@ int gdb_query_packet(connection_t *connection, target_t *target, char *packet, i int gdb_v_packet(connection_t *connection, target_t *target, char *packet, int packet_size) { - gdb_connection_t *gdb_connection = connection->priv; - gdb_service_t *gdb_service = connection->service->priv; + struct gdb_connection *gdb_connection = connection->priv; + struct gdb_service *gdb_service = connection->service->priv; int result; /* if flash programming disabled - send a empty reply */ @@ -1960,36 +1949,18 @@ int gdb_v_packet(connection_t *connection, target_t *target, char *packet, int p int gdb_detach(connection_t *connection, target_t *target) { + struct gdb_service *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) { @@ -2013,12 +1984,12 @@ static void gdb_sig_halted(connection_t *connection) int gdb_input_inner(connection_t *connection) { - gdb_service_t *gdb_service = connection->service->priv; + struct gdb_service *gdb_service = connection->service->priv; target_t *target = gdb_service->target; 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 */ @@ -2092,7 +2063,7 @@ int gdb_input_inner(connection_t *connection) { 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; @@ -2194,10 +2165,13 @@ int gdb_input_inner(connection_t *connection) retval = target_halt(target); if (retval != ERROR_OK) { - /* stop this debug session */ 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); } } @@ -2209,7 +2183,7 @@ 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; + struct gdb_connection *gdb_con = connection->priv; if (retval == ERROR_SERVER_REMOTE_CLOSED) return retval; @@ -2223,7 +2197,7 @@ int gdb_input(connection_t *connection) int gdb_init(void) { - gdb_service_t *gdb_service; + struct gdb_service *gdb_service; target_t *target = all_targets; if (!target) @@ -2242,7 +2216,7 @@ int gdb_init(void) { /* only a single gdb connection when using a pipe */ - gdb_service = malloc(sizeof(gdb_service_t)); + gdb_service = malloc(sizeof(struct gdb_service)); gdb_service->target = target; add_service("gdb", CONNECTION_PIPE, 0, 1, gdb_new_connection, gdb_input, gdb_connection_closed, gdb_service); @@ -2256,7 +2230,7 @@ int gdb_init(void) while (target) { - gdb_service = malloc(sizeof(gdb_service_t)); + gdb_service = malloc(sizeof(struct gdb_service)); gdb_service->target = target; add_service("gdb", CONNECTION_TCP, @@ -2275,7 +2249,7 @@ int gdb_init(void) 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) { @@ -2295,51 +2269,12 @@ int handle_gdb_sync_command(struct command_context_s *cmd_ctx, char *cmd, char * } /* daemon configuration command gdb_port */ -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; - } - - 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) +COMMAND_HANDLER(handle_gdb_port_command) { - 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) { @@ -2360,7 +2295,7 @@ int handle_gdb_memory_map_command(struct command_context_s *cmd_ctx, char *cmd, 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) { @@ -2381,7 +2316,7 @@ int handle_gdb_flash_program_command(struct command_context_s *cmd_ctx, char *cm 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) { @@ -2403,7 +2338,7 @@ int handle_gdb_report_data_abort_command(struct command_context_s *cmd_ctx, char } /* 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) { @@ -2438,20 +2373,25 @@ int handle_gdb_breakpoint_override_command(struct command_context_s *cmd_ctx, ch 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; }