Merge branch 'main' into m3_mpu

aggarg · Jan 29, 2024 · 3095eaf · 3095eaf
2 parents f383651 + 1860c9a
commit 3095eaf
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/portable/GCC/MSP430F449/port.c b/portable/GCC/MSP430F449/port.c
@@ -183,16 +183,23 @@ StackType_t * pxPortInitialiseStack( StackType_t * pxTopOfStack,
     pxTopOfStack--;
     *pxTopOfStack = ( StackType_t ) 0xbbbb;
     pxTopOfStack--;
+#ifdef __MSPGCC__
     *pxTopOfStack = ( StackType_t ) 0xcccc;
+#else
+    /* The MSP430 EABI expects the function parameter in R12. */
+    *pxTopOfStack = ( StackType_t ) pvParameters;
+#endif
     pxTopOfStack--;
     *pxTopOfStack = ( StackType_t ) 0xdddd;
     pxTopOfStack--;
     *pxTopOfStack = ( StackType_t ) 0xeeee;
     pxTopOfStack--;
-
-    /* When the task starts is will expect to find the function parameter in
-     * R15. */
+#ifdef __MSPGCC__
+    /* The mspgcc ABI expects the function parameter in R15. */
     *pxTopOfStack = ( StackType_t ) pvParameters;
+#else
+    *pxTopOfStack = ( StackType_t ) 0xffff;
+#endif
     pxTopOfStack--;
 
     /* The code generated by the mspgcc compiler does not maintain separate