X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Frtos%2Frtos_chibios_stackings.c;h=ed485616d3ba16401a82ba38e24446a95be9ddd8;hb=6819468a78ce9f0835a9063d93bc839f3d55eb84;hp=bb92f651eb9571478d56e3a622b4cb52c8876369;hpb=08d4411b59dd8bd0e7d8009003b71d23acbf6eee;p=fw%2Fopenocd

diff --git a/src/rtos/rtos_chibios_stackings.c b/src/rtos/rtos_chibios_stackings.c
index bb92f651e..ed485616d 100644
--- a/src/rtos/rtos_chibios_stackings.c
+++ b/src/rtos/rtos_chibios_stackings.c
@@ -26,8 +26,9 @@
 #endif
 
 #include "rtos.h"
+#include "target/armv7m.h"
 
-static const struct stack_register_offset rtos_chibios_arm_v7m_stack_offsets[] = {
+static const struct stack_register_offset rtos_chibios_arm_v7m_stack_offsets[ARMV7M_NUM_CORE_REGS] = {
 	{ -1,   32 },		/* r0   */
 	{ -1,   32 },		/* r1   */
 	{ -1,   32 },		/* r2   */
@@ -44,22 +45,41 @@ static const struct stack_register_offset rtos_chibios_arm_v7m_stack_offsets[] =
 	{ -2,   32 },		/* sp   */
 	{ -1,   32 },		/* lr   */
 	{ 0x20, 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  */
 	{ -1,   32 },		/* xPSR */
 };
 
 const struct rtos_register_stacking rtos_chibios_arm_v7m_stacking = {
 	0x24,					/* stack_registers_size */
-	-1,					/* stack_growth_direction */
-	26,					/* num_output_registers */
-	0,					/* stack_alignment */
+	-1,						/* stack_growth_direction */
+	ARMV7M_NUM_CORE_REGS,	/* num_output_registers */
+	0,						/* stack_alignment */
 	rtos_chibios_arm_v7m_stack_offsets	/* register_offsets */
 };
+
+static const struct stack_register_offset rtos_chibios_arm_v7m_stack_offsets_w_fpu[ARMV7M_NUM_CORE_REGS] = {
+	{ -1,   32 },		/* r0   */
+	{ -1,   32 },		/* r1   */
+	{ -1,   32 },		/* r2   */
+	{ -1,   32 },		/* r3   */
+	{ 0x40, 32 },		/* r4   */
+	{ 0x44, 32 },		/* r5   */
+	{ 0x48, 32 },		/* r6   */
+	{ 0x4c, 32 },		/* r7   */
+	{ 0x50, 32 },		/* r8   */
+	{ 0x54, 32 },		/* r9   */
+	{ 0x58, 32 },		/* r10  */
+	{ 0x5c, 32 },		/* r11  */
+	{ -1,   32 },		/* r12  */
+	{ -2,   32 },		/* sp   */
+	{ -1,   32 },		/* lr   */
+	{ 0x60, 32 },		/* pc   */
+	{ -1,   32 },		/* xPSR */
+};
+
+const struct rtos_register_stacking rtos_chibios_arm_v7m_stacking_w_fpu = {
+	0x64,										/* stack_registers_size */
+	-1,											/* stack_growth_direction */
+	ARMV7M_NUM_CORE_REGS,						/* num_output_registers */
+	0,											/* stack_alignment */
+	rtos_chibios_arm_v7m_stack_offsets_w_fpu	/* register_offsets */
+};