interesting
/
riscv-openocd
mirror of https://github.com/riscv/riscv-openocd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix incorrectly resolved conflict. 

Change-Id: I8dde5f2fc1dbc7b4de6091a934cbe160baadb504
Signed-off-by: Tim Newsome <tim@sifive.com>
This commit is contained in:
Tim Newsome 2021-10-06 13:45:14 -07:00
parent c67a887a00
commit 52b2a4a744
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/rtos/rtos_standard_stackings.c
View File

@ -321,11 +321,13 @@ static target_addr_t rtos_generic_stack_align(struct target *target,
const uint8_t *stack_data, const struct rtos_register_stacking *stacking, const uint8_t *stack_data, const struct rtos_register_stacking *stacking,
target_addr_t stack_ptr, int align) target_addr_t stack_ptr, int align)
{ {
target_addr_t new_stack_ptr; target_addr_t new_stack_ptr = stack_ptr;
target_addr_t aligned_stack_ptr; if (stacking->stack_growth_direction > 0)
new_stack_ptr = stack_ptr - stacking->stack_growth_direction * new_stack_ptr -= stacking->stack_registers_size;
stacking->stack_registers_size; else
aligned_stack_ptr = new_stack_ptr & ~((target_addr_t)align - 1); new_stack_ptr += stacking->stack_registers_size;
target_addr_t aligned_stack_ptr = new_stack_ptr & ~((int64_t)align - 1);
if (aligned_stack_ptr != new_stack_ptr && if (aligned_stack_ptr != new_stack_ptr &&
stacking->stack_growth_direction == -1) { stacking->stack_growth_direction == -1) {
/* If we have a downward growing stack, the simple alignment code /* If we have a downward growing stack, the simple alignment code