- jtag_khz/speed are now single parameter only. These are used
[openocd.git] / src / server / gdb_server.c
index c256c24b785caa2791f4e6a534d8e05e029c0b83..665e3507af179a0d832504aaf71cd7516d5a8156 100644 (file)
@@ -32,6 +32,7 @@
 #include "breakpoints.h"
 #include "flash.h"
 #include "target_request.h"
+#include "configuration.h"
 
 #include <string.h>
 #include <errno.h>
 #define _DEBUG_GDB_IO_
 #endif
 
+extern int gdb_error(connection_t *connection, int retval);
 static unsigned short gdb_port;
 static const char *DIGITS = "0123456789abcdef";
 
-static void gdb_log_callback(void *priv, const char *file, int line, 
-               const char *function, const char *format, va_list args);
+static void gdb_log_callback(void *priv, const char *file, int line,
+               const char *function, const char *string);
 
 enum gdb_detach_mode
 {
@@ -61,8 +63,10 @@ enum gdb_detach_mode detach_mode = GDB_DETACH_RESUME;
 
 /* set if we are sending a memory map to gdb
  * via qXfer:memory-map:read packet */
-int gdb_use_memory_map = 0;
-int gdb_flash_program = 0;
+/* enabled by default*/
+int gdb_use_memory_map = 1;
+/* enabled by default*/
+int gdb_flash_program = 1;
 
 /* 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 */
@@ -83,14 +87,56 @@ int gdb_last_signal(target_t *target)
                case DBG_REASON_NOTHALTED:
                        return 0x0; /* no signal... shouldn't happen */
                default:
-                       ERROR("BUG: undefined debug reason");
-                       exit(-1);
+                       LOG_USER("undefined debug reason %d - target needs reset", target->debug_reason);
+                       return 0x0;
+       }
+}
+
+int check_pending(connection_t *connection, int timeout_s, int *got_data)
+{
+       /* a non-blocking socket will block if there is 0 bytes available on the socket,
+        * but return with as many bytes as are available immediately
+        */
+       struct timeval tv;
+       fd_set read_fds;
+       gdb_connection_t *gdb_con = connection->priv;
+       int t;
+       if (got_data==NULL)
+               got_data=&t;
+       *got_data=0;
+
+       if (gdb_con->buf_cnt>0)
+       {
+               *got_data = 1;
+               return ERROR_OK;
        }
+       
+       FD_ZERO(&read_fds);
+       FD_SET(connection->fd, &read_fds);
+       
+       tv.tv_sec = timeout_s;
+       tv.tv_usec = 0;
+       if (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
+                */
+               if (timeout_s>0)
+               {
+                       return ERROR_GDB_TIMEOUT;
+               } else
+               {
+                       return ERROR_OK;
+               }
+       }
+       *got_data=FD_ISSET(connection->fd, &read_fds)!=0;
+       return ERROR_OK;
 }
 
 int gdb_get_char(connection_t *connection, int* next_char)
 {
        gdb_connection_t *gdb_con = connection->priv;
+       int retval=ERROR_OK;
 
 #ifdef _DEBUG_GDB_IO_
        char *debug_buffer;
@@ -105,7 +151,7 @@ int gdb_get_char(connection_t *connection, int* next_char)
                        connection->input_pending = 0;
 
 #ifdef _DEBUG_GDB_IO_
-               DEBUG("returned char '%c' (0x%2.2x)", *next_char, *next_char);
+               LOG_DEBUG("returned char '%c' (0x%2.2x)", *next_char, *next_char);
 #endif
 
                return ERROR_OK;
@@ -113,26 +159,9 @@ int gdb_get_char(connection_t *connection, int* next_char)
 
        for (;;)
        {
-#ifndef _WIN32
-               /* a non-blocking socket will block if there is 0 bytes available on the socket,
-                * but return with as many bytes as are available immediately
-                */
-               struct timeval tv;
-               fd_set read_fds;
-               
-               FD_ZERO(&read_fds);
-               FD_SET(connection->fd, &read_fds);
-               
-               tv.tv_sec = 1;
-               tv.tv_usec = 0;
-               if (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
-                        */
-                       return ERROR_GDB_TIMEOUT; 
-               }
-#endif
+               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)
                {
@@ -153,11 +182,13 @@ int gdb_get_char(connection_t *connection, int* next_char)
                                usleep(1000);
                                break;
                        case WSAECONNABORTED:
+                               gdb_con->closed = 1;
                                return ERROR_SERVER_REMOTE_CLOSED;
                        case WSAECONNRESET:
+                               gdb_con->closed = 1;
                                return ERROR_SERVER_REMOTE_CLOSED;
                        default:
-                               ERROR("read: %d", errno);
+                               LOG_ERROR("read: %d", errno);
                                exit(-1);
                }
 #else
@@ -167,11 +198,14 @@ int gdb_get_char(connection_t *connection, int* next_char)
                                usleep(1000);
                                break;
                        case ECONNABORTED:
+                               gdb_con->closed = 1;
                                return ERROR_SERVER_REMOTE_CLOSED;
                        case ECONNRESET:
+                               gdb_con->closed = 1;
                                return ERROR_SERVER_REMOTE_CLOSED;
                        default:
-                               ERROR("read: %s", strerror(errno));
+                               LOG_ERROR("read: %s", strerror(errno));
+                               gdb_con->closed = 1;
                                return ERROR_SERVER_REMOTE_CLOSED;
                }
 #endif
@@ -181,7 +215,7 @@ int gdb_get_char(connection_t *connection, int* next_char)
        debug_buffer = malloc(gdb_con->buf_cnt + 1);
        memcpy(debug_buffer, gdb_con->buffer, gdb_con->buf_cnt);
        debug_buffer[gdb_con->buf_cnt] = 0;
-       DEBUG("received '%s'", debug_buffer);
+       LOG_DEBUG("received '%s'", debug_buffer);
        free(debug_buffer);
 #endif
 
@@ -191,12 +225,12 @@ int gdb_get_char(connection_t *connection, int* next_char)
        if (gdb_con->buf_cnt > 0)
                connection->input_pending = 1;
        else
-               connection->input_pending = 0;  
+               connection->input_pending = 0;
 #ifdef _DEBUG_GDB_IO_
-       DEBUG("returned char '%c' (0x%2.2x)", *next_char, *next_char);
+       LOG_DEBUG("returned char '%c' (0x%2.2x)", *next_char, *next_char);
 #endif
 
-       return ERROR_OK;
+       return retval;
 }
 
 int gdb_putback_char(connection_t *connection, int last_char)
@@ -210,7 +244,7 @@ int gdb_putback_char(connection_t *connection, int last_char)
        }
        else
        {
-               ERROR("BUG: couldn't put character back");      
+               LOG_ERROR("BUG: couldn't put character back");
        }
 
        return ERROR_OK;
@@ -247,53 +281,60 @@ int gdb_put_packet_inner(connection_t *connection, char *buffer, int len)
        for (i = 0; i < len; i++)
                my_checksum += buffer[i];
 
+#ifdef _DEBUG_GDB_IO_
+       /* 
+        * At this point we should have nothing in the input queue from GDB,
+        * however sometimes '-' is sent even though we've already received
+        * an ACK (+) for everything we've sent off.
+        */
+#ifndef _WIN32
+       int gotdata;
+       for (;;)
+       {
+               if ((retval=check_pending(connection, 0, &gotdata))!=ERROR_OK)
+                       return retval;
+               if (!gotdata)
+                       break;
+               if ((retval = gdb_get_char(connection, &reply)) != ERROR_OK)
+                       return retval;
+               LOG_WARNING("Discard unexpected char %c", reply);
+       }
+#endif
+#endif
+
        while (1)
        {
 #ifdef _DEBUG_GDB_IO_
                debug_buffer = malloc(len + 1);
                memcpy(debug_buffer, buffer, len);
                debug_buffer[len] = 0;
-               DEBUG("sending packet '$%s#%2.2x'", debug_buffer, my_checksum);
+               LOG_DEBUG("sending packet '$%s#%2.2x'", debug_buffer, my_checksum);
                free(debug_buffer);
 #endif
-#if 0
-               char checksum[3];
-               gdb_write(connection, "$", 1);
-               if (len > 0)
-                       gdb_write(connection, buffer, len);
-               gdb_write(connection, "#", 1);
-               
-               snprintf(checksum, 3, "%2.2x", my_checksum);
-               
-               gdb_write(connection, checksum, 2);
-#else
-               void *allocated = NULL;
-               char stackAlloc[1024];
-               char *t = stackAlloc;
-               int totalLen = 1 + len + 1 + 2;
-               if (totalLen > sizeof(stackAlloc))
+
+               char local_buffer[1024];
+               local_buffer[0] = '$';
+               if (len+4 <= sizeof(local_buffer))
                {
-                       allocated = malloc(totalLen);
-                       t = allocated;
-                       if (allocated == NULL)
-                       {
-                               ERROR("Ran out of memory trying to reply packet %d\n", totalLen);
-                               exit(-1);
-                       }
+                       /* 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);
                }
-               t[0] = '$';
-               memcpy(t + 1, buffer, len);
-               t[1 + len] = '#';
-               t[1 + len + 1] = DIGITS[(my_checksum >> 4) & 0xf];
-               t[1 + len + 2] = DIGITS[my_checksum & 0xf];
-               
-               gdb_write(connection, t, totalLen);
-               
-               if (allocated)
+               else
                {
-                       free(allocated);
+                       /* larger packets are transmitted directly from caller supplied buffer
+                          by several calls to gdb_write() to avoid dynamic allocation */
+                       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);
                }
-#endif
+
                if ((retval = gdb_get_char(connection, &reply)) != ERROR_OK)
                        return retval;
 
@@ -302,8 +343,8 @@ 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);
-                       WARNING("negative reply, retrying");
+                       log_remove_callback(gdb_log_callback, connection);
+                       LOG_WARNING("negative reply, retrying");
                }
                else if (reply == 0x3)
                {
@@ -315,18 +356,20 @@ 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);
-                               WARNING("negative reply, retrying");
+                               log_remove_callback(gdb_log_callback, connection);
+                               LOG_WARNING("negative reply, retrying");
                        }
                        else
                        {
-                               ERROR("unknown character 0x%2.2x in reply, dropping connection", reply);
+                               LOG_ERROR("unknown character 0x%2.2x in reply, dropping connection", reply);
+                               gdb_con->closed=1;
                                return ERROR_SERVER_REMOTE_CLOSED;
                        }
                }
                else
                {
-                       ERROR("unknown character 0x%2.2x in reply, dropping connection", reply);
+                       LOG_ERROR("unknown character 0x%2.2x in reply, dropping connection", reply);
+                       gdb_con->closed=1;
                        return ERROR_SERVER_REMOTE_CLOSED;
                }
        }
@@ -362,7 +405,7 @@ int gdb_get_packet_inner(connection_t *connection, char *buffer, int *len)
                                return retval;
 
 #ifdef _DEBUG_GDB_IO_
-                       DEBUG("character: '%c'", character);
+                       LOG_DEBUG("character: '%c'", character);
 #endif
 
                        switch (character)
@@ -370,37 +413,37 @@ int gdb_get_packet_inner(connection_t *connection, char *buffer, int *len)
                                case '$':
                                        break;
                                case '+':
-                                       WARNING("acknowledgment received, but no packet pending");
+                                       LOG_WARNING("acknowledgment received, but no packet pending");
                                        break;
                                case '-':
-                                       WARNING("negative acknowledgment, but no packet pending");
+                                       LOG_WARNING("negative acknowledgment, but no packet pending");
                                        break;
                                case 0x3:
                                        gdb_con->ctrl_c = 1;
                                        *len = 0;
                                        return ERROR_OK;
                                default:
-                                       WARNING("ignoring character 0x%x", character);
+                                       LOG_WARNING("ignoring character 0x%x", character);
                                        break;
                        }
                } while (character != '$');
 
                my_checksum = 0;
-               
+
                count = 0;
                gdb_connection_t *gdb_con = connection->priv;
                for (;;)
                {
                        /* The common case is that we have an entire packet with no escape chars.
                         * We need to leave at least 2 bytes in the buffer to have
-                        * gdb_get_char() update various bits and bobs correctly. 
+                        * gdb_get_char() update various bits and bobs correctly.
                         */
                        if ((gdb_con->buf_cnt > 2) && ((gdb_con->buf_cnt+count) < *len))
                        {
                                /* The compiler will struggle a bit with constant propagation and
                                 * aliasing, so we help it by showing that these values do not
-                                * change inside the loop 
-                                */ 
+                                * change inside the loop
+                                */
                                int i;
                                char *buf = gdb_con->buf_p;
                                int run = gdb_con->buf_cnt - 2;
@@ -412,13 +455,13 @@ int gdb_get_packet_inner(connection_t *connection, char *buffer, int *len)
                                        i++;
                                        if (character == '#')
                                        {
-                                               /* Danger! character can be '#' when esc is 
+                                               /* Danger! character can be '#' when esc is
                                                 * used so we need an explicit boolean for done here.
                                                 */
                                                done = 1;
                                                break;
                                        }
-                                       
+
                                        if (character == '}')
                                        {
                                                /* data transmitted in binary mode (X packet)
@@ -436,15 +479,15 @@ int gdb_get_packet_inner(connection_t *connection, char *buffer, int *len)
                                }
                                gdb_con->buf_p += i;
                                gdb_con->buf_cnt -= i;
-                               if (done) 
+                               if (done)
                                        break;
-                       } 
+                       }
                        if (count > *len)
                        {
-                               ERROR("packet buffer too small");
+                               LOG_ERROR("packet buffer too small");
                                return ERROR_GDB_BUFFER_TOO_SMALL;
                        }
-                       
+
                        if ((retval = gdb_get_char(connection, &character)) != ERROR_OK)
                                return retval;
 
@@ -485,7 +528,7 @@ int gdb_get_packet_inner(connection_t *connection, char *buffer, int *len)
                        break;
                }
 
-               WARNING("checksum error, requesting retransmission");
+               LOG_WARNING("checksum error, requesting retransmission");
                gdb_write(connection, "-", 1);
        }
        if (gdb_con->closed)
@@ -502,57 +545,43 @@ int gdb_get_packet(connection_t *connection, char *buffer, int *len)
        gdb_con->busy = 0;
        return retval;
 }
-       
-int gdb_output_con(connection_t *connection, char* line)
+
+int gdb_output_con(connection_t *connection, const char* line)
 {
        char *hex_buffer;
        int i, bin_size;
 
        bin_size = strlen(line);
 
-       hex_buffer = malloc(bin_size*2 + 4);
+       hex_buffer = malloc(bin_size*2 + 2);
+       if (hex_buffer == NULL)
+               return ERROR_GDB_BUFFER_TOO_SMALL;
 
        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;
 }
 
-int gdb_output(struct command_context_s *context, char* line)
+int gdb_output(struct command_context_s *context, const char* line)
 {
        /* this will be dumped to the log and also sent as an O packet if possible */
-       USER(line); 
+       LOG_USER_N("%s", line);
        return ERROR_OK;
 }
 
 int gdb_program_handler(struct target_s *target, enum target_event event, void *priv)
 {
-       FILE *script;
        struct command_context_s *cmd_ctx = priv;
-       
-       if (target->gdb_program_script)
-       {
-               script = fopen(target->gdb_program_script, "r");
-               if (!script)
-               {
-                       ERROR("couldn't open script file %s", target->gdb_program_script);
-                               return ERROR_OK;
-               }
 
-               INFO("executing gdb_program script '%s'", target->gdb_program_script);
-               command_run_file(cmd_ctx, script, COMMAND_EXEC);
-               fclose(script);
-               
-               jtag_execute_queue();
-       }
-       
+       target_invoke_script(cmd_ctx, target, "gdb_program");
+       jtag_execute_queue();
+
        return ERROR_OK;
 }
 
@@ -567,10 +596,10 @@ int gdb_target_callback_event_handler(struct target_s *target, enum target_event
        {
                case TARGET_EVENT_HALTED:
                        /* In the GDB protocol when we are stepping or coninuing execution,
-                        * we have a lingering reply. Upon receiving a halted event 
+                        * we have a lingering reply. Upon receiving a halted event
                         * when we have that lingering packet, we reply to the original
                         * step or continue packet.
-                        * 
+                        *
                         * Executing monitor commands can bring the target in and
                         * out of the running state so we'll see lots of TARGET_EVENT_XXX
                         * that are to be ignored.
@@ -578,8 +607,8 @@ 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)
                                {
                                        signal = 0x2;
@@ -605,6 +634,7 @@ int gdb_target_callback_event_handler(struct target_s *target, enum target_event
        return ERROR_OK;
 }
 
+
 int gdb_new_connection(connection_t *connection)
 {
        gdb_connection_t *gdb_connection = malloc(sizeof(gdb_connection_t));
@@ -623,27 +653,40 @@ int gdb_new_connection(connection_t *connection)
        gdb_connection->closed = 0;
        gdb_connection->busy = 0;
        
+       /* send ACK to GDB for debug request */
+       gdb_write(connection, "+", 1);
+
        /* output goes through gdb connection */
        command_set_output_handler(connection->cmd_ctx, gdb_output, connection);
 
        /* register callback to be informed about target events */
-       target_register_event_callback(gdb_target_callback_event_handler, connection);  
-
-       /* a gdb session just attached, put the target in halt mode */
-       if (((retval = gdb_service->target->type->halt(gdb_service->target)) != ERROR_OK) &&
-                       (retval != ERROR_TARGET_ALREADY_HALTED))
-       {
-               ERROR("error(%d) when trying to halt target, falling back to \"reset halt\"", retval);
-               command_run_line(connection->cmd_ctx, "reset halt");
-       }
-
-       /* This will time out after 1 second */
-       command_run_line(connection->cmd_ctx, "wait_halt 1");
-
+       target_register_event_callback(gdb_target_callback_event_handler, connection);
+
+       /* a gdb session just attached, try to put the target in halt mode.
+        * 
+        * DANGER!!!! 
+        * 
+        * If the halt fails(e.g. target needs a reset, JTAG communication not
+        * working, etc.), then the GDB connect will succeed as
+        * the get_gdb_reg_list() will lie and return a register list with
+        * dummy values.
+        * 
+        * This allows GDB monitor commands to be run from a GDB init script to
+        * initialize the target
+        * 
+        * Also, since the halt() is asynchronous target connect will be
+        * instantaneous and thus avoiding annoying timeout problems during
+        * connect. 
+        */
+       target_halt(gdb_service->target);
+       
        /* remove the initial ACK from the incoming buffer */
        if ((retval = gdb_get_char(connection, &initial_ack)) != ERROR_OK)
                return retval;
 
+       /* FIX!!!??? would we actually ever receive a + here??? 
+        * Not observed.
+        */
        if (initial_ack != '+')
                gdb_putback_char(connection, initial_ack);
 
@@ -665,7 +708,7 @@ int gdb_connection_closed(connection_t *connection)
 
        /* if this connection registered a debug-message receiver delete it */
        delete_debug_msg_receiver(connection->cmd_ctx, gdb_service->target);
-       
+
        if (connection->priv)
        {
                free(connection->priv);
@@ -673,10 +716,11 @@ int gdb_connection_closed(connection_t *connection)
        }
        else
        {
-               ERROR("BUG: connection->priv == NULL");
+               LOG_ERROR("BUG: connection->priv == NULL");
        }
 
        target_unregister_event_callback(gdb_target_callback_event_handler, connection);
+       log_remove_callback(gdb_log_callback, connection);
 
        return ERROR_OK;
 }
@@ -711,24 +755,13 @@ void gdb_str_to_target(target_t *target, char *tstr, reg_t *reg)
        u8 *buf;
        int buf_len;
        buf = reg->value;
-       buf_len = CEIL(reg->size, 8); 
+       buf_len = CEIL(reg->size, 8);
 
-       if (target->endianness == TARGET_LITTLE_ENDIAN)
+       for (i = 0; i < buf_len; i++)
        {
-               for (i = 0; i < buf_len; i++)
-               {
-                       tstr[i*2]   = DIGITS[(buf[i]>>4) & 0xf];
-                       tstr[i*2+1] = DIGITS[buf[i]&0xf];
-               }
+               tstr[i*2]   = DIGITS[(buf[i]>>4) & 0xf];
+               tstr[i*2+1] = DIGITS[buf[i]&0xf];
        }
-       else
-       {
-               for (i = 0; i < buf_len; i++)
-               {
-                       tstr[(buf_len-1-i)*2]   = DIGITS[(buf[i]>>4)&0xf];
-                       tstr[(buf_len-1-i)*2+1] = DIGITS[buf[i]&0xf];
-               }
-       }       
 }
 
 void gdb_target_to_str(target_t *target, char *tstr, char *str)
@@ -738,25 +771,15 @@ void gdb_target_to_str(target_t *target, char *tstr, char *str)
 
        if (str_len % 2)
        {
-               ERROR("BUG: gdb value with uneven number of characters encountered");
+               LOG_ERROR("BUG: gdb value with uneven number of characters encountered");
                exit(-1);
        }
 
-       if (target->endianness == TARGET_LITTLE_ENDIAN)
+       for (i = 0; i < str_len; i+=2)
        {
-               for (i = 0; i < str_len; i+=2)
-               {
-                       str[str_len - i - 1] = tstr[i + 1];
-                       str[str_len - i - 2] = tstr[i];
-               }
+               str[str_len - i - 1] = tstr[i + 1];
+               str[str_len - i - 2] = tstr[i];
        }
-       else
-       {
-               for (i = 0; i < str_len; i++)
-               {
-                       str[i] = tstr[i];
-               }
-       }       
 }
 
 int gdb_get_registers_packet(connection_t *connection, target_t *target, char* packet, int packet_size)
@@ -770,21 +793,12 @@ int gdb_get_registers_packet(connection_t *connection, target_t *target, char* p
        int i;
 
 #ifdef _DEBUG_GDB_IO_
-       DEBUG("-");
+       LOG_DEBUG("-");
 #endif
 
        if ((retval = target->type->get_gdb_reg_list(target, &reg_list, &reg_list_size)) != ERROR_OK)
        {
-               switch (retval)
-               {
-                       case ERROR_TARGET_NOT_HALTED:
-                               ERROR("gdb requested registers but we're not halted, dropping connection");
-                               return ERROR_SERVER_REMOTE_CLOSED;
-                       default:
-                               /* this is a bug condition - get_gdb_reg_list() may not return any other error */
-                               ERROR("BUG: unexpected error returned by get_gdb_reg_list()");
-                               exit(-1);
-               }
+               return gdb_error(connection, retval);
        }
 
        for (i = 0; i < reg_list_size; i++)
@@ -805,7 +819,7 @@ int gdb_get_registers_packet(connection_t *connection, target_t *target, char* p
        {
                char *reg_packet_p;
                reg_packet_p = strndup(reg_packet, CEIL(reg_packet_size, 8) * 2);
-               DEBUG("reg_packet: %s", reg_packet_p);
+               LOG_DEBUG("reg_packet: %s", reg_packet_p);
                free(reg_packet_p);
        }
 #endif
@@ -827,7 +841,7 @@ int gdb_set_registers_packet(connection_t *connection, target_t *target, char *p
        char *packet_p;
 
 #ifdef _DEBUG_GDB_IO_
-       DEBUG("-");
+       LOG_DEBUG("-");
 #endif
 
        /* skip command character */
@@ -836,22 +850,13 @@ int gdb_set_registers_packet(connection_t *connection, target_t *target, char *p
 
        if (packet_size % 2)
        {
-               WARNING("GDB set_registers packet with uneven characters received, dropping connection");
+               LOG_WARNING("GDB set_registers packet with uneven characters received, dropping connection");
                return ERROR_SERVER_REMOTE_CLOSED;
        }
 
        if ((retval = target->type->get_gdb_reg_list(target, &reg_list, &reg_list_size)) != ERROR_OK)
        {
-               switch (retval)
-               {
-                       case ERROR_TARGET_NOT_HALTED:
-                               ERROR("gdb tried to registers but we're not halted, dropping connection");
-                               return ERROR_SERVER_REMOTE_CLOSED;
-                       default:
-                               /* this is a bug condition - get_gdb_reg_list() may not return any other error */
-                               ERROR("BUG: unexpected error returned by get_gdb_reg_list()");
-                               exit(-1);
-               }
+               return gdb_error(connection, retval);
        }
 
        packet_p = packet;
@@ -869,23 +874,23 @@ int gdb_set_registers_packet(connection_t *connection, target_t *target, char *p
                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);
 
-               /* get register arch_type, and call set method */       
+               /* get register arch_type, and call set method */
                arch_type = register_get_arch_type(reg_list[i]->arch_type);
                if (arch_type == NULL)
                {
-                       ERROR("BUG: encountered unregistered arch type");
+                       LOG_ERROR("BUG: encountered unregistered arch type");
                        exit(-1);
                }
                arch_type->set(reg_list[i], bin_buf);
 
-               /* advance packet pointer */            
+               /* advance packet pointer */
                packet_p += (CEIL(reg_list[i]->size, 8) * 2);
 
                free(bin_buf);
                free(hex_buf);
        }
 
-       /* free reg_t *reg_list[] array allocated by get_gdb_reg_list */ 
+       /* free reg_t *reg_list[] array allocated by get_gdb_reg_list */
        free(reg_list);
 
        gdb_put_packet(connection, "OK", 2);
@@ -902,26 +907,17 @@ int gdb_get_register_packet(connection_t *connection, target_t *target, char *pa
        int retval;
 
 #ifdef _DEBUG_GDB_IO_
-       DEBUG("-");
+       LOG_DEBUG("-");
 #endif
 
        if ((retval = target->type->get_gdb_reg_list(target, &reg_list, &reg_list_size)) != ERROR_OK)
        {
-               switch (retval)
-               {
-                       case ERROR_TARGET_NOT_HALTED:
-                               ERROR("gdb requested registers but we're not halted, dropping connection");
-                               return ERROR_SERVER_REMOTE_CLOSED;
-                       default:
-                               /* this is a bug condition - get_gdb_reg_list() may not return any other error */
-                               ERROR("BUG: unexpected error returned by get_gdb_reg_list()");
-                               exit(-1);
-               }
+               return gdb_error(connection, retval);
        }
 
        if (reg_list_size <= reg_num)
        {
-               ERROR("gdb requested a non-existing register");
+               LOG_ERROR("gdb requested a non-existing register");
                exit(-1);
        }
 
@@ -948,31 +944,22 @@ int gdb_set_register_packet(connection_t *connection, target_t *target, char *pa
        int retval;
        reg_arch_type_t *arch_type;
 
-       DEBUG("-");
+       LOG_DEBUG("-");
 
        if ((retval = target->type->get_gdb_reg_list(target, &reg_list, &reg_list_size)) != ERROR_OK)
        {
-               switch (retval)
-               {
-                       case ERROR_TARGET_NOT_HALTED:
-                               ERROR("gdb tried to set a register but we're not halted, dropping connection");
-                               return ERROR_SERVER_REMOTE_CLOSED;
-                       default:
-                               /* this is a bug condition - get_gdb_reg_list() may not return any other error */
-                               ERROR("BUG: unexpected error returned by get_gdb_reg_list()");
-                               exit(-1);
-               }
+               return gdb_error(connection, retval);
        }
 
        if (reg_list_size < reg_num)
        {
-               ERROR("gdb requested a non-existing register");
-               return ERROR_SERVER_REMOTE_CLOSED;
+               LOG_ERROR("gdb requested a non-existing register");
+               return ERROR_SERVER_REMOTE_CLOSED;      
        }
 
        if (*separator != '=')
        {
-               ERROR("GDB 'set register packet', but no '=' following the register number");
+               LOG_ERROR("GDB 'set register packet', but no '=' following the register number");
                return ERROR_SERVER_REMOTE_CLOSED;
        }
 
@@ -984,11 +971,11 @@ int gdb_set_register_packet(connection_t *connection, target_t *target, char *pa
        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);
 
-       /* 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)
        {
-               ERROR("BUG: encountered unregistered arch type");
+               LOG_ERROR("BUG: encountered unregistered arch type");
                exit(-1);
        }
        arch_type->set(reg_list[reg_num], bin_buf);
@@ -1002,13 +989,10 @@ int gdb_set_register_packet(connection_t *connection, target_t *target, char *pa
        return ERROR_OK;
 }
 
-int gdb_memory_packet_error(connection_t *connection, int retval)
+int gdb_error(connection_t *connection, int retval)
 {
        switch (retval)
        {
-               case ERROR_TARGET_NOT_HALTED:
-                       ERROR("gdb tried to read memory but we're not halted, dropping connection");
-                       return ERROR_SERVER_REMOTE_CLOSED;
                case ERROR_TARGET_DATA_ABORT:
                        gdb_send_error(connection, EIO);
                        break;
@@ -1018,10 +1002,14 @@ int gdb_memory_packet_error(connection_t *connection, int retval)
                case ERROR_TARGET_UNALIGNED_ACCESS:
                        gdb_send_error(connection, EFAULT);
                        break;
+               case ERROR_TARGET_NOT_HALTED:
+                       gdb_send_error(connection, EFAULT);
+                       break;
                default:
                        /* This could be that the target reset itself. */
-                       ERROR("unexpected error %i. Dropping connection.", retval);
-                       return ERROR_SERVER_REMOTE_CLOSED;
+                       LOG_ERROR("unexpected error %i", retval);
+                       gdb_send_error(connection, EFAULT);
+                       break;
        }
 
        return ERROR_OK;
@@ -1029,7 +1017,7 @@ int gdb_memory_packet_error(connection_t *connection, int retval)
 
 /* We don't have to worry about the default 2 second timeout for GDB packets,
  * because GDB breaks up large memory reads into smaller reads.
- * 
+ *
  * 8191 bytes by the looks of it. Why 8191 bytes instead of 8192?????
  */
 int gdb_read_memory_packet(connection_t *connection, target_t *target, char *packet, int packet_size)
@@ -1050,7 +1038,7 @@ int gdb_read_memory_packet(connection_t *connection, target_t *target, char *pac
 
        if (*separator != ',')
        {
-               ERROR("incomplete read memory packet received, dropping connection");
+               LOG_ERROR("incomplete read memory packet received, dropping connection");
                return ERROR_SERVER_REMOTE_CLOSED;
        }
 
@@ -1058,7 +1046,7 @@ int gdb_read_memory_packet(connection_t *connection, target_t *target, char *pac
 
        buffer = malloc(len);
 
-       DEBUG("addr: 0x%8.8x, len: 0x%8.8x", addr, len);
+       LOG_DEBUG("addr: 0x%8.8x, len: 0x%8.8x", addr, len);
 
        retval = target_read_buffer(target, addr, len, buffer);
 
@@ -1066,11 +1054,11 @@ int gdb_read_memory_packet(connection_t *connection, target_t *target, char *pac
        {
                /* 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.
@@ -1098,7 +1086,7 @@ int gdb_read_memory_packet(connection_t *connection, target_t *target, char *pac
        }
        else
        {
-               retval = gdb_memory_packet_error(connection, retval);
+               retval = gdb_error(connection, retval);
        }
 
        free(buffer);
@@ -1124,7 +1112,7 @@ int gdb_write_memory_packet(connection_t *connection, target_t *target, char *pa
 
        if (*separator != ',')
        {
-               ERROR("incomplete write memory packet received, dropping connection");
+               LOG_ERROR("incomplete write memory packet received, dropping connection");
                return ERROR_SERVER_REMOTE_CLOSED;
        }
 
@@ -1132,13 +1120,13 @@ int gdb_write_memory_packet(connection_t *connection, target_t *target, char *pa
 
        if (*(separator++) != ':')
        {
-               ERROR("incomplete write memory packet received, dropping connection");
+               LOG_ERROR("incomplete write memory packet received, dropping connection");
                return ERROR_SERVER_REMOTE_CLOSED;
        }
 
        buffer = malloc(len);
 
-       DEBUG("addr: 0x%8.8x, len: 0x%8.8x", addr, len);
+       LOG_DEBUG("addr: 0x%8.8x, len: 0x%8.8x", addr, len);
 
        for (i=0; i<len; i++)
        {
@@ -1155,13 +1143,12 @@ int gdb_write_memory_packet(connection_t *connection, target_t *target, char *pa
        }
        else
        {
-               if ((retval = gdb_memory_packet_error(connection, retval)) != ERROR_OK)
-                       return retval; 
+               retval = gdb_error(connection, retval);
        }
 
        free(buffer);
 
-       return ERROR_OK;
+       return retval;
 }
 
 int gdb_write_memory_binary_packet(connection_t *connection, target_t *target, char *packet, int packet_size)
@@ -1179,7 +1166,7 @@ int gdb_write_memory_binary_packet(connection_t *connection, target_t *target, c
 
        if (*separator != ',')
        {
-               ERROR("incomplete write memory binary packet received, dropping connection");
+               LOG_ERROR("incomplete write memory binary packet received, dropping connection");
                return ERROR_SERVER_REMOTE_CLOSED;
        }
 
@@ -1187,14 +1174,14 @@ int gdb_write_memory_binary_packet(connection_t *connection, target_t *target, c
 
        if (*(separator++) != ':')
        {
-               ERROR("incomplete write memory binary packet received, dropping connection");
+               LOG_ERROR("incomplete write memory binary packet received, dropping connection");
                return ERROR_SERVER_REMOTE_CLOSED;
        }
 
        retval = ERROR_OK;
        if (len)
        {
-               DEBUG("addr: 0x%8.8x, len: 0x%8.8x", addr, len);
+               LOG_DEBUG("addr: 0x%8.8x, len: 0x%8.8x", addr, len);
 
                retval = target_write_buffer(target, addr, len, (u8*)separator);
        }
@@ -1205,8 +1192,8 @@ int gdb_write_memory_binary_packet(connection_t *connection, target_t *target, c
        }
        else
        {
-               if ((retval = gdb_memory_packet_error(connection, retval)) != ERROR_OK)
-                       return retval; 
+               if ((retval = gdb_error(connection, retval)) != ERROR_OK)
+                       return retval;
        }
 
        return ERROR_OK;
@@ -1217,7 +1204,7 @@ void gdb_step_continue_packet(connection_t *connection, target_t *target, char *
        int current = 0;
        u32 address = 0x0;
 
-       DEBUG("-");
+       LOG_DEBUG("-");
 
        if (packet_size > 1)
        {
@@ -1231,35 +1218,17 @@ void gdb_step_continue_packet(connection_t *connection, target_t *target, char *
 
        if (packet[0] == 'c')
        {
-               DEBUG("continue");
-               target->type->resume(target, current, address, 0, 0); /* resume at current address, don't handle breakpoints, not debugging */
+               LOG_DEBUG("continue");
+               target_invoke_script(connection->cmd_ctx, target, "pre_resume");
+               target_resume(target, current, address, 0, 0); /* resume at current address, don't handle breakpoints, not debugging */
        }
        else if (packet[0] == 's')
        {
-               DEBUG("step");
+               LOG_DEBUG("step");
                target->type->step(target, current, address, 0); /* step at current or address, don't handle breakpoints */
        }
 }
 
-int gdb_bp_wp_packet_error(connection_t *connection, int retval)
-{
-       switch (retval)
-       {
-               case ERROR_TARGET_NOT_HALTED:
-                       ERROR("gdb tried to set a breakpoint but we're not halted, dropping connection");
-                       return ERROR_SERVER_REMOTE_CLOSED;
-                       break;
-               case ERROR_TARGET_RESOURCE_NOT_AVAILABLE:
-                       gdb_send_error(connection, EBUSY);
-                       break;
-               default:
-                       ERROR("BUG: unexpected error %i", retval);
-                       exit(-1);
-       }
-
-       return ERROR_OK;
-}
-
 int gdb_breakpoint_watchpoint_packet(connection_t *connection, target_t *target, char *packet, int packet_size)
 {
        int type;
@@ -1270,7 +1239,7 @@ int gdb_breakpoint_watchpoint_packet(connection_t *connection, target_t *target,
        char *separator;
        int retval;
 
-       DEBUG("-");
+       LOG_DEBUG("-");
 
        type = strtoul(packet + 1, &separator, 16);
 
@@ -1287,7 +1256,7 @@ int gdb_breakpoint_watchpoint_packet(connection_t *connection, target_t *target,
 
        if (*separator != ',')
        {
-               ERROR("incomplete breakpoint/watchpoint packet received, dropping connection");
+               LOG_ERROR("incomplete breakpoint/watchpoint packet received, dropping connection");
                return ERROR_SERVER_REMOTE_CLOSED;
        }
 
@@ -1295,7 +1264,7 @@ int gdb_breakpoint_watchpoint_packet(connection_t *connection, target_t *target,
 
        if (*separator != ',')
        {
-               ERROR("incomplete breakpoint/watchpoint packet received, dropping connection");
+               LOG_ERROR("incomplete breakpoint/watchpoint packet received, dropping connection");
                return ERROR_SERVER_REMOTE_CLOSED;
        }
 
@@ -1309,7 +1278,7 @@ int gdb_breakpoint_watchpoint_packet(connection_t *connection, target_t *target,
                        {
                                if ((retval = breakpoint_add(target, address, size, bp_type)) != ERROR_OK)
                                {
-                                       if ((retval = gdb_bp_wp_packet_error(connection, retval)) != ERROR_OK)
+                                       if ((retval = gdb_error(connection, retval)) != ERROR_OK)
                                                return retval;
                                }
                                else
@@ -1331,7 +1300,7 @@ int gdb_breakpoint_watchpoint_packet(connection_t *connection, target_t *target,
                        {
                                if ((retval = watchpoint_add(target, address, size, type-2, 0, 0xffffffffu)) != ERROR_OK)
                                {
-                                       if ((retval = gdb_bp_wp_packet_error(connection, retval)) != ERROR_OK)
+                                       if ((retval = gdb_error(connection, retval)) != ERROR_OK)
                                                return retval;
                                }
                                else
@@ -1361,14 +1330,14 @@ void xml_printf(int *retval, char **xml, int *pos, int *size, const char *fmt, .
                return;
        }
        int first = 1;
-       
+
        for (;;)
        {
                if ((*xml == NULL) || (!first))
                {
                        /* start by 0 to exercise all the code paths.
                         * Need minimum 2 bytes to fit 1 char and 0 terminator. */
-                        
+
                        *size = *size * 2 + 2;
                        char *t = *xml;
                        *xml = realloc(*xml, *size);
@@ -1380,26 +1349,26 @@ void xml_printf(int *retval, char **xml, int *pos, int *size, const char *fmt, .
                                return;
                        }
                }
-               
-           va_list ap;
-           int ret;
-           va_start(ap, fmt);
-           ret = vsnprintf(*xml + *pos, *size - *pos, fmt, ap);
-           va_end(ap);
-           if ((ret > 0) && ((ret + 1) < *size - *pos))
-           {
-               *pos += ret;
-               return;
-           }
-           /* there was just enough or not enough space, allocate more. */
-           first = 0;
+
+               va_list ap;
+               int ret;
+               va_start(ap, fmt);
+               ret = vsnprintf(*xml + *pos, *size - *pos, fmt, ap);
+               va_end(ap);
+               if ((ret > 0) && ((ret + 1) < *size - *pos))
+               {
+                       *pos += ret;
+                       return;
+               }
+               /* there was just enough or not enough space, allocate more. */
+               first = 0;
        }
 }
 
 static int decode_xfer_read(char *buf, char **annex, int *ofs, unsigned int *len)
 {
        char *separator;
-       
+
        /* Extract and NUL-terminate the annex. */
        *annex = buf;
        while (*buf && *buf != ':')
@@ -1407,17 +1376,17 @@ static int decode_xfer_read(char *buf, char **annex, int *ofs, unsigned int *len
        if (*buf == '\0')
                return -1;
        *buf++ = 0;
-       
+
        /* After the read marker and annex, qXfer looks like a
         * traditional 'm' packet. */
-       
+
        *ofs = strtoul(buf, &separator, 16);
 
        if (*separator != ',')
                return -1;
 
        *len = strtoul(separator+1, NULL, 16);
-       
+
        return 0;
 }
 
@@ -1425,22 +1394,40 @@ int gdb_calc_blocksize(flash_bank_t *bank)
 {
        int i;
        int block_size = 0xffffffff;
-       
+
        /* loop through all sectors and return smallest sector size */
-       
+
        for (i = 0; i < bank->num_sectors; i++)
        {
                if (bank->sectors[i].size < block_size)
                        block_size = bank->sectors[i].size;
        }
-       
+
        return block_size;
 }
 
+static int compare_bank (const void * a, const void * b)
+{
+       flash_bank_t *b1, *b2;
+       b1=*((flash_bank_t **)a);
+       b2=*((flash_bank_t **)b);
+       
+       if (b1->base==b2->base)
+       {
+               return 0;
+       } else if (b1->base>b2->base)
+       {
+               return 1;
+       } else
+       {
+               return -1;
+       }
+}
+
 int gdb_query_packet(connection_t *connection, target_t *target, char *packet, int packet_size)
 {
        command_context_t *cmd_ctx = connection->cmd_ctx;
-       
+
        if (strstr(packet, "qRcmd,"))
        {
                if (packet_size > 6)
@@ -1455,11 +1442,13 @@ int gdb_query_packet(connection_t *connection, target_t *target, char *packet, i
                                cmd[i] = tmp;
                        }
                        cmd[(packet_size - 6)/2] = 0x0;
-                       
+
                        /* We want to print all debug output to GDB connection */
-                       log_setCallback(gdb_log_callback, connection);
-                       target_call_timer_callbacks();
+                       log_add_callback(gdb_log_callback, connection);
+                       target_call_timer_callbacks_now();
                        command_run_line(cmd_ctx, cmd);
+                       target_call_timer_callbacks_now();
+                       log_remove_callback(gdb_log_callback, connection);
                        free(cmd);
                }
                gdb_put_packet(connection, "OK", 2);
@@ -1475,22 +1464,22 @@ int gdb_query_packet(connection_t *connection, target_t *target, char *packet, i
                        u32 checksum;
                        u32 addr = 0;
                        u32 len = 0;
-                       
+
                        /* skip command character */
                        packet += 5;
-                       
+
                        addr = strtoul(packet, &separator, 16);
-                       
+
                        if (*separator != ',')
                        {
-                               ERROR("incomplete read memory packet received, dropping connection");
+                               LOG_ERROR("incomplete read memory packet received, dropping connection");
                                return ERROR_SERVER_REMOTE_CLOSED;
                        }
-                       
+
                        len = strtoul(separator + 1, NULL, 16);
-                       
+
                        retval = target_checksum_memory(target, addr, len, &checksum);
-                       
+
                        if (retval == ERROR_OK)
                        {
                                snprintf(gdb_reply, 10, "C%8.8x", checksum);
@@ -1498,10 +1487,10 @@ int gdb_query_packet(connection_t *connection, target_t *target, char *packet, i
                        }
                        else
                        {
-                               if ((retval = gdb_memory_packet_error(connection, retval)) != ERROR_OK)
-                                       return retval; 
+                               if ((retval = gdb_error(connection, retval)) != ERROR_OK)
+                                       return retval;
                        }
-                       
+
                        return ERROR_OK;
                }
        }
@@ -1514,66 +1503,105 @@ int gdb_query_packet(connection_t *connection, target_t *target, char *packet, i
                int pos = 0;
                int size = 0;
 
-               xml_printf(&retval, &buffer, &pos, &size, 
+               xml_printf(&retval, &buffer, &pos, &size,
                                "PacketSize=%x;qXfer:memory-map:read%c;qXfer:features:read-",
                                (GDB_BUFFER_SIZE - 1), gdb_use_memory_map == 1 ? '+' : '-');
-               
+
                if (retval != ERROR_OK)
                {
                        gdb_send_error(connection, 01);
                        return ERROR_OK;
                }
-               
+
                gdb_put_packet(connection, buffer, strlen(buffer));
                free(buffer);
-               
+
                return ERROR_OK;
        }
        else if (strstr(packet, "qXfer:memory-map:read::"))
        {
                /* We get away with only specifying flash here. Regions that are not
-                * specified are treated as if we provided no memory map(if not we 
+                * specified are treated as if we provided no memory map(if not we
                 * could detect the holes and mark them as RAM).
                 * Normally we only execute this code once, but no big deal if we
                 * have to regenerate it a couple of times. */
-                
+
                flash_bank_t *p;
                char *xml = NULL;
                int size = 0;
                int pos = 0;
                int retval = ERROR_OK;
-               
+
                int offset;
                int length;
                char *separator;
                int blocksize;
-               
+
                /* skip command character */
                packet += 23;
-               
+
                offset = strtoul(packet, &separator, 16);
                length = strtoul(separator + 1, &separator, 16);
-               
+
                xml_printf(&retval, &xml, &pos, &size, "<memory-map>\n");
+       
+               /* 
+               sort banks in ascending order, we need to make non-flash memory be ram(or rather
+               read/write) by default for GDB.
+               GDB does not have a concept of non-cacheable read/write memory.
+                */
+               flash_bank_t **banks=malloc(sizeof(flash_bank_t *)*flash_get_bank_count());
+               int i;
                
-               int i = 0;
-               for (;;)
+               for (i=0; i<flash_get_bank_count(); i++)
                {
                        p = get_flash_bank_by_num(i);
                        if (p == NULL)
-                               break;
+                       {
+                               free(banks);
+                               retval = ERROR_FAIL;
+                               gdb_send_error(connection, retval);
+                               return retval;
+                       }
+                       banks[i]=p;
+               }
+               
+               qsort(banks, flash_get_bank_count(), sizeof(flash_bank_t *), compare_bank);
+               
+               u32 ram_start=0;
+               for (i=0; i<flash_get_bank_count(); i++)
+               {
+                       p = banks[i];
+                       
+                       if (ram_start<p->base)
+                       {
+                               xml_printf(&retval, &xml, &pos, &size, "<memory type=\"ram\" start=\"0x%x\" length=\"0x%x\"/>\n",
+                                       ram_start, p->base-ram_start);
+                       }
                        
                        /* if device has uneven sector sizes, eg. str7, lpc
                         * we pass the smallest sector size to gdb memory map */
                        blocksize = gdb_calc_blocksize(p);
-                       
+       
                        xml_printf(&retval, &xml, &pos, &size, "<memory type=\"flash\" start=\"0x%x\" length=\"0x%x\">\n" \
                                "<property name=\"blocksize\">0x%x</property>\n" \
                                "</memory>\n", \
                                p->base, p->size, blocksize);
-                       i++;
+                       ram_start=p->base+p->size;                      
+               }
+               if (ram_start!=0)
+               {
+                       xml_printf(&retval, &xml, &pos, &size, "<memory type=\"ram\" start=\"0x%x\" length=\"0x%x\"/>\n",
+                               ram_start, 0-ram_start);
+               } else
+               {
+                       /* a flash chip could be at the very end of the 32 bit address space, in which case
+                       ram_start will be precisely 0 */
                }
                
+               free(banks);
+               banks = NULL;
+
                xml_printf(&retval, &xml, &pos, &size, "</memory-map>\n");
 
                if (retval != ERROR_OK)
@@ -1581,7 +1609,7 @@ int gdb_query_packet(connection_t *connection, target_t *target, char *packet, i
                        gdb_send_error(connection, retval);
                        return retval;
                }
-                               
+
                if (offset + length > pos)
                {
                        length = pos - offset;
@@ -1591,52 +1619,52 @@ int gdb_query_packet(connection_t *connection, target_t *target, char *packet, i
                t[0] = 'l';
                memcpy(t + 1, xml + offset, length);
                gdb_put_packet(connection, t, length + 1);
-               
+
                free(t);
                free(xml);
                return ERROR_OK;
        }
        else if (strstr(packet, "qXfer:features:read:"))
-       {                
+       {
                char *xml = NULL;
                int size = 0;
                int pos = 0;
                int retval = ERROR_OK;
-               
+
                int offset;
                unsigned int length;
                char *annex;
-               
+
                /* skip command character */
                packet += 20;
-               
+
                if (decode_xfer_read(packet, &annex, &offset, &length) < 0)
                {
                        gdb_send_error(connection, 01);
                        return ERROR_OK;
                }
-               
+
                if (strcmp(annex, "target.xml") != 0)
                {
                        gdb_send_error(connection, 01);
                        return ERROR_OK;
                }
-                               
+
                xml_printf(&retval, &xml, &pos, &size, \
                        "l<target version=\"1.0\">\n<architecture>arm</architecture>\n</target>\n");
-                                       
+
                if (retval != ERROR_OK)
                {
                        gdb_send_error(connection, retval);
                        return retval;
                }
-               
-               gdb_put_packet(connection, xml, strlen(xml) + 1);
-               
+
+               gdb_put_packet(connection, xml, strlen(xml));
+
                free(xml);
                return ERROR_OK;
        }
-       
+
        gdb_put_packet(connection, "", 0);
        return ERROR_OK;
 }
@@ -1648,22 +1676,22 @@ int gdb_v_packet(connection_t *connection, target_t *target, char *packet, int p
        int result;
 
        /* if flash programming disabled - send a empty reply */
-       
+
        if (gdb_flash_program == 0)
        {
                gdb_put_packet(connection, "", 0);
                return ERROR_OK;
        }
-       
+
        if (strstr(packet, "vFlashErase:"))
        {
                unsigned long addr;
                unsigned long length;
-       
+
                char *parse = packet + 12;
                if (*parse == '\0')
                {
-                       ERROR("incomplete vFlashErase packet received, dropping connection");
+                       LOG_ERROR("incomplete vFlashErase packet received, dropping connection");
                        return ERROR_SERVER_REMOTE_CLOSED;
                }
 
@@ -1671,7 +1699,7 @@ int gdb_v_packet(connection_t *connection, target_t *target, char *packet, int p
 
                if (*(parse++) != ',' || *parse == '\0')
                {
-                       ERROR("incomplete vFlashErase packet received, dropping connection");
+                       LOG_ERROR("incomplete vFlashErase packet received, dropping connection");
                        return ERROR_SERVER_REMOTE_CLOSED;
                }
 
@@ -1679,17 +1707,17 @@ int gdb_v_packet(connection_t *connection, target_t *target, char *packet, int p
 
                if (*parse != '\0')
                {
-                       ERROR("incomplete vFlashErase packet received, dropping connection");
+                       LOG_ERROR("incomplete vFlashErase packet received, dropping connection");
                        return ERROR_SERVER_REMOTE_CLOSED;
                }
-               
+
                /* assume all sectors need erasing - stops any problems
                 * when flash_write is called multiple times */
                flash_set_dirty();
-               
+
                /* perform any target specific operations before the erase */
                target_call_event_callbacks(gdb_service->target, TARGET_EVENT_GDB_PROGRAM);
-               
+
                /* perform erase */
                if ((result = flash_erase_address_range(gdb_service->target, addr, length)) != ERROR_OK)
                {
@@ -1697,11 +1725,11 @@ int gdb_v_packet(connection_t *connection, target_t *target, char *packet, int p
                         * treat a failed erase as an I/O error
                         */
                        gdb_send_error(connection, EIO);
-                       ERROR("flash_erase returned %i", result);
+                       LOG_ERROR("flash_erase returned %i", result);
                }
                else
                        gdb_put_packet(connection, "OK", 2);
-               
+
                return ERROR_OK;
        }
 
@@ -1713,17 +1741,17 @@ int gdb_v_packet(connection_t *connection, target_t *target, char *packet, int p
 
                if (*parse == '\0')
                {
-                       ERROR("incomplete vFlashErase packet received, dropping connection");
+                       LOG_ERROR("incomplete vFlashErase packet received, dropping connection");
                        return ERROR_SERVER_REMOTE_CLOSED;
                }
                addr = strtoul(parse, &parse, 16);
                if (*(parse++) != ':')
                {
-                       ERROR("incomplete vFlashErase packet received, dropping connection");
+                       LOG_ERROR("incomplete vFlashErase packet received, dropping connection");
                        return ERROR_SERVER_REMOTE_CLOSED;
                }
                length = packet_size - (parse - packet);
-               
+
                /* create a new image if there isn't already one */
                if (gdb_connection->vflash_image == NULL)
                {
@@ -1742,33 +1770,26 @@ 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);
+                       LOG_DEBUG("wrote %u bytes from vFlash image to flash", written);
                        gdb_put_packet(connection, "OK", 2);
                }
-               
+
                image_close(gdb_connection->vflash_image);
                free(gdb_connection->vflash_image);
                gdb_connection->vflash_image = NULL;
-               
+
                return ERROR_OK;
        }
 
@@ -1781,52 +1802,51 @@ int gdb_detach(connection_t *connection, target_t *target)
        switch( detach_mode )
        {
                case GDB_DETACH_RESUME:
-                       target->type->resume(target, 1, 0, 1, 0);
+                       target_invoke_script(connection->cmd_ctx, target, "pre_resume");
+                       target_resume(target, 1, 0, 1, 0);
                        break;
-               
+
                case GDB_DETACH_RESET:
-                       target_process_reset(connection->cmd_ctx);
+                       /* FIX?? make this configurable?? */
+                       target_process_reset(connection->cmd_ctx, RESET_HALT);
                        break;
-               
+
                case GDB_DETACH_HALT:
-                       target->type->halt(target);
+                       target_halt(target);
                        break;
-               
+
                case GDB_DETACH_NOTHING:
                        break;
        }
-       
+
        gdb_put_packet(connection, "OK", 2);
-       
+
        return ERROR_OK;
 }
 
-static void gdb_log_callback(void *priv, const char *file, int line, 
-               const char *function, const char *format, va_list args)
+static void gdb_log_callback(void *priv, const char *file, int line,
+               const char *function, const char *string)
 {
        connection_t *connection = priv;
        gdb_connection_t *gdb_con = connection->priv;
-       
+
        if (gdb_con->busy)
        {
                /* do not reply this using the O packet */
                return;
        }
 
-       char *t = allocPrintf(format, args);
-       if (t == NULL)
-               return;
-       
-       gdb_output_con(connection, t); 
-       
-       free(t);
+       gdb_output_con(connection, string);
 }
 
+/* Do not allocate this on the stack */
+char gdb_packet_buffer[GDB_BUFFER_SIZE];
+
 int gdb_input_inner(connection_t *connection)
 {
        gdb_service_t *gdb_service = connection->service->priv;
        target_t *target = gdb_service->target;
-       char packet[GDB_BUFFER_SIZE];
+       char *packet=gdb_packet_buffer;
        int packet_size;
        int retval;
        gdb_connection_t *gdb_con = connection->priv;
@@ -1844,7 +1864,7 @@ int gdb_input_inner(connection_t *connection)
                /* terminate with zero */
                packet[packet_size] = 0;
 
-               DEBUG("received packet: '%s'", packet);
+               LOG_DEBUG("received packet: '%s'", packet);
 
                if (packet_size > 0)
                {
@@ -1852,7 +1872,7 @@ int gdb_input_inner(connection_t *connection)
                        switch (packet[0])
                        {
                                case 'H':
-                                       /* Hct... -- set thread 
+                                       /* Hct... -- set thread
                                         * we don't have threads, send empty reply */
                                        gdb_put_packet(connection, NULL, 0);
                                        break;
@@ -1887,12 +1907,24 @@ int gdb_input_inner(connection_t *connection)
                                case 'c':
                                case 's':
                                        {
-                                       /* We're running/stepping, in which case we can 
-                                        * 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);
-                                               gdb_step_continue_packet(connection, target, packet, packet_size);
+                                               if (target->state != TARGET_HALTED)
+                                               {
+                                                       /* If the target isn't in the halted state, then we can't
+                                                        * step/continue. This might be early setup, etc.
+                                                        */
+                                                       char sig_reply[4];
+                                                       snprintf(sig_reply, 4, "T%2.2x", 2);
+                                                       gdb_put_packet(connection, sig_reply, 3);
+                                               } else
+                                               {
+                                                       /* We're running/stepping, in which case we can
+                                                        * forward log output until the target is halted 
+                                                        */
+                                                       gdb_connection_t *gdb_con = connection->priv;
+                                                       gdb_con->frontend_state = TARGET_RUNNING;
+                                                       log_add_callback(gdb_log_callback, connection);
+                                                       gdb_step_continue_packet(connection, target, packet, packet_size);
+                                               }
                                        }
                                        break;
                                case 'v':
@@ -1918,11 +1950,12 @@ int gdb_input_inner(connection_t *connection)
                                        break;
                                case 'R':
                                        /* handle extended restart packet */
-                                       target_process_reset(connection->cmd_ctx);
+                                       /* fix?? make this configurable? */
+                                       target_process_reset(connection->cmd_ctx, RESET_HALT);
                                        break;
                                default:
                                        /* ignore unkown packets */
-                                       DEBUG("ignoring 0x%2.2x packet", packet[0]);
+                                       LOG_DEBUG("ignoring 0x%2.2x packet", packet[0]);
                                        gdb_put_packet(connection, NULL, 0);
                                        break;
                        }
@@ -1936,7 +1969,7 @@ int gdb_input_inner(connection_t *connection)
                {
                        if (target->state == TARGET_RUNNING)
                        {
-                               target->type->halt(target);
+                               target_halt(target);
                                gdb_con->ctrl_c = 0;
                        }
                }
@@ -1949,8 +1982,14 @@ 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;
        if (retval == ERROR_SERVER_REMOTE_CLOSED)
                return retval;
+
+       /* logging does not propagate the error, yet can set th gdb_con->closed flag */
+       if (gdb_con->closed)
+               return ERROR_SERVER_REMOTE_CLOSED;
+       
        /* we'll recover from any other errors(e.g. temporary timeouts, etc.) */
        return ERROR_OK;
 }
@@ -1963,13 +2002,13 @@ int gdb_init()
 
        if (!target)
        {
-               WARNING("no gdb ports allocated as no target has been specified");
+               LOG_WARNING("no gdb ports allocated as no target has been specified");
                return ERROR_OK;
        }
 
        if (gdb_port == 0)
        {
-               WARNING("no gdb port specified, using default port 3333");
+               LOG_WARNING("no gdb port specified, using default port 3333");
                gdb_port = 3333;
        }
 
@@ -1984,7 +2023,7 @@ int gdb_init()
 
                add_service("gdb", CONNECTION_GDB, gdb_port + i, 1, gdb_new_connection, gdb_input, gdb_connection_closed, gdb_service);
 
-               DEBUG("gdb service for target %s at port %i", target->type->name, gdb_port + i);
+               LOG_DEBUG("gdb service for target %s at port %i", target->type->name, gdb_port + i);
 
                i++;
                target = target->next;
@@ -2031,8 +2070,8 @@ int handle_gdb_detach_command(struct command_context_s *cmd_ctx, char *cmd, char
                        return ERROR_OK;
                }
        }
-       
-       WARNING("invalid gdb_detach configuration directive: %s", args[0]);
+
+       LOG_WARNING("invalid gdb_detach configuration directive: %s", args[0]);
        return ERROR_OK;
 }
 
@@ -2051,8 +2090,8 @@ int handle_gdb_memory_map_command(struct command_context_s *cmd_ctx, char *cmd,
                        return ERROR_OK;
                }
        }
-       
-       WARNING("invalid gdb_memory_map configuration directive: %s", args[0]);
+
+       LOG_WARNING("invalid gdb_memory_map configuration directive: %s", args[0]);
        return ERROR_OK;
 }
 
@@ -2071,8 +2110,8 @@ int handle_gdb_flash_program_command(struct command_context_s *cmd_ctx, char *cm
                        return ERROR_OK;
                }
        }
-       
-       WARNING("invalid gdb_memory_map configuration directive: %s", args[0]);
+
+       LOG_WARNING("invalid gdb_memory_map configuration directive: %s", args[0]);
        return ERROR_OK;
 }
 
@@ -2091,8 +2130,8 @@ int handle_gdb_report_data_abort_command(struct command_context_s *cmd_ctx, char
                        return ERROR_OK;
                }
        }
-       
-       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;
 }
 

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)