Code Review / openocd.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Remove whitespace that occurs after '('.
[openocd.git] / src / server / gdb_server.c
diff --git a/src/server/gdb_server.c b/src/server/gdb_server.c
index 4cf187576758639d0a3ab7a975dc7f2715867019..9b22ce274ef4002c3cdfba762512e93d8e50d74a 100644 (file)
--- a/src/server/gdb_server.c
+++ b/src/server/gdb_server.c
@@ -109,7 +109,7 @@ int check_pending(connection_t *connection, int timeout_s, int *got_data)
                got_data=&t;
        *got_data = 0;
 
-       if (gdb_con->buf_cnt>0)
+       if (gdb_con->buf_cnt > 0)
        {
                *got_data = 1;
                return ERROR_OK;
@@ -125,7 +125,7 @@ int check_pending(connection_t *connection, int timeout_s, int *got_data)
                /* This can typically be because a "monitor" command took too long
                 * before printing any progress messages
                 */
-               if (timeout_s>0)
+               if (timeout_s > 0)
                {
                        return ERROR_GDB_TIMEOUT;
                } else
@@ -319,9 +319,9 @@ int gdb_put_packet_inner(connection_t *connection, char *buffer, int len)
                        break;
                if ((retval = gdb_get_char(connection, &reply)) != ERROR_OK)
                        return retval;
-               if ( reply == '$' ){
+               if (reply == '$' ){
                        /* fix a problem with some IAR tools */
-                       gdb_putback_char( connection, reply );
+                       gdb_putback_char(connection, reply );
                        LOG_DEBUG("Unexpected start of new packet");
                        break;
                }
@@ -345,7 +345,7 @@ int gdb_put_packet_inner(connection_t *connection, char *buffer, int len)
                if ((size_t)len + 4 <= sizeof(local_buffer))
                {
                        /* performance gain on smaller packets by only a single call to gdb_write() */
-                       memcpy(local_buffer+1, buffer, len++);
+                       memcpy(local_buffer + 1, buffer, len++);
                        local_buffer[len++] = '#';
                        local_buffer[len++] = DIGITS[(my_checksum >> 4) & 0xf];
                        local_buffer[len++] = DIGITS[my_checksum & 0xf];
@@ -369,7 +369,7 @@ int gdb_put_packet_inner(connection_t *connection, char *buffer, int len)
                        {
                                return retval;
                        }
-                       if ((retval = gdb_write(connection, local_buffer+1, 3)) != ERROR_OK)
+                       if ((retval = gdb_write(connection, local_buffer + 1, 3)) != ERROR_OK)
                        {
                                return retval;
                        }
@@ -402,9 +402,9 @@ int gdb_put_packet_inner(connection_t *connection, char *buffer, int len)
                                log_remove_callback(gdb_log_callback, connection);
                                LOG_WARNING("negative reply, retrying");
                        }
-                       else if ( reply == '$' ){
+                       else if (reply == '$' ){
                                LOG_ERROR("GDB missing ack(1) - assumed good");
-                               gdb_putback_char( connection, reply );
+                               gdb_putback_char(connection, reply );
                                return ERROR_OK;
                        } else {
 
@@ -413,9 +413,9 @@ int gdb_put_packet_inner(connection_t *connection, char *buffer, int len)
                                return ERROR_SERVER_REMOTE_CLOSED;
                        }
                }
-               else if ( reply == '$' ){
+               else if (reply == '$' ){
                        LOG_ERROR("GDB missing ack(2) - assumed good");
-                       gdb_putback_char( connection, reply );
+                       gdb_putback_char(connection, reply );
                        return ERROR_OK;
                }
                else
@@ -461,7 +461,7 @@ static __inline__ int fetch_packet(connection_t *connection, int *checksum_ok, i
                 * We need to leave at least 2 bytes in the buffer to have
                 * gdb_get_char() update various bits and bobs correctly.
                 */
-               if ((gdb_con->buf_cnt > 2) && ((gdb_con->buf_cnt+count) < *len))
+               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
@@ -649,9 +649,9 @@ int gdb_output_con(connection_t *connection, const char* line)
                return ERROR_GDB_BUFFER_TOO_SMALL;
 
        hex_buffer[0] = 'O';
-       for (i = 0; i<bin_size; i++)
+       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 + 1] = 0;
 
        int retval = gdb_put_packet(connection, hex_buffer, bin_size*2 + 1);
 
@@ -709,7 +709,7 @@ int gdb_target_callback_event_handler(struct target_s *target, enum target_event
        int retval;
        connection_t *connection = priv;
 
-       target_handle_event( target, event );
+       target_handle_event(target, event );
        switch (event)
        {
                case TARGET_EVENT_EARLY_HALTED:
@@ -719,7 +719,7 @@ int gdb_target_callback_event_handler(struct target_s *target, enum target_event
                        target_call_event_callbacks(target, TARGET_EVENT_GDB_END);
                        break;
                case TARGET_EVENT_GDB_FLASH_ERASE_START:
-                       target_handle_event( target, TARGET_EVENT_OLD_gdb_program_config );
+                       target_handle_event(target, TARGET_EVENT_OLD_gdb_program_config );
                        if ((retval = jtag_execute_queue()) != ERROR_OK)
                        {
                                return retval;
@@ -894,7 +894,7 @@ void gdb_str_to_target(target_t *target, char *tstr, reg_t *reg)
        {
                int j = gdb_reg_pos(target, i, buf_len);
                tstr[i*2]   = DIGITS[(buf[j]>>4) & 0xf];
-               tstr[i*2+1] = DIGITS[buf[j]&0xf];
+               tstr[i*2 + 1] = DIGITS[buf[j]&0xf];
        }
 }
 
@@ -926,7 +926,7 @@ void gdb_target_to_reg(target_t *target, char *tstr, int str_len, uint8_t *bin)
        for (i = 0; i < str_len; i += 2)
        {
                uint8_t t = hextoint(tstr[i]) << 4;
-               t |= hextoint(tstr[i+1]);
+               t |= hextoint(tstr[i + 1]);
 
                int j = gdb_reg_pos(target, i/2, str_len/2);
                bin[j] = t;
@@ -1182,7 +1182,7 @@ int gdb_read_memory_packet(connection_t *connection, target_t *target, char *pac
                return ERROR_SERVER_REMOTE_CLOSED;
        }
 
-       len = strtoul(separator+1, NULL, 16);
+       len = strtoul(separator + 1, NULL, 16);
 
        buffer = malloc(len);
 
@@ -1256,7 +1256,7 @@ int gdb_write_memory_packet(connection_t *connection, target_t *target, char *pa
                return ERROR_SERVER_REMOTE_CLOSED;
        }
 
-       len = strtoul(separator+1, &separator, 16);
+       len = strtoul(separator + 1, &separator, 16);
 
        if (*(separator++) != ':')
        {
@@ -1268,7 +1268,7 @@ int gdb_write_memory_packet(connection_t *connection, target_t *target, char *pa
 
        LOG_DEBUG("addr: 0x%8.8" PRIx32 ", len: 0x%8.8" PRIx32 "", addr, len);
 
-       for (i = 0; i<len; i++)
+       for (i = 0; i < len; i++)
        {
                uint32_t tmp;
                sscanf(separator + 2*i, "%2" SCNx32 , &tmp);
@@ -1310,7 +1310,7 @@ int gdb_write_memory_binary_packet(connection_t *connection, target_t *target, c
                return ERROR_SERVER_REMOTE_CLOSED;
        }
 
-       len = strtoul(separator+1, &separator, 16);
+       len = strtoul(separator + 1, &separator, 16);
 
        if (*(separator++) != ':')
        {
@@ -1360,7 +1360,7 @@ int gdb_step_continue_packet(connection_t *connection, target_t *target, char *p
        if (packet[0] == 'c')
        {
                LOG_DEBUG("continue");
-               target_handle_event( target, TARGET_EVENT_OLD_pre_resume );
+               target_handle_event(target, TARGET_EVENT_OLD_pre_resume );
                retval = target_resume(target, current, address, 0, 0); /* resume at current address, don't handle breakpoints, not debugging */
        }
        else if (packet[0] == 's')
@@ -1408,7 +1408,7 @@ int gdb_breakpoint_watchpoint_packet(connection_t *connection, target_t *target,
                return ERROR_SERVER_REMOTE_CLOSED;
        }
 
-       address = strtoul(separator+1, &separator, 16);
+       address = strtoul(separator + 1, &separator, 16);
 
        if (*separator != ',')
        {
@@ -1416,7 +1416,7 @@ int gdb_breakpoint_watchpoint_packet(connection_t *connection, target_t *target,
                return ERROR_SERVER_REMOTE_CLOSED;
        }
 
-       size = strtoul(separator+1, &separator, 16);
+       size = strtoul(separator + 1, &separator, 16);
 
        switch (type)
        {
@@ -1533,7 +1533,7 @@ static int decode_xfer_read(char *buf, char **annex, int *ofs, unsigned int *len
        if (*separator != ',')
                return -1;
 
-       *len = strtoul(separator+1, NULL, 16);
+       *len = strtoul(separator + 1, NULL, 16);
 
        return 0;
 }
@@ -1563,7 +1563,7 @@ static int compare_bank (const void * a, const void * b)
        if (b1->base == b2->base)
        {
                return 0;
-       } else if (b1->base>b2->base)
+       } else if (b1->base > b2->base)
        {
                return 1;
        } else
@@ -1654,7 +1654,7 @@ int gdb_query_packet(connection_t *connection, target_t *target, char *packet, i
 
                xml_printf(&retval, &buffer, &pos, &size,
                                "PacketSize=%x;qXfer:memory-map:read%c;qXfer:features:read-;QStartNoAckMode+",
-                               (GDB_BUFFER_SIZE - 1), ((gdb_use_memory_map == 1) && (flash_get_bank_count()>0)) ? '+' : '-');
+                               (GDB_BUFFER_SIZE - 1), ((gdb_use_memory_map == 1) && (flash_get_bank_count() > 0)) ? '+' : '-');
 
                if (retval != ERROR_OK)
                {
@@ -1667,7 +1667,7 @@ int gdb_query_packet(connection_t *connection, target_t *target, char *packet, i
 
                return ERROR_OK;
        }
-       else if (strstr(packet, "qXfer:memory-map:read::") && (flash_get_bank_count()>0))
+       else if (strstr(packet, "qXfer:memory-map:read::") && (flash_get_bank_count() > 0))
        {
                /* 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
@@ -1702,7 +1702,7 @@ int gdb_query_packet(connection_t *connection, target_t *target, char *packet, i
                flash_bank_t **banks = malloc(sizeof(flash_bank_t *)*flash_get_bank_count());
                int i;
 
-               for (i = 0; i<flash_get_bank_count(); i++)
+               for (i = 0; i < flash_get_bank_count(); i++)
                {
                        p = get_flash_bank_by_num(i);
                        if (p == NULL)
@@ -1718,11 +1718,11 @@ int gdb_query_packet(connection_t *connection, target_t *target, char *packet, i
                qsort(banks, flash_get_bank_count(), sizeof(flash_bank_t *), compare_bank);
 
                uint32_t ram_start = 0;
-               for (i = 0; i<flash_get_bank_count(); i++)
+               for (i = 0; i < flash_get_bank_count(); i++)
                {
                        p = banks[i];
 
-                       if (ram_start<p->base)
+                       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);
@@ -1736,7 +1736,7 @@ int gdb_query_packet(connection_t *connection, target_t *target, char *packet, i
                                "<property name=\"blocksize\">0x%x</property>\n" \
                                "</memory>\n", \
                                p->base, p->size, blocksize);
-                       ram_start = p->base+p->size;
+                       ram_start = p->base + p->size;
                }
                if (ram_start != 0)
                {
@@ -1800,7 +1800,7 @@ int gdb_query_packet(connection_t *connection, target_t *target, char *packet, i
                }
 
                xml_printf(&retval, &xml, &pos, &size, \
-                       "l<target version=\"1.0\">\n<architecture>arm</architecture>\n</target>\n");
+                       "l < target version=\"1.0\">\n < architecture > arm</architecture>\n</target>\n");
 
                if (retval != ERROR_OK)
                {
@@ -1937,7 +1937,7 @@ int gdb_v_packet(connection_t *connection, target_t *target, char *packet, int p
                target_call_event_callbacks(gdb_service->target, TARGET_EVENT_GDB_FLASH_WRITE_START);
                result = flash_write(gdb_service->target, gdb_connection->vflash_image, &written, 0);
                target_call_event_callbacks(gdb_service->target, TARGET_EVENT_GDB_FLASH_WRITE_END);
-               if ( result != ERROR_OK)
+               if (result != ERROR_OK)
                {
                        if (result == ERROR_FLASH_DST_OUT_OF_BANK)
                                gdb_put_packet(connection, "E.memtype", 9);
@@ -1964,10 +1964,10 @@ int gdb_v_packet(connection_t *connection, target_t *target, char *packet, int p
 int gdb_detach(connection_t *connection, target_t *target)
 {
 
-       switch ( detach_mode )
+       switch (detach_mode )
        {
                case GDB_DETACH_RESUME:
-                       target_handle_event( target, TARGET_EVENT_OLD_pre_resume );
+                       target_handle_event(target, TARGET_EVENT_OLD_pre_resume );
                        target_resume(target, 1, 0, 1, 0);
                        break;
 
@@ -2036,12 +2036,12 @@ int gdb_input_inner(connection_t *connection)
                /* terminate with zero */
                packet[packet_size] = 0;
 
-               if ( LOG_LEVEL_IS( LOG_LVL_DEBUG ) ){
-                       if ( packet[0] == 'X' ){
+               if (LOG_LEVEL_IS(LOG_LVL_DEBUG ) ){
+                       if (packet[0] == 'X' ){
                                // binary packets spew junk into the debug log stream
                                char buf[ 50 ];
                                int x;
-                               for ( x = 0 ; (x < 49) && (packet[x] != ':') ; x++ ){
+                               for (x = 0 ; (x < 49) && (packet[x] != ':') ; x++ ){
                                        buf[x] = packet[x];
                                }
                                buf[x] = 0;
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)