X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Frtos%2FThreadX.c;h=fb9f5f7d916affd62774b532805ecb2c4d60bd21;hb=1d7176f50bc7d5971a82977ac2baa79eef521c21;hp=571814cb54439cbb40b8c0d6a1ce3dba4dd7ec9b;hpb=08fc7417333dc8ba4dd4ac15776ed2e9ede504bd;p=openocd.git diff --git a/src/rtos/ThreadX.c b/src/rtos/ThreadX.c index 571814cb54..fb9f5f7d91 100644 --- a/src/rtos/ThreadX.c +++ b/src/rtos/ThreadX.c @@ -15,7 +15,7 @@ * 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. * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * ***************************************************************************/ #ifdef HAVE_CONFIG_H @@ -39,10 +39,10 @@ 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" }, @@ -62,7 +62,7 @@ struct ThreadX_thread_state ThreadX_thread_states[] = { #define THREADX_NUM_STATES (sizeof(ThreadX_thread_states)/sizeof(struct ThreadX_thread_state)) struct ThreadX_params { - char *target_name; + const char *target_name; unsigned char pointer_width; unsigned char thread_stack_offset; unsigned char thread_name_offset; @@ -71,9 +71,9 @@ struct ThreadX_params { const struct rtos_register_stacking *stacking_info; }; -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; */ @@ -100,7 +100,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,7 +115,6 @@ 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 int ThreadX_update_threads(struct rtos *rtos) @@ -155,25 +154,7 @@ static int ThreadX_update_threads(struct rtos *rtos) } /* 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, @@ -193,13 +174,13 @@ 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 +189,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); } @@ -261,7 +242,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 */ @@ -280,13 +261,13 @@ 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( + rtos->thread_details[tasks_found].extra_info_str = malloc(strlen( state_desc)+1); strcpy(rtos->thread_details[tasks_found].extra_info_str, state_desc); @@ -349,8 +330,8 @@ static int ThreadX_get_thread_reg_list(struct rtos *rtos, int64_t thread_id, cha 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]; @@ -430,7 +411,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; @@ -455,7 +436,7 @@ 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;