X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Frtos%2FFreeRTOS.c;h=1ce680724078f547482214cca2899c0aa517c8e7;hb=33d220d10a069be34095313f51ae22052a079b34;hp=04cbdfc935ad42d82365a20a783cb315c26b02a5;hpb=08d4411b59dd8bd0e7d8009003b71d23acbf6eee;p=openocd.git

diff --git a/src/rtos/FreeRTOS.c b/src/rtos/FreeRTOS.c
index 04cbdfc935..1ce6807240 100644
--- a/src/rtos/FreeRTOS.c
+++ b/src/rtos/FreeRTOS.c
@@ -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,19 +119,24 @@ enum FreeRTOS_symbol_values {
 	FreeRTOS_VAL_uxTopUsedPriority = 10,
 };
 
-static char *FreeRTOS_symbol_list[] = {
-	"pxCurrentTCB",
-	"pxReadyTasksLists",
-	"xDelayedTaskList1",
-	"xDelayedTaskList2",
-	"pxDelayedTaskList",
-	"pxOverflowDelayedTaskList",
-	"xPendingReadyList",
-	"xTasksWaitingTermination",
-	"xSuspendedTaskList",
-	"uxCurrentNumberOfTasks",
-	"uxTopUsedPriority",
-	NULL
+struct symbols {
+	const char *name;
+	bool optional;
+};
+
+static const struct symbols FreeRTOS_symbol_list[] = {
+	{ "pxCurrentTCB", false },
+	{ "pxReadyTasksLists", false },
+	{ "xDelayedTaskList1", false },
+	{ "xDelayedTaskList2", false },
+	{ "pxDelayedTaskList", false },
+	{ "pxOverflowDelayedTaskList", false },
+	{ "xPendingReadyList", false },
+	{ "xTasksWaitingTermination", true }, /* Only if INCLUDE_vTaskDelete */
+	{ "xSuspendedTaskList", true }, /* Only if INCLUDE_vTaskSuspend */
+	{ "uxCurrentNumberOfTasks", false },
+	{ "uxTopUsedPriority", true }, /* Unavailable since v7.5.3 */
+	{ NULL, false }
 };
 
 /* TODO: */
@@ -154,6 +171,9 @@ static int FreeRTOS_update_threads(struct rtos *rtos)
 			rtos->symbols[FreeRTOS_VAL_uxCurrentNumberOfTasks].address,
 			param->thread_count_width,
 			(uint8_t *)&thread_list_size);
+	LOG_DEBUG("FreeRTOS: Read uxCurrentNumberOfTasks at 0x%" PRIx64 ", value %d\r\n",
+										rtos->symbols[FreeRTOS_VAL_uxCurrentNumberOfTasks].address,
+										thread_list_size);
 
 	if (retval != ERROR_OK) {
 		LOG_ERROR("Could not read FreeRTOS thread count from target");
@@ -161,25 +181,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,
@@ -190,6 +192,9 @@ static int FreeRTOS_update_threads(struct rtos *rtos)
 		LOG_ERROR("Error reading current thread in FreeRTOS thread list");
 		return retval;
 	}
+	LOG_DEBUG("FreeRTOS: Read pxCurrentTCB at 0x%" PRIx64 ", value 0x%" PRIx64 "\r\n",
+										rtos->symbols[FreeRTOS_VAL_pxCurrentTCB].address,
+										rtos->current_thread);
 
 	if ((thread_list_size  == 0) || (rtos->current_thread == 0)) {
 		/* Either : No RTOS threads - there is always at least the current execution though */
@@ -198,7 +203,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 +213,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 +222,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);
@@ -226,6 +231,10 @@ static int FreeRTOS_update_threads(struct rtos *rtos)
 	}
 
 	/* Find out how many lists are needed to be read from pxReadyTasksLists, */
+	if (rtos->symbols[FreeRTOS_VAL_uxTopUsedPriority].address == 0) {
+		LOG_ERROR("FreeRTOS: uxTopUsedPriority is not defined, consult the OpenOCD manual for a work-around");
+		return ERROR_FAIL;
+	}
 	int64_t max_used_priority = 0;
 	retval = target_read_buffer(rtos->target,
 			rtos->symbols[FreeRTOS_VAL_uxTopUsedPriority].address,
@@ -233,6 +242,9 @@ static int FreeRTOS_update_threads(struct rtos *rtos)
 			(uint8_t *)&max_used_priority);
 	if (retval != ERROR_OK)
 		return retval;
+	LOG_DEBUG("FreeRTOS: Read uxTopUsedPriority at 0x%" PRIx64 ", value %" PRId64 "\r\n",
+										rtos->symbols[FreeRTOS_VAL_uxTopUsedPriority].address,
+										max_used_priority);
 	if (max_used_priority > FREERTOS_MAX_PRIORITIES) {
 		LOG_ERROR("FreeRTOS maximum used priority is unreasonably big, not proceeding: %" PRId64 "",
 			max_used_priority);
@@ -240,7 +252,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);
@@ -273,6 +285,8 @@ static int FreeRTOS_update_threads(struct rtos *rtos)
 			free(list_of_lists);
 			return retval;
 		}
+		LOG_DEBUG("FreeRTOS: Read thread count for list %d at 0x%" PRIx64 ", value %" PRId64 "\r\n",
+										i, list_of_lists[i], list_thread_count);
 
 		if (list_thread_count == 0)
 			continue;
@@ -289,6 +303,8 @@ static int FreeRTOS_update_threads(struct rtos *rtos)
 			free(list_of_lists);
 			return retval;
 		}
+		LOG_DEBUG("FreeRTOS: Read first item for list %d at 0x%" PRIx64 ", value 0x%" PRIx64 "\r\n",
+										i, list_of_lists[i] + param->list_next_offset, list_elem_ptr);
 
 		while ((list_thread_count > 0) && (list_elem_ptr != 0) &&
 				(list_elem_ptr != prev_list_elem_ptr) &&
@@ -304,6 +320,9 @@ static int FreeRTOS_update_threads(struct rtos *rtos)
 				free(list_of_lists);
 				return retval;
 			}
+			LOG_DEBUG("FreeRTOS: Read Thread ID at 0x%" PRIx64 ", value 0x%" PRIx64 "\r\n",
+										list_elem_ptr + param->list_elem_content_offset,
+										rtos->thread_details[tasks_found].threadid);
 
 			/* get thread name */
 
@@ -321,19 +340,22 @@ static int FreeRTOS_update_threads(struct rtos *rtos)
 				return retval;
 			}
 			tmp_str[FREERTOS_THREAD_NAME_STR_SIZE-1] = '\x00';
+			LOG_DEBUG("FreeRTOS: Read Thread Name at 0x%" PRIx64 ", value \"%s\"\r\n",
+										rtos->thread_details[tasks_found].threadid + param->thread_name_offset,
+										tmp_str);
 
 			if (tmp_str[0] == '\x00')
 				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);
@@ -354,6 +376,9 @@ static int FreeRTOS_update_threads(struct rtos *rtos)
 				free(list_of_lists);
 				return retval;
 			}
+			LOG_DEBUG("FreeRTOS: Read next thread location at 0x%" PRIx64 ", value 0x%" PRIx64 "\r\n",
+										prev_list_elem_ptr + param->list_elem_next_offset,
+										list_elem_ptr);
 		}
 	}
 
@@ -389,6 +414,9 @@ static int FreeRTOS_get_thread_reg_list(struct rtos *rtos, int64_t thread_id, ch
 		LOG_ERROR("Error reading stack frame from FreeRTOS thread");
 		return retval;
 	}
+	LOG_DEBUG("FreeRTOS: Read stack pointer at 0x%" PRIx64 ", value 0x%" PRIx64 "\r\n",
+										thread_id + param->thread_stack_offset,
+										stack_ptr);
 
 	return rtos_generic_stack_read(rtos->target, param->stacking_info, stack_ptr, hex_reg_list);
 }
@@ -396,11 +424,13 @@ 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];
+	for (i = 0; i < ARRAY_SIZE(FreeRTOS_symbol_list); i++) {
+		(*symbol_list)[i].symbol_name = FreeRTOS_symbol_list[i].name;
+		(*symbol_list)[i].optional = FreeRTOS_symbol_list[i].optional;
+	}
 
 	return 0;
 }
@@ -445,7 +475,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;
 }