X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Frtos%2Frtos_standard_stackings.c;h=6b00cb754f2828ebb415c95bbaa03aed299d4ade;hb=26902bb317d1a5e7a7367e486b03580133ef3dd6;hp=278d3efe5fa9f63cb249e0eb0ac656443d8a14a5;hpb=ce3760c7e803824707e06615975d5a0d7684d26c;p=openocd.git

diff --git a/src/rtos/rtos_standard_stackings.c b/src/rtos/rtos_standard_stackings.c
index 278d3efe5f..6b00cb754f 100644
--- a/src/rtos/rtos_standard_stackings.c
+++ b/src/rtos/rtos_standard_stackings.c
@@ -25,42 +25,77 @@
 #include "rtos.h"
 
 static const struct stack_register_offset rtos_standard_Cortex_M3_stack_offsets[] = {
-	{ 0x20, 32 },       /* r0   */
-	{ 0x24, 32 },       /* r1   */
-	{ 0x28, 32 },       /* r2   */
-	{ 0x2c, 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  */
-	{ 0x30, 32 },       /* r12  */
-	{ -2,   32 },       /* sp   */
-	{ 0x34, 32 },       /* lr   */
-	{ 0x38, 32 },       /* pc   */
-	{ -1,   96 },       /* FPA1 */
-	{ -1,   96 },       /* FPA2 */
-	{ -1,   96 },       /* FPA3 */
-	{ -1,   96 },       /* FPA4 */
-	{ -1,   96 },       /* FPA5 */
-	{ -1,   96 },       /* FPA6 */
-	{ -1,   96 },       /* FPA7 */
-	{ -1,   96 },       /* FPA8 */
-	{ -1,   32 },       /* FPS  */
-	{ 0x3c, 32 },       /* xPSR */
+	{ 0x20, 32 },		/* r0   */
+	{ 0x24, 32 },		/* r1   */
+	{ 0x28, 32 },		/* r2   */
+	{ 0x2c, 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  */
+	{ 0x30, 32 },		/* r12  */
+	{ -2,   32 },		/* sp   */
+	{ 0x34, 32 },		/* lr   */
+	{ 0x38, 32 },		/* pc   */
+	{ -1,   96 },		/* FPA1 */
+	{ -1,   96 },		/* FPA2 */
+	{ -1,   96 },		/* FPA3 */
+	{ -1,   96 },		/* FPA4 */
+	{ -1,   96 },		/* FPA5 */
+	{ -1,   96 },		/* FPA6 */
+	{ -1,   96 },		/* FPA7 */
+	{ -1,   96 },		/* FPA8 */
+	{ -1,   32 },		/* FPS  */
+	{ 0x3c, 32 },		/* xPSR */
 };
 
 
-const struct rtos_register_stacking rtos_standard_Cortex_M3_stacking =
-{
-	0x40,                                 /* stack_registers_size */
-	-1,                                   /* stack_growth_direction */
-	26,                                   /* num_output_registers */
-	8,                                    /* stack_alignment */
-	rtos_standard_Cortex_M3_stack_offsets /* register_offsets */
+static const struct stack_register_offset rtos_standard_Cortex_R4_stack_offsets[] = {
+	{ 0x08, 32 },		/* r0  (a1)   */
+	{ 0x0c, 32 },		/* r1  (a2)  */
+	{ 0x10, 32 },		/* r2  (a3)  */
+	{ 0x14, 32 },		/* r3  (a4)  */
+	{ 0x18, 32 },		/* r4  (v1)  */
+	{ 0x1c, 32 },		/* r5  (v2)  */
+	{ 0x20, 32 },		/* r6  (v3)  */
+	{ 0x24, 32 },		/* r7  (v4)  */
+	{ 0x28, 32 },		/* r8  (a1)  */
+	{ 0x2c, 32 },		/* r9  (sb)  */
+	{ 0x30, 32 },		/* r10 (sl) */
+	{ 0x34, 32 },		/* r11 (fp) */
+	{ 0x38, 32 },		/* r12 (ip) */
+	{ -2,   32 },		/* sp   */
+	{ 0x3c, 32 },		/* lr   */
+	{ 0x40, 32 },		/* pc   */
+	{ -1,   96 },		/* FPA1 */
+	{ -1,   96 },		/* FPA2 */
+	{ -1,   96 },		/* FPA3 */
+	{ -1,   96 },		/* FPA4 */
+	{ -1,   96 },		/* FPA5 */
+	{ -1,   96 },		/* FPA6 */
+	{ -1,   96 },		/* FPA7 */
+	{ -1,   96 },		/* FPA8 */
+	{ -1,   32 },		/* FPS  */
+	{ 0x04, 32 },		/* CSPR */
+};
+
+const struct rtos_register_stacking rtos_standard_Cortex_M3_stacking = {
+	0x40,					/* stack_registers_size */
+	-1,					/* stack_growth_direction */
+	26,					/* num_output_registers */
+	8,					/* stack_alignment */
+	rtos_standard_Cortex_M3_stack_offsets	/* register_offsets */
 };
 
 
+const struct rtos_register_stacking rtos_standard_Cortex_R4_stacking = {
+	0x48,					/* stack_registers_size */
+	-1,					/* stack_growth_direction */
+	26,					/* num_output_registers */
+	8,					/* stack_alignment */
+	rtos_standard_Cortex_R4_stack_offsets	/* register_offsets */
+};