Code Review / openocd.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
rtos: declare local symbols as static
[openocd.git] / src / rtos / ThreadX.c
diff --git a/src/rtos/ThreadX.c b/src/rtos/ThreadX.c
index 8267b9f6adfd5cf41ec848886de2e789a17f6ee5..7d58725c4f57eb6cae1153ec4849bafe7a61563a 100644 (file)
--- a/src/rtos/ThreadX.c
+++ b/src/rtos/ThreadX.c
@@ -35,10 +35,10 @@ static const struct rtos_register_stacking *get_stacking_info_arm926ejs(const st
 static int is_thread_id_valid(const struct rtos *rtos, int64_t thread_id);
 static int is_thread_id_valid_arm926ejs(const struct rtos *rtos, int64_t thread_id);
 
-static int ThreadX_detect_rtos(struct target *target);
+static bool ThreadX_detect_rtos(struct target *target);
 static int ThreadX_create(struct target *target);
 static int ThreadX_update_threads(struct rtos *rtos);
-static int ThreadX_get_thread_reg_list(struct rtos *rtos, int64_t thread_id, char **hex_reg_list);
+static int ThreadX_get_thread_reg_list(struct rtos *rtos, int64_t thread_id, struct rtos_reg **reg_list, int *num_regs);
 static int ThreadX_get_symbol_list_to_lookup(symbol_table_elem_t *symbol_list[]);
 
 
@@ -69,48 +69,48 @@ static const struct ThreadX_thread_state ThreadX_thread_states[] = {
 
 #define ARM926EJS_REGISTERS_SIZE_SOLICITED (11 * 4)
 static const struct stack_register_offset rtos_threadx_arm926ejs_stack_offsets_solicited[] = {
-       { -1,   32 },           /* r0        */
-       { -1,   32 },           /* r1        */
-       { -1,   32 },           /* r2        */
-       { -1,   32 },           /* r3        */
-       { 0x08, 32 },           /* r4        */
-       { 0x0C, 32 },           /* r5        */
-       { 0x10, 32 },           /* r6        */
-       { 0x14, 32 },           /* r7        */
-       { 0x18, 32 },           /* r8        */
-       { 0x1C, 32 },           /* r9        */
-       { 0x20, 32 },           /* r10       */
-       { 0x24, 32 },           /* r11       */
-       { -1,   32 },           /* r12       */
-       { -2,   32 },           /* sp (r13)  */
-       { 0x28, 32 },           /* lr (r14)  */
-       { -1,   32 },           /* pc (r15)  */
-       /*{ -1,   32 },*/               /* lr (r14)  */
-       /*{ 0x28, 32 },*/               /* pc (r15)  */
-       { 0x04, 32 },           /* xPSR      */
+       { 0,  -1,   32 },               /* r0        */
+       { 1,  -1,   32 },               /* r1        */
+       { 2,  -1,   32 },               /* r2        */
+       { 3,  -1,   32 },               /* r3        */
+       { 4,  0x08, 32 },               /* r4        */
+       { 5,  0x0C, 32 },               /* r5        */
+       { 6,  0x10, 32 },               /* r6        */
+       { 7,  0x14, 32 },               /* r7        */
+       { 8,  0x18, 32 },               /* r8        */
+       { 9,  0x1C, 32 },               /* r9        */
+       { 10, 0x20, 32 },               /* r10       */
+       { 11, 0x24, 32 },               /* r11       */
+       { 12, -1,   32 },               /* r12       */
+       { 13, -2,   32 },               /* sp (r13)  */
+       { 14, 0x28, 32 },               /* lr (r14)  */
+       { 15, -1,   32 },               /* pc (r15)  */
+       /*{ 16, -1,   32 },*/           /* lr (r14)  */
+       /*{ 17, 0x28, 32 },*/           /* pc (r15)  */
+       { 16, 0x04, 32 },               /* xPSR      */
 };
 #define ARM926EJS_REGISTERS_SIZE_INTERRUPT (17 * 4)
 static const struct stack_register_offset rtos_threadx_arm926ejs_stack_offsets_interrupt[] = {
-       { 0x08, 32 },           /* r0        */
-       { 0x0C, 32 },           /* r1        */
-       { 0x10, 32 },           /* r2        */
-       { 0x14, 32 },           /* r3        */
-       { 0x18, 32 },           /* r4        */
-       { 0x1C, 32 },           /* r5        */
-       { 0x20, 32 },           /* r6        */
-       { 0x24, 32 },           /* r7        */
-       { 0x28, 32 },           /* r8        */
-       { 0x2C, 32 },           /* r9        */
-       { 0x30, 32 },           /* r10       */
-       { 0x34, 32 },           /* r11       */
-       { 0x38, 32 },           /* r12       */
-       { -2,   32 },           /* sp (r13)  */
-       { 0x3C, 32 },           /* lr (r14)  */
-       { 0x40, 32 },           /* pc (r15)  */
-       { 0x04, 32 },           /* xPSR      */
+       { 0,  0x08, 32 },               /* r0        */
+       { 1,  0x0C, 32 },               /* r1        */
+       { 2,  0x10, 32 },               /* r2        */
+       { 3,  0x14, 32 },               /* r3        */
+       { 4,  0x18, 32 },               /* r4        */
+       { 5,  0x1C, 32 },               /* r5        */
+       { 6,  0x20, 32 },               /* r6        */
+       { 7,  0x24, 32 },               /* r7        */
+       { 8,  0x28, 32 },               /* r8        */
+       { 9,  0x2C, 32 },               /* r9        */
+       { 10, 0x30, 32 },               /* r10       */
+       { 11, 0x34, 32 },               /* r11       */
+       { 12, 0x38, 32 },               /* r12       */
+       { 13, -2,   32 },               /* sp (r13)  */
+       { 14, 0x3C, 32 },               /* lr (r14)  */
+       { 15, 0x40, 32 },               /* pc (r15)  */
+       { 16, 0x04, 32 },               /* xPSR      */
 };
 
-const struct rtos_register_stacking rtos_threadx_arm926ejs_stacking[] = {
+static const struct rtos_register_stacking rtos_threadx_arm926ejs_stacking[] = {
 {
        ARM926EJS_REGISTERS_SIZE_SOLICITED,     /* stack_registers_size */
        -1,                                                                     /* stack_growth_direction */
@@ -248,7 +248,7 @@ static const struct rtos_register_stacking *get_stacking_info_arm926ejs(const st
                LOG_DEBUG("  solicited stack");
                return param->stacking_info + 0;
        } else {
-               LOG_DEBUG("  interrupt stack: %u", flag);
+               LOG_DEBUG("  interrupt stack: %" PRIu32, flag);
                return param->stacking_info + 1;
        }
 }
@@ -408,8 +408,8 @@ static int ThreadX_update_threads(struct rtos *rtos)
                        state_desc = "Unknown state";
 
                rtos->thread_details[tasks_found].extra_info_str = malloc(strlen(
-                                       state_desc)+1);
-               strcpy(rtos->thread_details[tasks_found].extra_info_str, state_desc);
+                                       state_desc)+8);
+               sprintf(rtos->thread_details[tasks_found].extra_info_str, "State: %s", state_desc);
 
                rtos->thread_details[tasks_found].exists = true;
 
@@ -433,13 +433,12 @@ static int ThreadX_update_threads(struct rtos *rtos)
        return 0;
 }
 
-static int ThreadX_get_thread_reg_list(struct rtos *rtos, int64_t thread_id, char **hex_reg_list)
+static int ThreadX_get_thread_reg_list(struct rtos *rtos, int64_t thread_id,
+               struct rtos_reg **reg_list, int *num_regs)
 {
        int retval;
        const struct ThreadX_params *param;
 
-       *hex_reg_list = NULL;
-
        if (rtos == NULL)
                return -1;
 
@@ -477,7 +476,7 @@ static int ThreadX_get_thread_reg_list(struct rtos *rtos, int64_t thread_id, cha
                return -6;
        }
 
-       return rtos_generic_stack_read(rtos->target, stacking_info, stack_ptr, hex_reg_list);
+       return rtos_generic_stack_read(rtos->target, stacking_info, stack_ptr, reg_list, num_regs);
 }
 
 static int ThreadX_get_symbol_list_to_lookup(symbol_table_elem_t *symbol_list[])
@@ -492,14 +491,14 @@ static int ThreadX_get_symbol_list_to_lookup(symbol_table_elem_t *symbol_list[])
        return 0;
 }
 
-static int ThreadX_detect_rtos(struct target *target)
+static bool ThreadX_detect_rtos(struct target *target)
 {
        if ((target->rtos->symbols != NULL) &&
                        (target->rtos->symbols[ThreadX_VAL_tx_thread_created_ptr].address != 0)) {
                /* looks like ThreadX */
-               return 1;
+               return true;
        }
-       return 0;
+       return false;
 }
 
 #if 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)