target/xtensa: avoid IHI for writes to non-executable memory

[openocd.git] / src / rtos / FreeRTOS.c

diff --git a/src/rtos/FreeRTOS.c b/src/rtos/FreeRTOS.c
index 5f779ef70cf30636f27c48db5ab51f8abb669cc9..e8df030aad883d6b38780f66e099fbcd30395fd0 100644 (file)
--- a/src/rtos/FreeRTOS.c
+++ b/src/rtos/FreeRTOS.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 /***************************************************************************
  *   Copyright (C) 2011 by Broadcom Corporation                            *
@@ -71,20 +71,6 @@ static const struct freertos_params freertos_params_list[] = {
        &rtos_standard_cortex_m4f_stacking,
        &rtos_standard_cortex_m4f_fpu_stacking,
        },
-       {
-       "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 */
-       &rtos_standard_cortex_m4f_stacking,
-       &rtos_standard_cortex_m4f_fpu_stacking,
-       },
 };
 
 static bool freertos_detect_rtos(struct target *target);
@@ -94,7 +80,7 @@ static int freertos_get_thread_reg_list(struct rtos *rtos, int64_t thread_id,
                struct rtos_reg **reg_list, int *num_regs);
 static int freertos_get_symbol_list_to_lookup(struct symbol_table_elem *symbol_list[]);
 
-struct rtos_type freertos_rtos = {
+const struct rtos_type freertos_rtos = {
        .name = "FreeRTOS",
 
        .detect_rtos = freertos_detect_rtos,
@@ -116,6 +102,7 @@ enum freertos_symbol_values {
        FREERTOS_VAL_X_SUSPENDED_TASK_LIST = 8,
        FREERTOS_VAL_UX_CURRENT_NUMBER_OF_TASKS = 9,
        FREERTOS_VAL_UX_TOP_USED_PRIORITY = 10,
+       FREERTOS_VAL_X_SCHEDULER_RUNNING = 11,
 };
 
 struct symbols {
@@ -135,6 +122,7 @@ static const struct symbols freertos_symbol_list[] = {
        { "xSuspendedTaskList", true }, /* Only if INCLUDE_vTaskSuspend */
        { "uxCurrentNumberOfTasks", false },
        { "uxTopUsedPriority", true }, /* Unavailable since v7.5.3 */
+       { "xSchedulerRunning", false },
        { NULL, false }
 };
 
@@ -194,7 +182,20 @@ static int freertos_update_threads(struct rtos *rtos)
                                                                                rtos->symbols[FREERTOS_VAL_PX_CURRENT_TCB].address,
                                                                                rtos->current_thread);
 
-       if ((thread_list_size  == 0) || (rtos->current_thread == 0)) {
+       /* read scheduler running */
+       uint32_t scheduler_running;
+       retval = target_read_u32(rtos->target,
+                       rtos->symbols[FREERTOS_VAL_X_SCHEDULER_RUNNING].address,
+                       &scheduler_running);
+       if (retval != ERROR_OK) {
+               LOG_ERROR("Error reading FreeRTOS scheduler state");
+               return retval;
+       }
+       LOG_DEBUG("FreeRTOS: Read xSchedulerRunning at 0x%" PRIx64 ", value 0x%" PRIx32,
+                                                                               rtos->symbols[FREERTOS_VAL_X_SCHEDULER_RUNNING].address,
+                                                                               scheduler_running);
+
+       if ((thread_list_size  == 0) || (rtos->current_thread == 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 */
@@ -311,7 +312,6 @@ static int freertos_update_threads(struct rtos *rtos)
                                (list_elem_ptr != prev_list_elem_ptr) &&
                                (tasks_found < thread_list_size)) {
                        /* Get the location of the thread structure. */
-                       rtos->thread_details[tasks_found].threadid = 0;
                        retval = target_read_u32(rtos->target,
                                        list_elem_ptr + param->list_elem_content_offset,
                                        &pointer_casts_are_bad);
@@ -364,6 +364,7 @@ static int freertos_update_threads(struct rtos *rtos)
 
                        tasks_found++;
                        list_thread_count--;
+                       rtos->thread_count = tasks_found;
 
                        prev_list_elem_ptr = list_elem_ptr;
                        list_elem_ptr = 0;
@@ -382,7 +383,6 @@ static int freertos_update_threads(struct rtos *rtos)
        }
 
        free(list_of_lists);
-       rtos->thread_count = tasks_found;
        return 0;
 }
 
@@ -422,7 +422,8 @@ static int freertos_get_thread_reg_list(struct rtos *rtos, int64_t thread_id,
        int cm4_fpu_enabled = 0;
        struct armv7m_common *armv7m_target = target_to_armv7m(rtos->target);
        if (is_armv7m(armv7m_target)) {
-               if (armv7m_target->fp_feature == FPV4_SP) {
+               if ((armv7m_target->fp_feature == FPV4_SP) || (armv7m_target->fp_feature == FPV5_SP) ||
+                               (armv7m_target->fp_feature == FPV5_DP)) {
                        /* Found ARM v7m target which includes a FPU */
                        uint32_t cpacr;