eCos flash driver.

[openocd.git] / src / server / gdb_server.c

diff --git a/src/server/gdb_server.c b/src/server/gdb_server.c
index d940bc1a5c2f3e0fa08f593458a74a4658ddf393..6c9936eec98f273d20a5b2136717d29d15388899 100644 (file)
--- a/src/server/gdb_server.c
+++ b/src/server/gdb_server.c
@@ -32,6 +32,7 @@
 #include "breakpoints.h"
 #include "flash.h"
 #include "target_request.h"
+#include "configuration.h"
 
 #include <string.h>
 #include <errno.h>
@@ -64,6 +65,10 @@ enum gdb_detach_mode detach_mode = GDB_DETACH_RESUME;
 int gdb_use_memory_map = 0;
 int gdb_flash_program = 0;
 
+/* 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 */
+int gdb_report_data_abort = 0;
+
 int gdb_last_signal(target_t *target)
 {
        switch (target->debug_reason)
@@ -298,7 +303,7 @@ int gdb_put_packet_inner(connection_t *connection, char *buffer, int len)
                else if (reply == '-')
                {
                        /* Stop sending output packets for now */
-                       log_setCallback(NULL, NULL);
+                       log_remove_callback(gdb_log_callback, connection);
                        WARNING("negative reply, retrying");
                }
                else if (reply == 0x3)
@@ -311,7 +316,7 @@ int gdb_put_packet_inner(connection_t *connection, char *buffer, int len)
                        else if (reply == '-')
                        {
                                /* Stop sending output packets for now */
-                               log_setCallback(NULL, NULL);
+                               log_remove_callback(gdb_log_callback, connection);
                                WARNING("negative reply, retrying");
                        }
                        else
@@ -506,16 +511,14 @@ int gdb_output_con(connection_t *connection, char* line)
 
        bin_size = strlen(line);
 
-       hex_buffer = malloc(bin_size*2 + 4);
+       hex_buffer = malloc(bin_size*2 + 2);
 
        hex_buffer[0] = 'O';
        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+2] = 'a';
-       hex_buffer[bin_size*2+3] = 0x0;
+       hex_buffer[bin_size*2+1] = 0;
 
-       gdb_put_packet(connection, hex_buffer, bin_size*2 + 3);
+       gdb_put_packet(connection, hex_buffer, bin_size*2 + 1);
 
        free(hex_buffer);
        return ERROR_OK;
@@ -524,7 +527,7 @@ int gdb_output_con(connection_t *connection, char* line)
 int gdb_output(struct command_context_s *context, char* line)
 {
        /* this will be dumped to the log and also sent as an O packet if possible */
-       USER(line); 
+       USER_SAMELINE(line); 
        return ERROR_OK;
 }
 
@@ -535,7 +538,7 @@ int gdb_program_handler(struct target_s *target, enum target_event event, void *
        
        if (target->gdb_program_script)
        {
-               script = fopen(target->gdb_program_script, "r");
+               script = open_file_from_path(cmd_ctx, target->gdb_program_script, "r");
                if (!script)
                {
                        ERROR("couldn't open script file %s", target->gdb_program_script);
@@ -574,7 +577,7 @@ int gdb_target_callback_event_handler(struct target_s *target, enum target_event
                        if (gdb_connection->frontend_state == TARGET_RUNNING)
                        {
                                /* stop forwarding log packets! */
-                               log_setCallback(NULL, NULL);
+                               log_remove_callback(gdb_log_callback, connection);
                                
                                if (gdb_connection->ctrl_c)
                                {
@@ -600,7 +603,8 @@ int gdb_target_callback_event_handler(struct target_s *target, enum target_event
 
        return ERROR_OK;
 }
-
+\r
+\r
 int gdb_new_connection(connection_t *connection)
 {
        gdb_connection_t *gdb_connection = malloc(sizeof(gdb_connection_t));
@@ -673,6 +677,7 @@ int gdb_connection_closed(connection_t *connection)
        }
 
        target_unregister_event_callback(gdb_target_callback_event_handler, connection);
+       log_remove_callback(gdb_log_callback, connection);
 
        return ERROR_OK;
 }
@@ -1058,8 +1063,7 @@ int gdb_read_memory_packet(connection_t *connection, target_t *target, char *pac
 
        retval = target_read_buffer(target, addr, len, buffer);
 
-#if 0
-       if (retval == ERROR_TARGET_DATA_ABORT)
+       if ((retval == ERROR_TARGET_DATA_ABORT) && (!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.
@@ -1069,11 +1073,13 @@ int gdb_read_memory_packet(connection_t *connection, target_t *target, char *pac
                 * 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.
+                * This can be overwritten using the gdb_report_data_abort <'enable'|'disable'> command.
                 */
                memset(buffer, 0, len);
                retval = ERROR_OK;
        }
-#endif
 
        if (retval == ERROR_OK)
        {
@@ -1187,11 +1193,11 @@ int gdb_write_memory_binary_packet(connection_t *connection, target_t *target, c
        }
 
        retval = ERROR_OK;
-       if( len ) {
-
+       if (len)
+       {
                DEBUG("addr: 0x%8.8x, len: 0x%8.8x", addr, len);
 
-               retval = target_write_buffer(target, addr, len, separator);
+               retval = target_write_buffer(target, addr, len, (u8*)separator);
        }
 
        if (retval == ERROR_OK)
@@ -1391,7 +1397,7 @@ void xml_printf(int *retval, char **xml, int *pos, int *size, const char *fmt, .
        }
 }
 
-static int decode_xfer_read (char *buf, char **annex, int *ofs, unsigned int *len)
+static int decode_xfer_read(char *buf, char **annex, int *ofs, unsigned int *len)
 {
        char *separator;
        
@@ -1452,7 +1458,7 @@ int gdb_query_packet(connection_t *connection, target_t *target, char *packet, i
                        cmd[(packet_size - 6)/2] = 0x0;
                        
                        /* We want to print all debug output to GDB connection */
-                       log_setCallback(gdb_log_callback, connection);
+                       log_add_callback(gdb_log_callback, connection);
                        target_call_timer_callbacks();
                        command_run_line(cmd_ctx, cmd);
                        free(cmd);
@@ -1465,7 +1471,7 @@ int gdb_query_packet(connection_t *connection, target_t *target, char *packet, i
                if (packet_size > 5)
                {
                        int retval;
-                       u8 gdb_reply[10];
+                       char gdb_reply[10];
                        char *separator;
                        u32 checksum;
                        u32 addr = 0;
@@ -1599,13 +1605,13 @@ int gdb_query_packet(connection_t *connection, target_t *target, char *packet, i
                int retval = ERROR_OK;
                
                int offset;
-               int length;
+               unsigned int length;
                char *annex;
                
                /* skip command character */
                packet += 20;
                
-               if (decode_xfer_read( packet, &annex, &offset, &length ) < 0)
+               if (decode_xfer_read(packet, &annex, &offset, &length) < 0)
                {
                        gdb_send_error(connection, 01);
                        return ERROR_OK;
@@ -1737,23 +1743,16 @@ int gdb_v_packet(connection_t *connection, target_t *target, char *packet, int p
        if (!strcmp(packet, "vFlashDone"))
        {
                u32 written;
-               char *error_str;
 
                /* process the flashing buffer. No need to erase as GDB
                 * always issues a vFlashErase first. */
-               if ((result = flash_write(gdb_service->target, gdb_connection->vflash_image, &written, &error_str, NULL, 0)) != ERROR_OK)
+               if ((result = flash_write(gdb_service->target, gdb_connection->vflash_image, &written, 0)) != ERROR_OK)
                {
                        if (result == ERROR_FLASH_DST_OUT_OF_BANK)
                                gdb_put_packet(connection, "E.memtype", 9);
                        else
                                gdb_send_error(connection, EIO);
-                       
-                       if (error_str)
-                       {
-                               ERROR("flash writing failed: %s", error_str);
-                               free(error_str);
                        }
-               }
                else
                {
                        DEBUG("wrote %u bytes from vFlash image to flash", written);
@@ -1808,7 +1807,7 @@ static void gdb_log_callback(void *priv, const char *file, int line,
                return;
        }
 
-       char *t = allocPrintf(format, args);
+       char *t = alloc_printf(format, args);
        if (t == NULL)
                return;
        
@@ -1886,7 +1885,7 @@ int gdb_input_inner(connection_t *connection)
                                         * forward log output until the target is halted */
                                                gdb_connection_t *gdb_con = connection->priv;
                                                gdb_con->frontend_state = TARGET_RUNNING;
-                                               log_setCallback(gdb_log_callback, connection);
+                                               log_add_callback(gdb_log_callback, connection);
                                                gdb_step_continue_packet(connection, target, packet, packet_size);
                                        }
                                        break;
@@ -2071,6 +2070,26 @@ int handle_gdb_flash_program_command(struct command_context_s *cmd_ctx, char *cm
        return ERROR_OK;
 }
 
+int handle_gdb_report_data_abort_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+{
+       if (argc == 1)
+       {
+               if (strcmp(args[0], "enable") == 0)
+               {
+                       gdb_report_data_abort = 1;
+                       return ERROR_OK;
+               }
+               else if (strcmp(args[0], "disable") == 0)
+               {
+                       gdb_report_data_abort = 0;
+                       return ERROR_OK;
+               }
+       }
+       
+       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,
@@ -2081,5 +2100,7 @@ int gdb_register_commands(command_context_t *command_context)
                        COMMAND_CONFIG, "");
        register_command(command_context, NULL, "gdb_flash_program", handle_gdb_flash_program_command,
                        COMMAND_CONFIG, "");
+       register_command(command_context, NULL, "gdb_report_data_abort", handle_gdb_report_data_abort_command,
+                       COMMAND_CONFIG, "");
        return ERROR_OK;
 }