Code Review / openocd.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
- added a test document as a starting point
[openocd.git] / src / server / gdb_server.c
diff --git a/src/server/gdb_server.c b/src/server/gdb_server.c
index 99c9376d9c13f8ebee78e2e7c3daa2c4fb60084c..71f82dd456d548683d23a8a62560a0fb77d95b20 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)
@@ -524,7 +529,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 */
-       ERROR(line);
+       USER(line); 
        return ERROR_OK;
 }
 
@@ -535,7 +540,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);
@@ -1056,41 +1061,25 @@ int gdb_read_memory_packet(connection_t *connection, target_t *target, char *pac
 
        DEBUG("addr: 0x%8.8x, len: 0x%8.8x", addr, len);
 
-       switch (len)
-       {
-               case 4:
-                       if ((addr % 4) == 0)
-                               retval = target->type->read_memory(target, addr, 4, 1, buffer);
-                       else
-                               retval = target->type->read_memory(target, addr, 1, len, buffer);
-                       break;
-               case 2:
-                       if ((addr % 2) == 0)
-                               retval = target->type->read_memory(target, addr, 2, 1, buffer);
-                       else
-                               retval = target->type->read_memory(target, addr, 1, len, buffer);
-                       break;
-               case 3:
-               case 1:
-                       retval = target->type->read_memory(target, addr, 1, len, buffer);
-                       break;
-                       /* handle bulk reads */
-               default:
-                       retval = target_read_buffer(target, addr, len, buffer);
-                       break;
-       }
+       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.
+                * 
+                * OpenOCD developers are acutely aware of this problem, but there is nothing
+                * 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
+                *
+                * 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)
        {
@@ -1159,31 +1148,7 @@ int gdb_write_memory_packet(connection_t *connection, target_t *target, char *pa
                buffer[i] = tmp;
        }
 
-       retval = ERROR_OK;
-       switch (len)
-       {
-               /* handle sized writes */
-               case 4:
-                       if ((addr % 4) == 0)
-                               retval = target->type->write_memory(target, addr, 4, 1, buffer);
-                       else
-                               retval = target->type->write_memory(target, addr, 1, len, buffer);
-                       break;
-               case 2:
-                       if ((addr % 2) == 0)
-                               retval = target->type->write_memory(target, addr, 2, 1, buffer);
-                       else
-                               retval = target->type->write_memory(target, addr, 1, len, buffer);
-                       break;
-               case 3:
-               case 1:
-                       retval = target->type->write_memory(target, addr, 1, len, buffer);
-                       break;
-                       /* handle bulk writes */
-               default:
-                       retval = target_write_buffer(target, addr, len, buffer);
-                       break;
-       }
+       retval = target_write_buffer(target, addr, len, buffer);
 
        if (retval == ERROR_OK)
        {
@@ -1206,7 +1171,6 @@ int gdb_write_memory_binary_packet(connection_t *connection, target_t *target, c
        u32 addr = 0;
        u32 len = 0;
 
-       u8 *buffer;
        int retval;
 
        /* skip command character */
@@ -1229,38 +1193,11 @@ int gdb_write_memory_binary_packet(connection_t *connection, target_t *target, c
        }
 
        retval = ERROR_OK;
-       if( len ) {
-
-               buffer = malloc(len);
-
+       if (len)
+       {
                DEBUG("addr: 0x%8.8x, len: 0x%8.8x", addr, len);
 
-               memcpy( buffer, separator, len );
-
-               switch (len)
-               {
-                       case 4:
-                               if ((addr % 4) == 0)
-                                       retval = target->type->write_memory(target, addr, 4, 1, buffer);
-                               else
-                                       retval = target->type->write_memory(target, addr, 1, len, buffer);
-                               break;
-                       case 2:
-                               if ((addr % 2) == 0)
-                                       retval = target->type->write_memory(target, addr, 2, 1, buffer);
-                               else
-                                       retval = target->type->write_memory(target, addr, 1, len, buffer);
-                               break;
-                       case 3:
-                       case 1:
-                               retval = target->type->write_memory(target, addr, 1, len, buffer);
-                               break;
-                       default:
-                               retval = target_write_buffer(target, addr, len, buffer);
-                               break;
-               }
-
-               free(buffer);
+               retval = target_write_buffer(target, addr, len, (u8*)separator);
        }
 
        if (retval == ERROR_OK)
@@ -1460,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;
        
@@ -1534,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;
@@ -1668,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;
@@ -2140,6 +2077,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,
@@ -2150,5 +2107,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;
 }
Open On-Chip Debugger

Linking to existing account procedure

If you already have an account and want to add another login method you MUST first sign in with your existing account and then change URL to read https://review.openocd.org/login/?link to get to this page again but this time it'll work for linking. Thank you.

SSH host keys fingerprints

1024 SHA256:YKx8b7u5ZWdcbp7/4AeXNaqElP49m6QrwfXaqQGJAOk gerrit-code-review@openocd.zylin.com (DSA)
384 SHA256:jHIbSQa4REvwCFG4cq5LBlBLxmxSqelQPem/EXIrxjk gerrit-code-review@openocd.org (ECDSA)
521 SHA256:UAOPYkU9Fjtcao0Ul/Rrlnj/OsQvt+pgdYSZ4jOYdgs gerrit-code-review@openocd.org (ECDSA)
256 SHA256:A13M5QlnozFOvTllybRZH6vm7iSt0XLxbA48yfc2yfY gerrit-code-review@openocd.org (ECDSA)
256 SHA256:spYMBqEYoAOtK7yZBrcwE8ZpYt6b68Cfh9yEVetvbXg gerrit-code-review@openocd.org (ED25519)
+--[ED25519 256]--+
|=..              |
|+o..   .         |
|*.o   . .        |
|+B . . .         |
|Bo. = o S        |
|Oo.+ + =         |
|oB=.* = . o      |
| =+=.+   + E     |
|. .=o   . o      |
+----[SHA256]-----+
2048 SHA256:0Onrb7/PHjpo6iVZ7xQX2riKN83FJ3KGU0TvI0TaFG4 gerrit-code-review@openocd.zylin.com (RSA)