Code Review / openocd.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
rtos: remove broken code for handling the deprecated qP packet
[openocd.git] / src / rtos / rtos.c
diff --git a/src/rtos/rtos.c b/src/rtos/rtos.c
index 129770e80137666044246dfae4faaa5eaeb10b95..8a59fd344ed09668e5e873d2da96378720854cc6 100644 (file)
--- a/src/rtos/rtos.c
+++ b/src/rtos/rtos.c
@@ -29,7 +29,7 @@
 #include "server/gdb_server.h"
 
 
-static long long current_threadid = -1;
+static int64_t current_threadid = -1;
 
 static void hex_to_str( char* dst, char * hex_src );
 static int str_to_hex( char* hex_dst, char* src );
@@ -38,11 +38,13 @@ static int str_to_hex( char* hex_dst, char* src );
 /* RTOSs */
 extern struct rtos_type FreeRTOS_rtos;
 extern struct rtos_type ThreadX_rtos;
+extern struct rtos_type eCos_rtos;
 
 static struct rtos_type *rtos_types[] =
 {
        &ThreadX_rtos,
        &FreeRTOS_rtos,
+       &eCos_rtos,
        NULL
 };
 
@@ -126,93 +128,11 @@ int rtos_create(Jim_GetOptInfo *goi, struct target * target)
 
 
 
-int gdb_thread_packet(struct connection *connection, struct target *target, char *packet, int packet_size)
+int gdb_thread_packet(struct connection *connection, char *packet, int packet_size)
 {
-       if (strstr(packet, "qP"))
-       {
-               #define TAG_THREADID 1          /* Echo the thread identifier */
-               #define TAG_EXISTS 2            /* Is this process defined enough to
-                                                  fetch registers and its stack */
-               #define TAG_DISPLAY 4           /* A short thing maybe to put on a window */
-               #define TAG_THREADNAME 8        /* string, maps 1-to-1 with a thread is */
-               #define TAG_MOREDISPLAY 16      /* Whatever the kernel wants to say about */
-
-                       // TODO: need to scanf the mode variable (or it with the tags), and the threadid
-
-               unsigned long mode;
-               threadid_t threadid = 0;
-               struct thread_detail* detail;
-               sscanf(packet, "qP%8lx%16" SCNx64, &mode, &threadid);
-
+       struct target *target = get_target_from_connection(connection);
 
-               int found = -1;
-
-               if ((target->rtos != NULL) && (target->rtos->thread_details
-                               != NULL)) {
-                       int thread_num;
-                       for (thread_num = 0; thread_num
-                                       < target->rtos->thread_count; thread_num++) {
-                               if (target->rtos->thread_details[thread_num].threadid
-                                               == threadid) {
-                                       if (target->rtos->thread_details[thread_num].exists) {
-                                               found = thread_num;
-                                       }
-                               }
-                       }
-               }
-               if (found == -1) {
-                       gdb_put_packet(connection, "E01", 3); // thread not found
-                       return ERROR_OK;
-               }
-
-               detail = &target->rtos->thread_details[found];
-
-               if ( detail->display_str != NULL )
-               {
-                       mode &= TAG_DISPLAY;
-               }
-               if ( detail->thread_name_str != NULL )
-               {
-                       mode &= TAG_THREADNAME;
-               }
-               if ( detail->extra_info_str != NULL )
-               {
-                       mode &= TAG_MOREDISPLAY;
-               }
-
-
-               mode &= TAG_THREADID | TAG_EXISTS;
-
-               char thread_str[1000];
-
-               sprintf(thread_str, "%08lx", mode);
-               sprintf(thread_str, "%016" PRIx64, threadid);
-
-
-               if (mode & TAG_THREADID) {
-                       sprintf(thread_str, "%08" PRIx32 "10%016" PRIx64, TAG_THREADID, threadid);
-               }
-               if (mode & TAG_EXISTS) {
-                       sprintf(thread_str, "%08" PRIx32 "08%08" PRIx32, TAG_EXISTS, (detail->exists==true)?1:0);
-               }
-               if (mode & TAG_DISPLAY) {
-                       sprintf(thread_str, "%08" PRIx32 "%02x%s", TAG_DISPLAY, (unsigned char)strlen(detail->display_str), detail->display_str );
-               }
-               if (mode & TAG_MOREDISPLAY) {
-                       sprintf(thread_str, "%08" PRIx32 "%02x%s", TAG_MOREDISPLAY, (unsigned char)strlen(detail->extra_info_str), detail->extra_info_str );
-               }
-               if (mode & TAG_THREADNAME) {
-                       sprintf(thread_str, "%08" PRIx32 "%02x%s", TAG_THREADNAME, (unsigned char)strlen(detail->thread_name_str), detail->thread_name_str );
-               }
-
-               //gdb_put_packet(connection, tmpstr, sizeof(tmpstr)-1);
-               gdb_put_packet(connection, thread_str, strlen(thread_str));
-
-               //                      gdb_put_packet(connection, "", 0);
-               //              gdb_put_packet(connection, "OK", 2); // all threads alive
-               return ERROR_OK;
-       }
-       else if (strstr(packet, "qThreadExtraInfo,"))
+       if (strstr(packet, "qThreadExtraInfo,"))
        {
                if ((target->rtos != NULL) && (target->rtos->thread_details != NULL) && (target->rtos->thread_count != 0))
                {
@@ -306,21 +226,20 @@ int gdb_thread_packet(struct connection *connection, struct target *target, char
                        }
                        else
                        {
-                               long long value = 0;
+                               int64_t value = 0;
                                char * hex_name_str = malloc( strlen(packet));
                                char * name_str;
                                int symbol_num;
 
                                char* found = strstr( packet, "qSymbol::" );
-                               int numconv;
                                if (0 == found )
                                {
-                                       numconv =sscanf(packet, "qSymbol:%" SCNx64 ":%s", &value, hex_name_str);
+                                       sscanf(packet, "qSymbol:%" SCNx64 ":%s", &value, hex_name_str);
                                }
                                else
                                {
                                        // No value returned by GDB - symbol was not found
-                                       numconv =sscanf(packet, "qSymbol::%s", hex_name_str);
+                                       sscanf(packet, "qSymbol::%s", hex_name_str);
                                }
                                name_str = (char*) malloc( 1+ strlen(hex_name_str) / 2 );
 
@@ -451,7 +370,17 @@ int gdb_thread_packet(struct connection *connection, struct target *target, char
        }
        else if (strstr(packet, "qC"))
        {
-               gdb_put_packet(connection, "QC0", 3);
+               if( target->rtos!=NULL )
+               {
+                       char buffer[15];
+                       int size;
+                       size = snprintf(buffer, 15, "QC%08X", (int)target->rtos->current_thread);
+                       gdb_put_packet(connection, buffer, size);
+               }
+               else
+               {
+                       gdb_put_packet(connection, "QC0", 3);
+               }
                return ERROR_OK;
        }
        else if ( packet[0] == 'T' ) // Is thread alive?
@@ -477,6 +406,7 @@ int gdb_thread_packet(struct connection *connection, struct target *target, char
                } else {
                        gdb_put_packet(connection, "E01", 3); // thread not found
                }
+               return ERROR_OK;
        }
        else if ( packet[0] == 'H') // Set current thread ( 'c' for step and continue, 'g' for all other operations )
        {
@@ -485,15 +415,18 @@ int gdb_thread_packet(struct connection *connection, struct target *target, char
                        sscanf(packet, "Hg%16" SCNx64, &current_threadid);
                }
                gdb_put_packet(connection, "OK", 2);
+               return ERROR_OK;
        }
 
        return GDB_THREAD_PACKET_NOT_CONSUMED;
 }
 
-int rtos_get_gdb_reg_list(struct connection *connection, struct target *target, struct reg **reg_list[], int *reg_list_size)
+int rtos_get_gdb_reg_list(struct connection *connection, struct reg **reg_list[], int *reg_list_size)
 {
+       struct target *target = get_target_from_connection(connection);
+
        if ( ( target->rtos != NULL ) &&
-                ( current_threadid != 1 ) &&
+                ( current_threadid != -1 ) &&
                 ( current_threadid != 0 ) &&
                 ( current_threadid != target->rtos->current_thread ) )
        {
@@ -512,11 +445,11 @@ int rtos_get_gdb_reg_list(struct connection *connection, struct target *target,
 
 
 
-int rtos_generic_stack_read( struct target * target, const struct rtos_register_stacking* stacking, long long stack_ptr, char ** hex_reg_list )
+int rtos_generic_stack_read( struct target * target, const struct rtos_register_stacking* stacking, int64_t stack_ptr, char ** hex_reg_list )
 {
        int list_size = 0;
        char * tmp_str_ptr;
-       long long new_stack_ptr;
+       int64_t new_stack_ptr;
        int i;
        int retval;
 
@@ -533,7 +466,7 @@ int rtos_generic_stack_read( struct target * target, const struct rtos_register_
        {
                address -=  stacking->stack_registers_size;
        }
-       retval = target_read_buffer( target, stack_ptr, stacking->stack_registers_size, stack_data);
+       retval = target_read_buffer( target, address, stacking->stack_registers_size, stack_data);
        if ( retval != ERROR_OK )
        {
                LOG_OUTPUT("Error reading stack frame from FreeRTOS thread\r\n");
@@ -553,7 +486,7 @@ int rtos_generic_stack_read( struct target * target, const struct rtos_register_
        }
        *hex_reg_list = (char*)malloc( list_size*2 +1 );
        tmp_str_ptr = *hex_reg_list;
-       new_stack_ptr = stack_ptr + stacking->stack_growth_direction * stacking->stack_registers_size;
+       new_stack_ptr = stack_ptr - stacking->stack_growth_direction * stacking->stack_registers_size;
        for( i = 0; i < stacking->num_output_registers; i++ )
        {
                int j;
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)