X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Frtos%2Frtos_embkernel_stackings.c;h=df1fc51f2919f26668e6f8353c231d89ebb4b735;hb=d1a5921ce8393015119a154bec78d27d11dd1224;hp=2a306295540405031c6284e0febf4c5a38f59612;hpb=d0e763ac7ef6aa17b17bd00ccdfbccfb4eacda69;p=fw%2Fopenocd

diff --git a/src/rtos/rtos_embkernel_stackings.c b/src/rtos/rtos_embkernel_stackings.c
index 2a3062955..df1fc51f2 100644
--- a/src/rtos/rtos_embkernel_stackings.c
+++ b/src/rtos/rtos_embkernel_stackings.c
@@ -24,32 +24,30 @@
 #include "target/armv7m.h"
 #include "rtos_standard_stackings.h"
 
-static const struct stack_register_offset rtos_embkernel_Cortex_M_stack_offsets[ARMV7M_NUM_CORE_REGS] = {
-	{ 0x24, 32 },		/* r0   */
-	{ 0x28, 32 },		/* r1   */
-	{ 0x2c, 32 },		/* r2   */
-	{ 0x30, 32 },		/* r3   */
-	{ 0x00, 32 },		/* r4   */
-	{ 0x04, 32 },		/* r5   */
-	{ 0x08, 32 },		/* r6   */
-	{ 0x0c, 32 },		/* r7   */
-	{ 0x10, 32 },		/* r8   */
-	{ 0x14, 32 },		/* r9   */
-	{ 0x18, 32 },		/* r10  */
-	{ 0x1c, 32 },		/* r11  */
-	{ 0x34, 32 },		/* r12  */
-	{ -2, 32 },		    /* sp   */
-	{ 0x38, 32 },		/* lr   */
-	{ 0x3c, 32 },		/* pc   */
-	{ 0x40, 32 },		/* xPSR */
+static const struct stack_register_offset rtos_embkernel_cortex_m_stack_offsets[ARMV7M_NUM_CORE_REGS] = {
+	{ ARMV7M_R0,   0x24, 32 },		/* r0   */
+	{ ARMV7M_R1,   0x28, 32 },		/* r1   */
+	{ ARMV7M_R2,   0x2c, 32 },		/* r2   */
+	{ ARMV7M_R3,   0x30, 32 },		/* r3   */
+	{ ARMV7M_R4,   0x00, 32 },		/* r4   */
+	{ ARMV7M_R5,   0x04, 32 },		/* r5   */
+	{ ARMV7M_R6,   0x08, 32 },		/* r6   */
+	{ ARMV7M_R7,   0x0c, 32 },		/* r7   */
+	{ ARMV7M_R8,   0x10, 32 },		/* r8   */
+	{ ARMV7M_R9,   0x14, 32 },		/* r9   */
+	{ ARMV7M_R10,  0x18, 32 },		/* r10  */
+	{ ARMV7M_R11,  0x1c, 32 },		/* r11  */
+	{ ARMV7M_R12,  0x34, 32 },		/* r12  */
+	{ ARMV7M_R13,  -2,   32 },	    /* sp   */
+	{ ARMV7M_R14,  0x38, 32 },		/* lr   */
+	{ ARMV7M_PC,   0x3c, 32 },		/* pc   */
+	{ ARMV7M_xPSR, 0x40, 32 },		/* xPSR */
 };
 
-const struct rtos_register_stacking rtos_embkernel_Cortex_M_stacking = {
-	0x40,					/* stack_registers_size */
-	-1,						/* stack_growth_direction */
-	ARMV7M_NUM_CORE_REGS,	/* num_output_registers */
-	rtos_generic_stack_align8,	/* stack_alignment */
-	rtos_embkernel_Cortex_M_stack_offsets	/* register_offsets */
+const struct rtos_register_stacking rtos_embkernel_cortex_m_stacking = {
+	.stack_registers_size = 0x40,
+	.stack_growth_direction = -1,
+	.num_output_registers = ARMV7M_NUM_CORE_REGS,
+	.calculate_process_stack = rtos_generic_stack_align8,
+	.register_offsets = rtos_embkernel_cortex_m_stack_offsets
 };
-
-