aboutsummaryrefslogtreecommitdiff
path: root/src/rtos/rtos.h
diff options
context:
space:
mode:
authorAndrew Ruder <andrew.ruder@elecsyscorp.com>2015-10-05 13:51:10 -0500
committerFreddie Chopin <freddie.chopin@gmail.com>2015-10-30 23:41:44 +0000
commit9413a7a814755f3fab92f460bfbdd518f24ffaf5 (patch)
tree778b48c83cfa0a273898810eb93dbf3bc2ffc3ed /src/rtos/rtos.h
parentddc3317c54c3f2327cdd07d87f997197200a385e (diff)
downloadriscv-openocd-9413a7a814755f3fab92f460bfbdd518f24ffaf5.zip
riscv-openocd-9413a7a814755f3fab92f460bfbdd518f24ffaf5.tar.gz
riscv-openocd-9413a7a814755f3fab92f460bfbdd518f24ffaf5.tar.bz2
rtos: turn stack alignment into a function pointer
Some targets (Cortex M) require more complicated calculations for turning the stored stack pointer back into a process stack pointer. For example, the Cortex M stores a bit in the auto-stacked xPSR indicating that alignment had to be performed and an additional 4 byte padding is present before the exception stacking. This change only sets up the framework for Cortex-M unstacking and does not add Cortex-M support. Note: this also fixes the alignment calculation nearly addressed by change #2301 entitled rtos/rtos.c: fix stack alignment calculation. Updated calculation is in rtos_generic_stack_align. Change-Id: I0f662cad0df81cbe5866219ad0fef980dcb3e44f Signed-off-by: Andrew Ruder <andrew.ruder@elecsyscorp.com> Cc: Paul Fertser <fercerpav@gmail.com> Cc: Andreas Fritiofson <andreas.fritiofson@gmail.com> Cc: Evan Hunter <evanhunter920@gmail.com> Cc: Jon Burgess <jburgess777@gmail.com> Reviewed-on: http://openocd.zylin.com/3002 Reviewed-by: Andreas Fritiofson <andreas.fritiofson@gmail.com> Tested-by: jenkins
Diffstat (limited to 'src/rtos/rtos.h')
-rw-r--r--src/rtos/rtos.h10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/rtos/rtos.h b/src/rtos/rtos.h
index 7750f3c..d082fb7 100644
--- a/src/rtos/rtos.h
+++ b/src/rtos/rtos.h
@@ -83,7 +83,15 @@ struct rtos_register_stacking {
unsigned char stack_registers_size;
signed char stack_growth_direction;
unsigned char num_output_registers;
- unsigned char stack_alignment;
+ /* Some targets require evaluating the stack to determine the
+ * actual stack pointer for a process. If this field is NULL,
+ * just use stacking->stack_registers_size * stack_growth_direction
+ * to calculate adjustment.
+ */
+ int64_t (*calculate_process_stack)(struct target *target,
+ const uint8_t *stack_data,
+ const struct rtos_register_stacking *stacking,
+ int64_t stack_ptr);
const struct stack_register_offset *register_offsets;
};