jtag: linuxgpiod: drop extra parenthesis

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

diff --git a/src/rtos/hwthread.c b/src/rtos/hwthread.c
index e5eaf425f63da8d31863629ae57f165ed38d842f..895f11cfc93348dbcfd34f753c4c876a6f7e3751 100644 (file)
--- a/src/rtos/hwthread.c
+++ b/src/rtos/hwthread.c
@@ -32,8 +32,6 @@ static int hwthread_write_buffer(struct rtos *rtos, target_addr_t address,
 
 #define HW_THREAD_NAME_STR_SIZE (32)
 
-extern int rtos_thread_packet(struct connection *connection, const char *packet, int packet_size);
-
 static inline threadid_t threadid_from_target(const struct target *target)
 {
        return target->coreid + 1;
@@ -82,6 +80,7 @@ static int hwthread_update_threads(struct rtos *rtos)
        struct target_list *head;
        struct target *target;
        int64_t current_thread = 0;
+       int64_t current_threadid = rtos->current_threadid; /* thread selected by GDB */
        enum target_debug_reason current_reason = DBG_REASON_UNDEFINED;
 
        if (!rtos)
@@ -105,6 +104,15 @@ static int hwthread_update_threads(struct rtos *rtos)
        } else
                thread_list_size = 1;
 
+       /* restore the threadid which is currently selected by GDB
+        * because rtos_free_threadlist() wipes out it
+        * (GDB thread id is 1-based indexing) */
+       if (current_threadid <= thread_list_size)
+               rtos->current_threadid = current_threadid;
+       else
+               LOG_WARNING("SMP node change, disconnect GDB from core/thread %" PRId64,
+                           current_threadid);
+
        /* create space for new thread details */
        rtos->thread_details = malloc(sizeof(struct thread_detail) * thread_list_size);
 
@@ -255,10 +263,19 @@ static int hwthread_get_thread_reg_list(struct rtos *rtos, int64_t thread_id,
        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);
+               if (!reg_list[i]->valid) {
+                       retval = reg_list[i]->type->get(reg_list[i]);
+                       if (retval != ERROR_OK) {
+                               LOG_ERROR("Couldn't get register %s.", reg_list[i]->name);
+                               free(reg_list);
+                               free(*rtos_reg_list);
+                               return retval;
+                       }
+               }
+               (*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,
+                               DIV_ROUND_UP(reg_list[i]->size, 8));
                j++;
        }
        free(reg_list);