Skip to content

target/xtensa: merge from upstream generic xtensa LX #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
erhankur wants to merge 3 commits into
base: master
Choose a base branch
from
Open

target/xtensa: merge from upstream generic xtensa LX #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
77f8be7
target/xtensa: merge from upstream part1
erhankur Sep 12, 2022
5bac6ea
target/xtensa: merge from upstream part2
erhankur Sep 13, 2022
3fd1d27
target/xtensa: merge from upstream part3
erhankur Sep 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions src/rtos/FreeRTOS.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down
9 changes: 6 additions & 3 deletions src/rtos/nuttx.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Loading