Code Review / openocd.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
target/adi_v5_swd: add support for SWD multidrop
[openocd.git] / src / rtos / hwthread.c
diff --git a/src/rtos/hwthread.c b/src/rtos/hwthread.c
index 850b932231f04720e6e5fd8e2d9183876d7eaa24..3702b0b4762d6976ba548286ba4c62cc72580855 100644 (file)
--- a/src/rtos/hwthread.c
+++ b/src/rtos/hwthread.c
@@ -35,9 +35,13 @@ 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);
 static int hwthread_set_reg(struct rtos *rtos, uint32_t reg_num, uint8_t *reg_value);
+static int hwthread_read_buffer(struct rtos *rtos, target_addr_t address,
+               uint32_t size, uint8_t *buffer);
+static int hwthread_write_buffer(struct rtos *rtos, target_addr_t address,
+               uint32_t size, const uint8_t *buffer);
 
 #define HW_THREAD_NAME_STR_SIZE (32)
 
@@ -58,6 +62,8 @@ const struct rtos_type hwthread_rtos = {
        .get_symbol_list_to_lookup = hwthread_get_symbol_list_to_lookup,
        .smp_init = hwthread_smp_init,
        .set_reg = hwthread_set_reg,
+       .read_buffer = hwthread_read_buffer,
+       .write_buffer = hwthread_write_buffer,
 };
 
 struct hwthread_params {
@@ -91,7 +97,7 @@ static int hwthread_update_threads(struct rtos *rtos)
        int64_t current_thread = 0;
        enum target_debug_reason current_reason = DBG_REASON_UNDEFINED;
 
-       if (rtos == NULL)
+       if (!rtos)
                return -1;
 
        target = rtos->target;
@@ -101,7 +107,7 @@ static int hwthread_update_threads(struct rtos *rtos)
 
        /* determine the number of "threads" */
        if (target->smp) {
-               for (head = target->head; head != NULL; head = head->next) {
+               for (head = target->head; head; head = head->next) {
                        struct target *curr = head->target;
 
                        if (!target_was_examined(curr))
@@ -117,7 +123,7 @@ static int hwthread_update_threads(struct rtos *rtos)
 
        if (target->smp) {
                /* loop over all threads */
-               for (head = target->head; head != NULL; head = head->next) {
+               for (head = target->head; head; head = head->next) {
                        struct target *curr = head->target;
 
                        if (!target_was_examined(curr))
@@ -209,10 +215,10 @@ static int hwthread_smp_init(struct target *target)
 static struct target *hwthread_find_thread(struct target *target, int64_t thread_id)
 {
        /* Find the thread with that thread_id */
-       if (target == NULL)
+       if (!target)
                return NULL;
        if (target->smp) {
-               for (struct target_list *head = target->head; head != NULL; head = head->next) {
+               for (struct target_list *head = target->head; head; head = head->next) {
                        if (thread_id == threadid_from_target(head->target))
                                return head->target;
                }
@@ -225,35 +231,47 @@ static struct target *hwthread_find_thread(struct target *target, int64_t thread
 static int hwthread_get_thread_reg_list(struct rtos *rtos, int64_t thread_id,
                struct rtos_reg **rtos_reg_list, int *rtos_reg_list_size)
 {
-       if (rtos == NULL)
+       if (!rtos)
                return ERROR_FAIL;
 
        struct target *target = rtos->target;
 
        struct target *curr = hwthread_find_thread(target, thread_id);
-       if (curr == NULL)
+       if (!curr)
                return ERROR_FAIL;
 
        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] || 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) {
+       if (!*rtos_reg_list) {
                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] || 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);
 
@@ -263,13 +281,13 @@ static int hwthread_get_thread_reg_list(struct rtos *rtos, int64_t thread_id,
 static int hwthread_get_thread_reg(struct rtos *rtos, int64_t thread_id,
                uint32_t reg_num, struct rtos_reg *rtos_reg)
 {
-       if (rtos == NULL)
+       if (!rtos)
                return ERROR_FAIL;
 
        struct target *target = rtos->target;
 
        struct target *curr = hwthread_find_thread(target, thread_id);
-       if (curr == NULL) {
+       if (!curr) {
                LOG_ERROR("Couldn't find RTOS thread for id %" PRId64 ".", thread_id);
                return ERROR_FAIL;
        }
@@ -300,13 +318,13 @@ static int hwthread_get_thread_reg(struct rtos *rtos, int64_t thread_id,
 
 static int hwthread_set_reg(struct rtos *rtos, uint32_t reg_num, uint8_t *reg_value)
 {
-       if (rtos == NULL)
+       if (!rtos)
                return ERROR_FAIL;
 
        struct target *target = rtos->target;
 
        struct target *curr = hwthread_find_thread(target, rtos->current_thread);
-       if (curr == NULL)
+       if (!curr)
                return ERROR_FAIL;
 
        struct reg *reg = register_get_by_number(curr->reg_cache, reg_num, true);
@@ -316,10 +334,10 @@ static int hwthread_set_reg(struct rtos *rtos, uint32_t reg_num, uint8_t *reg_va
        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;
 }
@@ -329,7 +347,7 @@ static int hwthread_target_for_threadid(struct connection *connection, int64_t t
        struct target *target = get_target_from_connection(connection);
 
        struct target *curr = hwthread_find_thread(target, thread_id);
-       if (curr == NULL)
+       if (!curr)
                return ERROR_FAIL;
 
        *p_target = curr;
@@ -384,3 +402,33 @@ static int hwthread_create(struct target *target)
        target->rtos->gdb_thread_packet = hwthread_thread_packet;
        return 0;
 }
+
+static int hwthread_read_buffer(struct rtos *rtos, target_addr_t address,
+               uint32_t size, uint8_t *buffer)
+{
+       if (!rtos)
+               return ERROR_FAIL;
+
+       struct target *target = rtos->target;
+
+       struct target *curr = hwthread_find_thread(target, rtos->current_thread);
+       if (!curr)
+               return ERROR_FAIL;
+
+       return target_read_buffer(curr, address, size, buffer);
+}
+
+static int hwthread_write_buffer(struct rtos *rtos, target_addr_t address,
+               uint32_t size, const uint8_t *buffer)
+{
+       if (!rtos)
+               return ERROR_FAIL;
+
+       struct target *target = rtos->target;
+
+       struct target *curr = hwthread_find_thread(target, rtos->current_thread);
+       if (!curr)
+               return ERROR_FAIL;
+
+       return target_write_buffer(curr, address, size, buffer);
+}
Open On-Chip Debugger

Linking to existing account procedure

If you already have an account and want to add another login method you MUST first sign in with your existing account and then change URL to read https://review.openocd.org/login/?link to get to this page again but this time it'll work for linking. Thank you.

SSH host keys fingerprints

1024 SHA256:YKx8b7u5ZWdcbp7/4AeXNaqElP49m6QrwfXaqQGJAOk gerrit-code-review@openocd.zylin.com (DSA)
384 SHA256:jHIbSQa4REvwCFG4cq5LBlBLxmxSqelQPem/EXIrxjk gerrit-code-review@openocd.org (ECDSA)
521 SHA256:UAOPYkU9Fjtcao0Ul/Rrlnj/OsQvt+pgdYSZ4jOYdgs gerrit-code-review@openocd.org (ECDSA)
256 SHA256:A13M5QlnozFOvTllybRZH6vm7iSt0XLxbA48yfc2yfY gerrit-code-review@openocd.org (ECDSA)
256 SHA256:spYMBqEYoAOtK7yZBrcwE8ZpYt6b68Cfh9yEVetvbXg gerrit-code-review@openocd.org (ED25519)
+--[ED25519 256]--+
|=..              |
|+o..   .         |
|*.o   . .        |
|+B . . .         |
|Bo. = o S        |
|Oo.+ + =         |
|oB=.* = . o      |
| =+=.+   + E     |
|. .=o   . o      |
+----[SHA256]-----+
2048 SHA256:0Onrb7/PHjpo6iVZ7xQX2riKN83FJ3KGU0TvI0TaFG4 gerrit-code-review@openocd.zylin.com (RSA)