X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Frtos%2FThreadX.c;h=9605533aa448d79ddbb415f6a4d7cf5f3085b3e5;hb=010b09121ca08f955921654c6a3d405be80afef1;hp=714c6fef5df8ca98ccca9afcf35e48f1bffe3352;hpb=26902bb317d1a5e7a7367e486b03580133ef3dd6;p=openocd.git diff --git a/src/rtos/ThreadX.c b/src/rtos/ThreadX.c index 714c6fef5d..9605533aa4 100644 --- a/src/rtos/ThreadX.c +++ b/src/rtos/ThreadX.c @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #ifdef HAVE_CONFIG_H @@ -31,18 +29,26 @@ #include "helper/types.h" #include "rtos_standard_stackings.h" -static int ThreadX_detect_rtos(struct target *target); +static const struct rtos_register_stacking *get_stacking_info(const struct rtos *rtos, int64_t stack_ptr); +static const struct rtos_register_stacking *get_stacking_info_arm926ejs(const struct rtos *rtos, int64_t stack_ptr); + +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 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[]); + + struct ThreadX_thread_state { int value; - char *desc; + const char *desc; }; -struct ThreadX_thread_state ThreadX_thread_states[] = { +static const struct ThreadX_thread_state ThreadX_thread_states[] = { { 0, "Ready" }, { 1, "Completed" }, { 2, "Terminated" }, @@ -61,25 +67,91 @@ struct ThreadX_thread_state ThreadX_thread_states[] = { #define THREADX_NUM_STATES (sizeof(ThreadX_thread_states)/sizeof(struct ThreadX_thread_state)) +#define ARM926EJS_REGISTERS_SIZE_SOLICITED (11 * 4) +static const struct stack_register_offset rtos_threadx_arm926ejs_stack_offsets_solicited[] = { + { 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[] = { + { 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[] = { +{ + ARM926EJS_REGISTERS_SIZE_SOLICITED, /* stack_registers_size */ + -1, /* stack_growth_direction */ + 17, /* num_output_registers */ + NULL, /* stack_alignment */ + rtos_threadx_arm926ejs_stack_offsets_solicited /* register_offsets */ +}, +{ + ARM926EJS_REGISTERS_SIZE_INTERRUPT, /* stack_registers_size */ + -1, /* stack_growth_direction */ + 17, /* num_output_registers */ + NULL, /* stack_alignment */ + rtos_threadx_arm926ejs_stack_offsets_interrupt /* register_offsets */ +}, +}; + struct ThreadX_params { - char *target_name; + const char *target_name; unsigned char pointer_width; unsigned char thread_stack_offset; unsigned char thread_name_offset; unsigned char thread_state_offset; unsigned char thread_next_offset; const struct rtos_register_stacking *stacking_info; + size_t stacking_info_nb; + const struct rtos_register_stacking* (*fn_get_stacking_info)(const struct rtos *rtos, int64_t stack_ptr); + int (*fn_is_thread_id_valid)(const struct rtos *rtos, int64_t thread_id); }; -const struct ThreadX_params ThreadX_params_list[] = { +static const struct ThreadX_params ThreadX_params_list[] = { { - "cortex_m3", /* target_name */ + "cortex_m", /* target_name */ 4, /* pointer_width; */ 8, /* thread_stack_offset; */ 40, /* thread_name_offset; */ 48, /* thread_state_offset; */ 136, /* thread_next_offset */ &rtos_standard_Cortex_M3_stacking, /* stacking_info */ + 1, /* stacking_info_nb */ + NULL, /* fn_get_stacking_info */ + NULL, /* fn_is_thread_id_valid */ }, { "cortex_r4", /* target_name */ @@ -89,6 +161,21 @@ const struct ThreadX_params ThreadX_params_list[] = { 48, /* thread_state_offset; */ 136, /* thread_next_offset */ &rtos_standard_Cortex_R4_stacking, /* stacking_info */ + 1, /* stacking_info_nb */ + NULL, /* fn_get_stacking_info */ + NULL, /* fn_is_thread_id_valid */ + }, + { + "arm926ejs", /* target_name */ + 4, /* pointer_width; */ + 8, /* thread_stack_offset; */ + 40, /* thread_name_offset; */ + 48, /* thread_state_offset; */ + 136, /* thread_next_offset */ + rtos_threadx_arm926ejs_stacking, /* stacking_info */ + 2, /* stacking_info_nb */ + get_stacking_info_arm926ejs, /* fn_get_stacking_info */ + is_thread_id_valid_arm926ejs, /* fn_is_thread_id_valid */ }, }; @@ -100,7 +187,7 @@ enum ThreadX_symbol_values { ThreadX_VAL_tx_thread_created_count = 2, }; -static char *ThreadX_symbol_list[] = { +static const char * const ThreadX_symbol_list[] = { "_tx_thread_current_ptr", "_tx_thread_created_ptr", "_tx_thread_created_count", @@ -115,9 +202,62 @@ const struct rtos_type ThreadX_rtos = { .update_threads = ThreadX_update_threads, .get_thread_reg_list = ThreadX_get_thread_reg_list, .get_symbol_list_to_lookup = ThreadX_get_symbol_list_to_lookup, - }; +static const struct rtos_register_stacking *get_stacking_info(const struct rtos *rtos, int64_t stack_ptr) +{ + const struct ThreadX_params *param = (const struct ThreadX_params *) rtos->rtos_specific_params; + + if (param->fn_get_stacking_info != NULL) + return param->fn_get_stacking_info(rtos, stack_ptr); + + return param->stacking_info + 0; +} + +static int is_thread_id_valid(const struct rtos *rtos, int64_t thread_id) +{ + const struct ThreadX_params *param; + + if (rtos->rtos_specific_params == NULL) + return 0; /* invalid */ + + param = (const struct ThreadX_params *) rtos->rtos_specific_params; + + if (param->fn_is_thread_id_valid != NULL) + return param->fn_is_thread_id_valid(rtos, thread_id); + + return (thread_id != 0); +} + +static const struct rtos_register_stacking *get_stacking_info_arm926ejs(const struct rtos *rtos, int64_t stack_ptr) +{ + const struct ThreadX_params *param = (const struct ThreadX_params *) rtos->rtos_specific_params; + int retval; + uint32_t flag; + + retval = target_read_buffer(rtos->target, + stack_ptr, + sizeof(flag), + (uint8_t *)&flag); + if (retval != ERROR_OK) { + LOG_ERROR("Error reading stack data from ThreadX thread: stack_ptr=0x%" PRIx64, stack_ptr); + return NULL; + } + + if (flag == 0) { + LOG_DEBUG(" solicited stack"); + return param->stacking_info + 0; + } else { + LOG_DEBUG(" interrupt stack: %u", flag); + return param->stacking_info + 1; + } +} + +static int is_thread_id_valid_arm926ejs(const struct rtos *rtos, int64_t thread_id) +{ + return (thread_id != 0 && thread_id != 1); +} + static int ThreadX_update_threads(struct rtos *rtos) { int retval; @@ -134,12 +274,12 @@ static int ThreadX_update_threads(struct rtos *rtos) param = (const struct ThreadX_params *) rtos->rtos_specific_params; if (rtos->symbols == NULL) { - LOG_OUTPUT("No symbols for ThreadX\r\n"); + LOG_ERROR("No symbols for ThreadX"); return -4; } if (rtos->symbols[ThreadX_VAL_tx_thread_created_count].address == 0) { - LOG_OUTPUT("Don't have the number of threads in ThreadX \r\n"); + LOG_ERROR("Don't have the number of threads in ThreadX"); return -2; } @@ -150,30 +290,12 @@ static int ThreadX_update_threads(struct rtos *rtos) (uint8_t *)&thread_list_size); if (retval != ERROR_OK) { - LOG_OUTPUT("Could not read ThreadX thread count from target\r\n"); + LOG_ERROR("Could not read ThreadX thread count from target"); return retval; } /* wipe out previous thread details if any */ - if (rtos->thread_details != NULL) { - int j; - for (j = 0; j < rtos->thread_count; j++) { - if (rtos->thread_details[j].display_str != NULL) { - free(rtos->thread_details[j].display_str); - rtos->thread_details[j].display_str = NULL; - } - if (rtos->thread_details[j].thread_name_str != NULL) { - free(rtos->thread_details[j].thread_name_str); - rtos->thread_details[j].thread_name_str = NULL; - } - if (rtos->thread_details[j].extra_info_str != NULL) { - free(rtos->thread_details[j].extra_info_str); - rtos->thread_details[j].extra_info_str = NULL; - } - } - free(rtos->thread_details); - rtos->thread_details = NULL; - } + rtos_free_threadlist(rtos); /* read the current thread id */ retval = target_read_buffer(rtos->target, @@ -182,7 +304,7 @@ static int ThreadX_update_threads(struct rtos *rtos) (uint8_t *)&rtos->current_thread); if (retval != ERROR_OK) { - LOG_OUTPUT("Could not read ThreadX current thread from target\r\n"); + LOG_ERROR("Could not read ThreadX current thread from target"); return retval; } @@ -193,13 +315,12 @@ static int ThreadX_update_threads(struct rtos *rtos) char tmp_str[] = "Current Execution"; thread_list_size++; tasks_found++; - rtos->thread_details = (struct thread_detail *) malloc( + rtos->thread_details = malloc( sizeof(struct thread_detail) * thread_list_size); rtos->thread_details->threadid = 1; rtos->thread_details->exists = true; - rtos->thread_details->display_str = NULL; rtos->thread_details->extra_info_str = NULL; - rtos->thread_details->thread_name_str = (char *) malloc(sizeof(tmp_str)); + rtos->thread_details->thread_name_str = malloc(sizeof(tmp_str)); strcpy(rtos->thread_details->thread_name_str, tmp_str); if (thread_list_size == 0) { @@ -208,7 +329,7 @@ static int ThreadX_update_threads(struct rtos *rtos) } } else { /* create space for new thread details */ - rtos->thread_details = (struct thread_detail *) malloc( + rtos->thread_details = malloc( sizeof(struct thread_detail) * thread_list_size); } @@ -219,7 +340,7 @@ static int ThreadX_update_threads(struct rtos *rtos) param->pointer_width, (uint8_t *)&thread_ptr); if (retval != ERROR_OK) { - LOG_OUTPUT("Could not read ThreadX thread location from target\r\n"); + LOG_ERROR("Could not read ThreadX thread location from target"); return retval; } @@ -241,7 +362,7 @@ static int ThreadX_update_threads(struct rtos *rtos) param->pointer_width, (uint8_t *)&name_ptr); if (retval != ERROR_OK) { - LOG_OUTPUT("Could not read ThreadX thread name pointer from target\r\n"); + LOG_ERROR("Could not read ThreadX thread name pointer from target"); return retval; } @@ -252,7 +373,7 @@ static int ThreadX_update_threads(struct rtos *rtos) THREADX_THREAD_NAME_STR_SIZE, (uint8_t *)&tmp_str); if (retval != ERROR_OK) { - LOG_OUTPUT("Error reading thread name from ThreadX target\r\n"); + LOG_ERROR("Error reading thread name from ThreadX target"); return retval; } tmp_str[THREADX_THREAD_NAME_STR_SIZE-1] = '\x00'; @@ -261,7 +382,7 @@ static int ThreadX_update_threads(struct rtos *rtos) strcpy(tmp_str, "No Name"); rtos->thread_details[tasks_found].thread_name_str = - (char *)malloc(strlen(tmp_str)+1); + malloc(strlen(tmp_str)+1); strcpy(rtos->thread_details[tasks_found].thread_name_str, tmp_str); /* Read the thread status */ @@ -271,7 +392,7 @@ static int ThreadX_update_threads(struct rtos *rtos) 4, (uint8_t *)&thread_status); if (retval != ERROR_OK) { - LOG_OUTPUT("Error reading thread state from ThreadX target\r\n"); + LOG_ERROR("Error reading thread state from ThreadX target"); return retval; } @@ -280,20 +401,18 @@ static int ThreadX_update_threads(struct rtos *rtos) /* empty */ } - char *state_desc; + const char *state_desc; if (i < THREADX_NUM_STATES) state_desc = ThreadX_thread_states[i].desc; else state_desc = "Unknown state"; - rtos->thread_details[tasks_found].extra_info_str = (char *)malloc(strlen( - state_desc)+1); - strcpy(rtos->thread_details[tasks_found].extra_info_str, state_desc); + rtos->thread_details[tasks_found].extra_info_str = malloc(strlen( + state_desc)+8); + sprintf(rtos->thread_details[tasks_found].extra_info_str, "State: %s", state_desc); rtos->thread_details[tasks_found].exists = true; - rtos->thread_details[tasks_found].display_str = NULL; - tasks_found++; prev_thread_ptr = thread_ptr; @@ -304,7 +423,7 @@ static int ThreadX_update_threads(struct rtos *rtos) param->pointer_width, (uint8_t *) &thread_ptr); if (retval != ERROR_OK) { - LOG_OUTPUT("Error reading next thread pointer in ThreadX thread list\r\n"); + LOG_ERROR("Error reading next thread pointer in ThreadX thread list"); return retval; } } @@ -314,17 +433,16 @@ 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; - if (thread_id == 0) + if (!is_thread_id_valid(rtos, thread_id)) return -2; if (rtos->rtos_specific_params == NULL) @@ -339,18 +457,33 @@ static int ThreadX_get_thread_reg_list(struct rtos *rtos, int64_t thread_id, cha param->pointer_width, (uint8_t *)&stack_ptr); if (retval != ERROR_OK) { - LOG_OUTPUT("Error reading stack frame from ThreadX thread\r\n"); + LOG_ERROR("Error reading stack frame from ThreadX thread"); return retval; } - return rtos_generic_stack_read(rtos->target, param->stacking_info, stack_ptr, hex_reg_list); + LOG_INFO("thread: 0x%" PRIx64 ", stack_ptr=0x%" PRIx64, (uint64_t)thread_id, (uint64_t)stack_ptr); + + if (stack_ptr == 0) { + LOG_ERROR("null stack pointer in thread"); + return -5; + } + + const struct rtos_register_stacking *stacking_info = + get_stacking_info(rtos, stack_ptr); + + if (stacking_info == NULL) { + LOG_ERROR("Unknown stacking info for thread id=0x%" PRIx64, (uint64_t)thread_id); + return -6; + } + + 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[]) { unsigned int i; - *symbol_list = (symbol_table_elem_t *) malloc( - sizeof(symbol_table_elem_t) * ARRAY_SIZE(ThreadX_symbol_list)); + *symbol_list = calloc( + ARRAY_SIZE(ThreadX_symbol_list), sizeof(symbol_table_elem_t)); for (i = 0; i < ARRAY_SIZE(ThreadX_symbol_list); i++) (*symbol_list)[i].symbol_name = ThreadX_symbol_list[i]; @@ -358,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 @@ -399,7 +532,7 @@ static int ThreadX_get_thread_detail(struct rtos *rtos, param = (const struct ThreadX_params *) rtos->rtos_specific_params; if (rtos->symbols == NULL) { - LOG_OUTPUT("No symbols for ThreadX\r\n"); + LOG_ERROR("No symbols for ThreadX"); return -3; } @@ -412,7 +545,7 @@ static int ThreadX_get_thread_detail(struct rtos *rtos, param->pointer_width, (uint8_t *)&name_ptr); if (retval != ERROR_OK) { - LOG_OUTPUT("Could not read ThreadX thread name pointer from target\r\n"); + LOG_ERROR("Could not read ThreadX thread name pointer from target"); return retval; } @@ -422,7 +555,7 @@ static int ThreadX_get_thread_detail(struct rtos *rtos, THREADX_THREAD_NAME_STR_SIZE, (uint8_t *)&tmp_str); if (retval != ERROR_OK) { - LOG_OUTPUT("Error reading thread name from ThreadX target\r\n"); + LOG_ERROR("Error reading thread name from ThreadX target"); return retval; } tmp_str[THREADX_THREAD_NAME_STR_SIZE-1] = '\x00'; @@ -430,7 +563,7 @@ static int ThreadX_get_thread_detail(struct rtos *rtos, if (tmp_str[0] == '\x00') strcpy(tmp_str, "No Name"); - detail->thread_name_str = (char *)malloc(strlen(tmp_str)+1); + detail->thread_name_str = malloc(strlen(tmp_str)+1); /* Read the thread status */ int64_t thread_status = 0; @@ -440,7 +573,7 @@ static int ThreadX_get_thread_detail(struct rtos *rtos, 4, (uint8_t *)&thread_status); if (retval != ERROR_OK) { - LOG_OUTPUT("Error reading thread state from ThreadX target\r\n"); + LOG_ERROR("Error reading thread state from ThreadX target"); return retval; } @@ -455,12 +588,10 @@ static int ThreadX_get_thread_detail(struct rtos *rtos, else state_desc = "Unknown state"; - detail->extra_info_str = (char *)malloc(strlen(state_desc)+1); + detail->extra_info_str = malloc(strlen(state_desc)+1); detail->exists = true; - detail->display_str = NULL; - return 0; } @@ -474,7 +605,7 @@ static int ThreadX_create(struct target *target) i++; } if (i >= THREADX_NUM_PARAMS) { - LOG_OUTPUT("Could not find target in ThreadX compatibility list\r\n"); + LOG_ERROR("Could not find target in ThreadX compatibility list"); return -1; }