rtos: Remove typedef'd struct

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

diff --git a/src/rtos/hwthread.c b/src/rtos/hwthread.c
index 38e42a04117687d15b604a19db8b2e09a885bd96..ce24086353a2398a34250b25f1c0296bd1f00dfd 100644 (file)
--- a/src/rtos/hwthread.c
+++ b/src/rtos/hwthread.c
@@ -35,9 +35,9 @@ static int hwthread_get_thread_reg(struct rtos *rtos, int64_t thread_id,
                uint32_t reg_num, struct rtos_reg *rtos_reg);
 static int hwthread_get_thread_reg_list(struct rtos *rtos, int64_t thread_id,
                struct rtos_reg **reg_list, int *num_regs);
-static int hwthread_get_symbol_list_to_lookup(symbol_table_elem_t *symbol_list[]);
+static int hwthread_get_symbol_list_to_lookup(struct symbol_table_elem *symbol_list[]);
 static int hwthread_smp_init(struct target *target);
-int hwthread_set_reg(struct rtos *rtos, uint32_t reg_num, uint8_t *reg_value);
+static int hwthread_set_reg(struct rtos *rtos, uint32_t reg_num, uint8_t *reg_value);
 
 #define HW_THREAD_NAME_STR_SIZE (32)
 
@@ -237,23 +237,35 @@ static int hwthread_get_thread_reg_list(struct rtos *rtos, int64_t thread_id,
        if (!target_was_examined(curr))
                return ERROR_FAIL;
 
+       int reg_list_size;
        struct reg **reg_list;
-       int retval = target_get_gdb_reg_list(curr, &reg_list, rtos_reg_list_size,
+       int retval = target_get_gdb_reg_list(curr, &reg_list, &reg_list_size,
                        REG_CLASS_GENERAL);
        if (retval != ERROR_OK)
                return retval;
 
+       int j = 0;
+       for (int i = 0; i < reg_list_size; i++) {
+               if (reg_list[i] == NULL || reg_list[i]->exist == false || reg_list[i]->hidden)
+                       continue;
+               j++;
+       }
+       *rtos_reg_list_size = j;
        *rtos_reg_list = calloc(*rtos_reg_list_size, sizeof(struct rtos_reg));
        if (*rtos_reg_list == NULL) {
                free(reg_list);
                return ERROR_FAIL;
        }
 
-       for (int i = 0; i < *rtos_reg_list_size; i++) {
-               (*rtos_reg_list)[i].number = (*reg_list)[i].number;
-               (*rtos_reg_list)[i].size = (*reg_list)[i].size;
-               memcpy((*rtos_reg_list)[i].value, (*reg_list)[i].value,
+       j = 0;
+       for (int i = 0; i < reg_list_size; i++) {
+               if (reg_list[i] == NULL || reg_list[i]->exist == false || reg_list[i]->hidden)
+                       continue;
+               (*rtos_reg_list)[j].number = (*reg_list)[i].number;
+               (*rtos_reg_list)[j].size = (*reg_list)[i].size;
+               memcpy((*rtos_reg_list)[j].value, (*reg_list)[i].value,
                                ((*reg_list)[i].size + 7) / 8);
+               j++;
        }
        free(reg_list);
 
@@ -281,7 +293,7 @@ static int hwthread_get_thread_reg(struct rtos *rtos, int64_t thread_id,
 
        struct reg *reg = register_get_by_number(curr->reg_cache, reg_num, true);
        if (!reg) {
-               LOG_ERROR("Couldn't find register %d in thread %" PRId64 ".", reg_num,
+               LOG_ERROR("Couldn't find register %" PRIu32 " in thread %" PRId64 ".", reg_num,
                                thread_id);
                return ERROR_FAIL;
        }
@@ -298,7 +310,7 @@ static int hwthread_get_thread_reg(struct rtos *rtos, int64_t thread_id,
        return ERROR_OK;
 }
 
-int hwthread_set_reg(struct rtos *rtos, uint32_t reg_num, uint8_t *reg_value)
+static int hwthread_set_reg(struct rtos *rtos, uint32_t reg_num, uint8_t *reg_value)
 {
        if (rtos == NULL)
                return ERROR_FAIL;
@@ -316,10 +328,10 @@ int hwthread_set_reg(struct rtos *rtos, uint32_t reg_num, uint8_t *reg_value)
        return reg->type->set(reg, reg_value);
 }
 
-static int hwthread_get_symbol_list_to_lookup(symbol_table_elem_t *symbol_list[])
+static int hwthread_get_symbol_list_to_lookup(struct symbol_table_elem *symbol_list[])
 {
        /* return an empty list, we don't have any symbols to look up */
-       *symbol_list = calloc(1, sizeof(symbol_table_elem_t));
+       *symbol_list = calloc(1, sizeof(struct symbol_table_elem));
        (*symbol_list)[0].symbol_name = NULL;
        return 0;
 }