rusefi
/
ChibiOS
mirror of https://github.com/rusefi/ChibiOS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed initial stack setup. 

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@15361 27425a3e-05d8-49a3-a47f-9c15f0e5edd8
This commit is contained in:
Giovanni Di Sirio 2022-01-15 18:00:49 +00:00
parent 35c733568a
commit 62ea184237
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
os/sb/host/sbhost.c
View File

@ -263,10 +263,10 @@ thread_t *sbStartThread(sb_class_t *sbp, const char *name,
/* Allocating space for parameters.*/ /* Allocating space for parameters.*/
if (MEM_IS_ALIGNED(usp, PORT_STACK_ALIGN)) { if (MEM_IS_ALIGNED(usp, PORT_STACK_ALIGN)) {
parsize = sizeof (int) + sizeof (const char **) + sizeof (const char **) + sizeof (int); parsize = sizeof (uint32_t) * 4;
} }
else { else {
parsize = sizeof (const char **) + sizeof (const char **) + sizeof (int); parsize = sizeof (uint32_t) * 5;
} }
PUSHSPACE(usp, parsize); PUSHSPACE(usp, parsize);
@ -279,6 +279,7 @@ thread_t *sbStartThread(sb_class_t *sbp, const char *name,
/* Initializing stack.*/ /* Initializing stack.*/
sb_strv_copy(envp, uenvp, uenvc); sb_strv_copy(envp, uenvp, uenvc);
sb_strv_copy(argv, uargv, uargc); sb_strv_copy(argv, uargv, uargc);
*((uint32_t *)usp + 4) = (uint32_t)0x55555555;
*((uint32_t *)usp + 2) = (uint32_t)uenvp; *((uint32_t *)usp + 2) = (uint32_t)uenvp;
*((uint32_t *)usp + 1) = (uint32_t)uargv; *((uint32_t *)usp + 1) = (uint32_t)uargv;
*((uint32_t *)usp + 0) = (uint32_t)uargc; *((uint32_t *)usp + 0) = (uint32_t)uargc;
@ -364,10 +365,10 @@ msg_t sbExec(sb_class_t *sbp, const char *pathname,
/* Allocating space for parameters.*/ /* Allocating space for parameters.*/
if (MEM_IS_ALIGNED(usp, PORT_STACK_ALIGN)) { if (MEM_IS_ALIGNED(usp, PORT_STACK_ALIGN)) {
parsize = sizeof (int) + sizeof (const char **) + sizeof (const char **) + sizeof (int); parsize = sizeof (uint32_t) * 4;
} }
else { else {
parsize = sizeof (const char **) + sizeof (const char **) + sizeof (int); parsize = sizeof (uint32_t) * 5;
} }
PUSHSPACE(usp, parsize); PUSHSPACE(usp, parsize);
@ -384,6 +385,7 @@ msg_t sbExec(sb_class_t *sbp, const char *pathname,
/* Initializing stack.*/ /* Initializing stack.*/
sb_strv_copy(envp, uenvp, uenvc); sb_strv_copy(envp, uenvp, uenvc);
sb_strv_copy(argv, uargv, uargc); sb_strv_copy(argv, uargv, uargc);
*((uint32_t *)usp + 4) = (uint32_t)0x55555555;
*((uint32_t *)usp + 2) = (uint32_t)uenvp; *((uint32_t *)usp + 2) = (uint32_t)uenvp;
*((uint32_t *)usp + 1) = (uint32_t)uargv; *((uint32_t *)usp + 1) = (uint32_t)uargv;
*((uint32_t *)usp + 0) = (uint32_t)uargc; *((uint32_t *)usp + 0) = (uint32_t)uargc;