X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Frtos%2FFreeRTOS.c;h=8f66c4ca0c98b6482a237670795c3b892f50054d;hb=8b99681346c71b7fa6358bf79becaaecb6151f4a;hp=51bd35e4ef4b4a9ff61d84a74ab2fc0b0c5eb1f8;hpb=b7d2cdc0d4fc319169c60362708a67e2ff626525;p=openocd.git diff --git a/src/rtos/FreeRTOS.c b/src/rtos/FreeRTOS.c index 51bd35e4ef..8f66c4ca0c 100644 --- a/src/rtos/FreeRTOS.c +++ b/src/rtos/FreeRTOS.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 @@ -48,7 +48,7 @@ struct FreeRTOS_params { const struct rtos_register_stacking *stacking_info; }; -const struct FreeRTOS_params FreeRTOS_params_list[] = { +static const struct FreeRTOS_params FreeRTOS_params_list[] = { { "cortex_m", /* target_name */ 4, /* thread_count_width; */ @@ -72,7 +72,19 @@ const struct FreeRTOS_params FreeRTOS_params_list[] = { 0, /* thread_stack_offset; */ 52, /* thread_name_offset; */ &rtos_standard_Cortex_M3_stacking, /* stacking_info */ - } + }, + { + "nds32_v3", /* target_name */ + 4, /* thread_count_width; */ + 4, /* pointer_width; */ + 16, /* list_next_offset; */ + 20, /* list_width; */ + 8, /* list_elem_next_offset; */ + 12, /* list_elem_content_offset */ + 0, /* thread_stack_offset; */ + 52, /* thread_name_offset; */ + &rtos_standard_NDS32_N1068_stacking, /* stacking_info */ + }, }; #define FREERTOS_NUM_PARAMS ((int)(sizeof(FreeRTOS_params_list)/sizeof(struct FreeRTOS_params))) @@ -107,7 +119,7 @@ enum FreeRTOS_symbol_values { FreeRTOS_VAL_uxTopUsedPriority = 10, }; -static char *FreeRTOS_symbol_list[] = { +static const char * const FreeRTOS_symbol_list[] = { "pxCurrentTCB", "pxReadyTasksLists", "xDelayedTaskList1", @@ -161,25 +173,7 @@ static int FreeRTOS_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 */ retval = target_read_buffer(rtos->target, @@ -198,7 +192,7 @@ static int FreeRTOS_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); if (!rtos->thread_details) { LOG_ERROR("Error allocating memory for %d threads", thread_list_size); @@ -208,7 +202,7 @@ static int FreeRTOS_update_threads(struct rtos *rtos) 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 == 1) { @@ -217,7 +211,7 @@ static int FreeRTOS_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); if (!rtos->thread_details) { LOG_ERROR("Error allocating memory for %d threads", thread_list_size); @@ -240,7 +234,7 @@ static int FreeRTOS_update_threads(struct rtos *rtos) } symbol_address_t *list_of_lists = - (symbol_address_t *)malloc(sizeof(symbol_address_t) * + malloc(sizeof(symbol_address_t) * (max_used_priority+1 + 5)); if (!list_of_lists) { LOG_ERROR("Error allocating memory for %" PRId64 " priorities", max_used_priority); @@ -326,14 +320,14 @@ static int FreeRTOS_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); rtos->thread_details[tasks_found].display_str = NULL; rtos->thread_details[tasks_found].exists = true; if (rtos->thread_details[tasks_found].threadid == rtos->current_thread) { char running_str[] = "Running"; - rtos->thread_details[tasks_found].extra_info_str = (char *) malloc( + rtos->thread_details[tasks_found].extra_info_str = malloc( sizeof(running_str)); strcpy(rtos->thread_details[tasks_found].extra_info_str, running_str); @@ -396,8 +390,8 @@ static int FreeRTOS_get_thread_reg_list(struct rtos *rtos, int64_t thread_id, ch static int FreeRTOS_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(FreeRTOS_symbol_list)); + *symbol_list = calloc( + ARRAY_SIZE(FreeRTOS_symbol_list), sizeof(symbol_table_elem_t)); for (i = 0; i < ARRAY_SIZE(FreeRTOS_symbol_list); i++) (*symbol_list)[i].symbol_name = FreeRTOS_symbol_list[i]; @@ -445,7 +439,7 @@ static int FreeRTOS_get_thread_ascii_info(struct rtos *rtos, threadid_t thread_i if (tmp_str[0] == '\x00') strcpy(tmp_str, "No Name"); - *info = (char *)malloc(strlen(tmp_str)+1); + *info = malloc(strlen(tmp_str)+1); strcpy(*info, tmp_str); return 0; }