target/xtensa: merge from upstream part3

Author: erhankur

src/rtos/FreeRTOS.c

@@ -777,8 +777,7 @@ static int freertos_get_tasks_details(struct target *target,
 					return ERROR_FAIL;
 				}
 				rtos->thread_details[index].exists = true;
-				const struct freertos_tls_info *tls_info =
-					rtos_freertos_get_tls_info(target);
+				const struct freertos_tls_info *tls_info = rtos_freertos_get_tls_info(target);
 				if (tls_info &&
 					!rtos->thread_details[index].tls_addr) {
 					struct rtos_reg reg;
@@ -1114,8 +1113,12 @@ static int freertos_get_current_thread_registers(struct rtos *rtos, int64_t thre
 		return ERROR_FAIL;
 	}
 
+	bool is_xtensa = strncmp(target_get_gdb_arch(current_target), "xtensa", 6) == 0;
 	for (int i = 0; i < *num_regs; i++) {
-		(*reg_list)[i].number = gdb_reg_list[i]->number;
+		if (is_xtensa)
+			(*reg_list)[i].number = i;
+		else
+			(*reg_list)[i].number = gdb_reg_list[i]->number;
 		(*reg_list)[i].size = gdb_reg_list[i]->size;
 		memcpy((*reg_list)[i].value, gdb_reg_list[i]->value,
 			((*reg_list)[i].size + 7) / 8);

src/rtos/nuttx.c

@@ -389,11 +389,14 @@ static int nuttx_getreg_current_thread(struct rtos *rtos,
 		return ERROR_FAIL;
 	}
 
+	bool is_xtensa = strncmp(target_get_gdb_arch(rtos->target), "xtensa", 6) == 0;
 	for (int i = 0; i < *num_regs; i++) {
-		(*reg_list)[i].number = gdb_reg_list[i]->number;
+		if (is_xtensa)
+			(*reg_list)[i].number = i;
+		else
+			(*reg_list)[i].number = gdb_reg_list[i]->number;
 		(*reg_list)[i].size = gdb_reg_list[i]->size;
-		memcpy((*reg_list)[i].value, gdb_reg_list[i]->value,
-			((*reg_list)[i].size + 7) / 8);
+		memcpy((*reg_list)[i].value, gdb_reg_list[i]->value, ((*reg_list)[i].size + 7) / 8);
 	}
 
 	free(gdb_reg_list);