zcy
/
tinyriscv-openocd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add stack alignment support to RTOS awareness - needed for ARM ABI processors 

Change-Id: I69a2f3d0606a97d48b7738561a85da87f458b82b
Signed-off-by: Evan Hunter <ehunter@broadcom.com>
Reviewed-on: http://openocd.zylin.com/238
Tested-by: jenkins
Reviewed-by: Spencer Oliver <spen@spen-soft.co.uk>
Reviewed-by: Mathias Küster <kesmtp@freenet.de>
Reviewed-by: Øyvind Harboe <oyvindharboe@gmail.com>
__archive__
Evan Hunter 2011-11-22 17:14:56 +11:00 committed by Øyvind Harboe
parent 57cb28b484
commit ce3760c7e8
4 changed files with 71 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/rtos/rtos.c
View File

@ -490,6 +490,12 @@ int rtos_generic_stack_read( struct target * target, const struct rtos_register_
*hex_reg_list = (char*)malloc( list_size*2 +1 ); *hex_reg_list = (char*)malloc( list_size*2 +1 );
tmp_str_ptr = *hex_reg_list; tmp_str_ptr = *hex_reg_list;
new_stack_ptr = stack_ptr - stacking->stack_growth_direction * stacking->stack_registers_size; new_stack_ptr = stack_ptr - stacking->stack_growth_direction * stacking->stack_registers_size;
if (stacking->stack_alignment != 0) {
/* Align new stack pointer to x byte boundary */
new_stack_ptr =
(new_stack_ptr & (~((int64_t) stacking->stack_alignment - 1))) +
((stacking->stack_growth_direction == -1) ? stacking->stack_alignment : 0);
}
for( i = 0; i < stacking->num_output_registers; i++ ) for( i = 0; i < stacking->num_output_registers; i++ )
{ {
int j; int j;

1
src/rtos/rtos.h
View File

@ -91,6 +91,7 @@ struct rtos_register_stacking
unsigned char stack_registers_size; unsigned char stack_registers_size;
signed char stack_growth_direction; signed char stack_growth_direction;
unsigned char num_output_registers; unsigned char num_output_registers;
unsigned char stack_alignment;
const struct stack_register_offset* register_offsets; const struct stack_register_offset* register_offsets;
}; };

63
src/rtos/rtos_ecos_stackings.c
View File

@ -22,42 +22,43 @@
#include "rtos.h" #include "rtos.h"
static const struct stack_register_offset rtos_eCos_Cortex_M3_stack_offsets [] = static const struct stack_register_offset rtos_eCos_Cortex_M3_stack_offsets[] = {
{ { 0x0c, 32 }, // r0 { 0x0c, 32 }, /* r0 */
{ 0x10, 32 }, // r1 { 0x10, 32 }, /* r1 */
{ 0x14, 32 }, // r2 { 0x14, 32 }, /* r2 */
{ 0x18, 32 }, // r3 { 0x18, 32 }, /* r3 */
{ 0x1c, 32 }, // r4 { 0x1c, 32 }, /* r4 */
{ 0x20, 32 }, // r5 { 0x20, 32 }, /* r5 */
{ 0x24, 32 }, // r6 { 0x24, 32 }, /* r6 */
{ 0x28, 32 }, // r7 { 0x28, 32 }, /* r7 */
{ 0x2c, 32 }, // r8 { 0x2c, 32 }, /* r8 */
{ 0x30, 32 }, // r9 { 0x30, 32 }, /* r9 */
{ 0x34, 32 }, // r10 { 0x34, 32 }, /* r10 */
{ 0x38, 32 }, // r11 { 0x38, 32 }, /* r11 */
{ 0x3c, 32 }, // r12 { 0x3c, 32 }, /* r12 */
{ -2, 32 }, // sp { -2, 32 }, /* sp */
{ -1, 32 }, // lr { -1, 32 }, /* lr */
{ 0x40, 32 }, // pc { 0x40, 32 }, /* pc */
{ -1, 96 }, // FPA1 { -1, 96 }, /* FPA1 */
{ -1, 96 }, // FPA2 { -1, 96 }, /* FPA2 */
{ -1, 96 }, // FPA3 { -1, 96 }, /* FPA3 */
{ -1, 96 }, // FPA4 { -1, 96 }, /* FPA4 */
{ -1, 96 }, // FPA5 { -1, 96 }, /* FPA5 */
{ -1, 96 }, // FPA6 { -1, 96 }, /* FPA6 */
{ -1, 96 }, // FPA7 { -1, 96 }, /* FPA7 */
{ -1, 96 }, // FPA8 { -1, 96 }, /* FPA8 */
{ -1, 32 }, // FPS { -1, 32 }, /* FPS */
{ -1, 32 }, // xPSR { -1, 32 }, /* xPSR */
}; };
const struct rtos_register_stacking rtos_eCos_Cortex_M3_stacking = const struct rtos_register_stacking rtos_eCos_Cortex_M3_stacking =
{ {
0x44, // stack_registers_size 0x44, /* stack_registers_size */
-1, // stack_growth_direction -1, /* stack_growth_direction */
26, // num_output_registers 26, /* num_output_registers */
rtos_eCos_Cortex_M3_stack_offsets // register_offsets 8, /* stack_alignment */
rtos_eCos_Cortex_M3_stack_offsets /* register_offsets */
}; };

63
src/rtos/rtos_standard_stackings.c
View File

@ -24,42 +24,43 @@
#include "rtos.h" #include "rtos.h"
static const struct stack_register_offset rtos_standard_Cortex_M3_stack_offsets [] = static const struct stack_register_offset rtos_standard_Cortex_M3_stack_offsets[] = {
{ { 0x20, 32 }, // r0 { 0x20, 32 }, /* r0 */
{ 0x24, 32 }, // r1 { 0x24, 32 }, /* r1 */
{ 0x28, 32 }, // r2 { 0x28, 32 }, /* r2 */
{ 0x2c, 32 }, // r3 { 0x2c, 32 }, /* r3 */
{ 0x00, 32 }, // r4 { 0x00, 32 }, /* r4 */
{ 0x04, 32 }, // r5 { 0x04, 32 }, /* r5 */
{ 0x08, 32 }, // r6 { 0x08, 32 }, /* r6 */
{ 0x0c, 32 }, // r7 { 0x0c, 32 }, /* r7 */
{ 0x10, 32 }, // r8 { 0x10, 32 }, /* r8 */
{ 0x14, 32 }, // r9 { 0x14, 32 }, /* r9 */
{ 0x18, 32 }, // r10 { 0x18, 32 }, /* r10 */
{ 0x1c, 32 }, // r11 { 0x1c, 32 }, /* r11 */
{ 0x30, 32 }, // r12 { 0x30, 32 }, /* r12 */
{ -2, 32 }, // sp { -2, 32 }, /* sp */
{ 0x34, 32 }, // lr { 0x34, 32 }, /* lr */
{ 0x38, 32 }, // pc { 0x38, 32 }, /* pc */
{ -1, 96 }, // FPA1 { -1, 96 }, /* FPA1 */
{ -1, 96 }, // FPA2 { -1, 96 }, /* FPA2 */
{ -1, 96 }, // FPA3 { -1, 96 }, /* FPA3 */
{ -1, 96 }, // FPA4 { -1, 96 }, /* FPA4 */
{ -1, 96 }, // FPA5 { -1, 96 }, /* FPA5 */
{ -1, 96 }, // FPA6 { -1, 96 }, /* FPA6 */
{ -1, 96 }, // FPA7 { -1, 96 }, /* FPA7 */
{ -1, 96 }, // FPA8 { -1, 96 }, /* FPA8 */
{ -1, 32 }, // FPS { -1, 32 }, /* FPS */
{ 0x3c, 32 }, // xPSR { 0x3c, 32 }, /* xPSR */
}; };
const struct rtos_register_stacking rtos_standard_Cortex_M3_stacking = const struct rtos_register_stacking rtos_standard_Cortex_M3_stacking =
{ {
0x40, // stack_registers_size 0x40, /* stack_registers_size */
-1, // stack_growth_direction -1, /* stack_growth_direction */
26, // num_output_registers 26, /* num_output_registers */
rtos_standard_Cortex_M3_stack_offsets // register_offsets 8, /* stack_alignment */
rtos_standard_Cortex_M3_stack_offsets /* register_offsets */
}; };