X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Frtos%2FFreeRTOS.c;h=57307d5f24c7e53619b489d05302fd56c042f8f5;hb=677b02b475870b7d9e5d86e9bf61dc28dae5a6e4;hp=2c4791745b3b9aba607eb2bd918b8a20d6116210;hpb=fe11baeebb4e238d4bdc47382edb68d3b4156fd3;p=openocd.git diff --git a/src/rtos/FreeRTOS.c b/src/rtos/FreeRTOS.c index 2c4791745b..57307d5f24 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 @@ -28,8 +28,11 @@ #include "target/target_type.h" #include "rtos.h" #include "helper/log.h" +#include "helper/types.h" #include "rtos_standard_stackings.h" +#define FREERTOS_MAX_PRIORITIES 63 + #define FreeRTOS_STRUCT(int_type, ptr_type, list_prev_offset) struct FreeRTOS_params { @@ -47,7 +50,7 @@ struct FreeRTOS_params { const struct FreeRTOS_params FreeRTOS_params_list[] = { { - "cortex_m3", /* target_name */ + "cortex_m", /* target_name */ 4, /* thread_count_width; */ 4, /* pointer_width; */ 16, /* list_next_offset; */ @@ -57,7 +60,31 @@ const struct FreeRTOS_params FreeRTOS_params_list[] = { 0, /* thread_stack_offset; */ 52, /* thread_name_offset; */ &rtos_standard_Cortex_M3_stacking, /* stacking_info */ - } + }, + { + "hla_target", /* 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_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,8 +134,6 @@ static char *FreeRTOS_symbol_list[] = { NULL }; -#define FREERTOS_NUM_SYMBOLS (sizeof(FreeRTOS_symbol_list)/sizeof(char *)) - /* TODO: */ /* this is not safe for little endian yet */ /* may be problems reading if sizes are not 32 bit long integers. */ @@ -127,12 +152,12 @@ static int FreeRTOS_update_threads(struct rtos *rtos) param = (const struct FreeRTOS_params *) rtos->rtos_specific_params; if (rtos->symbols == NULL) { - LOG_OUTPUT("No symbols for FreeRTOS\r\n"); + LOG_ERROR("No symbols for FreeRTOS"); return -3; } if (rtos->symbols[FreeRTOS_VAL_uxCurrentNumberOfTasks].address == 0) { - LOG_OUTPUT("Don't have the number of threads in FreeRTOS \r\n"); + LOG_ERROR("Don't have the number of threads in FreeRTOS"); return -2; } @@ -143,30 +168,12 @@ static int FreeRTOS_update_threads(struct rtos *rtos) (uint8_t *)&thread_list_size); if (retval != ERROR_OK) { - LOG_OUTPUT("Could not read FreeRTOS thread count from target\r\n"); + LOG_ERROR("Could not read FreeRTOS 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 */ retval = target_read_buffer(rtos->target, @@ -174,7 +181,7 @@ static int FreeRTOS_update_threads(struct rtos *rtos) param->pointer_width, (uint8_t *)&rtos->current_thread); if (retval != ERROR_OK) { - LOG_OUTPUT("Error reading current thread in FreeRTOS thread list\r\n"); + LOG_ERROR("Error reading current thread in FreeRTOS thread list"); return retval; } @@ -185,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); @@ -195,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) { @@ -204,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); @@ -220,9 +227,14 @@ static int FreeRTOS_update_threads(struct rtos *rtos) (uint8_t *)&max_used_priority); if (retval != ERROR_OK) return retval; + if (max_used_priority > FREERTOS_MAX_PRIORITIES) { + LOG_ERROR("FreeRTOS maximum used priority is unreasonably big, not proceeding: %" PRId64 "", + max_used_priority); + return ERROR_FAIL; + } 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); @@ -251,7 +263,8 @@ static int FreeRTOS_update_threads(struct rtos *rtos) param->thread_count_width, (uint8_t *)&list_thread_count); if (retval != ERROR_OK) { - LOG_OUTPUT("Error reading number of threads in FreeRTOS thread list\r\n"); + LOG_ERROR("Error reading number of threads in FreeRTOS thread list"); + free(list_of_lists); return retval; } @@ -266,8 +279,8 @@ static int FreeRTOS_update_threads(struct rtos *rtos) param->pointer_width, (uint8_t *)&list_elem_ptr); if (retval != ERROR_OK) { - LOG_OUTPUT( - "Error reading first thread item location in FreeRTOS thread list\r\n"); + LOG_ERROR("Error reading first thread item location in FreeRTOS thread list"); + free(list_of_lists); return retval; } @@ -281,8 +294,8 @@ static int FreeRTOS_update_threads(struct rtos *rtos) param->pointer_width, (uint8_t *)&(rtos->thread_details[tasks_found].threadid)); if (retval != ERROR_OK) { - LOG_OUTPUT( - "Error reading thread list item object in FreeRTOS thread list\r\n"); + LOG_ERROR("Error reading thread list item object in FreeRTOS thread list"); + free(list_of_lists); return retval; } @@ -297,8 +310,8 @@ static int FreeRTOS_update_threads(struct rtos *rtos) FREERTOS_THREAD_NAME_STR_SIZE, (uint8_t *)&tmp_str); if (retval != ERROR_OK) { - LOG_OUTPUT( - "Error reading first thread item location in FreeRTOS thread list\r\n"); + LOG_ERROR("Error reading first thread item location in FreeRTOS thread list"); + free(list_of_lists); return retval; } tmp_str[FREERTOS_THREAD_NAME_STR_SIZE-1] = '\x00'; @@ -307,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); @@ -331,12 +344,13 @@ static int FreeRTOS_update_threads(struct rtos *rtos) param->pointer_width, (uint8_t *)&list_elem_ptr); if (retval != ERROR_OK) { - LOG_OUTPUT( - "Error reading next thread item location in FreeRTOS thread list\r\n"); + LOG_ERROR("Error reading next thread item location in FreeRTOS thread list"); + free(list_of_lists); return retval; } } } + free(list_of_lists); rtos->thread_count = tasks_found; return 0; @@ -366,21 +380,20 @@ static int FreeRTOS_get_thread_reg_list(struct rtos *rtos, int64_t thread_id, ch param->pointer_width, (uint8_t *)&stack_ptr); if (retval != ERROR_OK) { - LOG_OUTPUT("Error reading stack frame from FreeRTOS thread\r\n"); + LOG_ERROR("Error reading stack frame from FreeRTOS thread"); return retval; } return rtos_generic_stack_read(rtos->target, param->stacking_info, stack_ptr, hex_reg_list); - } 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) * FREERTOS_NUM_SYMBOLS); + *symbol_list = malloc( + sizeof(symbol_table_elem_t) * ARRAY_SIZE(FreeRTOS_symbol_list)); - for (i = 0; i < FREERTOS_NUM_SYMBOLS; i++) + for (i = 0; i < ARRAY_SIZE(FreeRTOS_symbol_list); i++) (*symbol_list)[i].symbol_name = FreeRTOS_symbol_list[i]; return 0; @@ -418,7 +431,7 @@ static int FreeRTOS_get_thread_ascii_info(struct rtos *rtos, threadid_t thread_i FREERTOS_THREAD_NAME_STR_SIZE, (uint8_t *)&tmp_str); if (retval != ERROR_OK) { - LOG_OUTPUT("Error reading first thread item location in FreeRTOS thread list\r\n"); + LOG_ERROR("Error reading first thread item location in FreeRTOS thread list"); return retval; } tmp_str[FREERTOS_THREAD_NAME_STR_SIZE-1] = '\x00'; @@ -426,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; } @@ -451,7 +464,7 @@ static int FreeRTOS_create(struct target *target) i++; } if (i >= FREERTOS_NUM_PARAMS) { - LOG_OUTPUT("Could not find target in FreeRTOS compatibility list\r\n"); + LOG_ERROR("Could not find target in FreeRTOS compatibility list"); return -1; }