interesting
/
riscv-openocd
mirror of https://github.com/riscv/riscv-openocd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

rtos/FreeRTOS: pxCurrentTCB should be used for judgment. (#862) 

* rtos/FreeRTOS: pxCurrentTCB should be used for judgment.

The current TCB is stored in pxCurrentTCB, which is somehow RISC-V-specific, should not be overwritten from upstream (#816).

* fix the code style check.

Signed-off-by: Chao Du <duchao@eswincomputing.com>
Change-Id: I9ffa8947f0cb9e93c7d96866882a5a1e8e69afad

* revert some over-changes in last commit.

Change-Id: Ie88bd75b59190503db11ee4538281bd13b554e50
Signed-off-by: Chao Du <duchao@eswincomputing.com>

---------

Signed-off-by: Chao Du <duchao@eswincomputing.com>
This commit is contained in:
Chao Du 2023-06-15 02:39:21 +08:00 committed by GitHub
parent 8f81655256
commit c6e0716ac9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/rtos/FreeRTOS.c
View File

@ -496,19 +496,19 @@ static int freertos_update_threads(struct rtos *rtos)
rtos_free_threadlist(rtos);
/* read the current thread */
target_addr_t pxCurrentTCB;
target_addr_t px_current_tcb;
retval = freertos_read_struct_value(rtos->target,
rtos->symbols[FREERTOS_VAL_PX_CURRENT_TCB].address,
0,
freertos->pointer_size,
&pxCurrentTCB);
&px_current_tcb);
if (retval != ERROR_OK) {
LOG_ERROR("Error reading current thread in FreeRTOS thread list");
return retval;
}
LOG_DEBUG("FreeRTOS: Read pxCurrentTCB at 0x%" PRIx64 ", value 0x%" PRIx64,
rtos->symbols[FREERTOS_VAL_PX_CURRENT_TCB].address,
pxCurrentTCB);
px_current_tcb);
/* read scheduler running */
uint32_t scheduler_running;
@ -523,7 +523,7 @@ static int freertos_update_threads(struct rtos *rtos)
rtos->symbols[FREERTOS_VAL_X_SCHEDULER_RUNNING].address,
scheduler_running);
if ((thread_list_size == 0) || (rtos->current_thread == 0) || (scheduler_running != 1)) {
if (thread_list_size == 0 || px_current_tcb == 0 || scheduler_running != 1) {
/* Either : No RTOS threads - there is always at least the current execution though */
/* OR : No current thread - all threads suspended - show the current execution
* of idling */
@ -711,7 +711,7 @@ static int freertos_update_threads(struct rtos *rtos)
strcpy(rtos->thread_details[tasks_found].thread_name_str, tmp_str);
rtos->thread_details[tasks_found].exists = true;
if (value->tcb == pxCurrentTCB) {
if (value->tcb == px_current_tcb) {
char running_str[] = "State: Running";
rtos->current_thread = value->threadid;
rtos->thread_details[tasks_found].extra_info_str = malloc(