dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity

Fixed ARM vfork; re-enabled vfork OS test 

git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5490 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2013-01-07 23:50:25 +00:00
parent 5a9162f017
commit a9f2c6fa8a
4 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/examples/ostest/vfork.c
View File

@ -51,12 +51,6 @@
* Pre-processor Definitions
****************************************************************************/
/* Disabled this test for now. There are some issues with the vfork
* implementation.
*/
#undef CONFIG_ARCH_HAVE_VFORK
/****************************************************************************
* Private Data
****************************************************************************/

3
nuttx/arch/arm/src/arm/vfork.S
View File

@ -102,7 +102,7 @@
vfork:
/* Create a stack frame */
mov r0, sp /* Save the value of the stack frame on entry */
mov r0, sp /* Save the value of the stack on entry */
sub sp, sp, #VFORK_SIZEOF /* Allocate the structure on the stack */
/* Save the volatile registers */
@ -128,6 +128,7 @@ vfork:
/* Release the stack data and return the value returned by up_vfork */
ldr lr, [sp, #VFORK_LR_OFFSET]
add sp, sp, #VFORK_SIZEOF
mov pc, lr
.size vfork, .-vfork

3
nuttx/arch/arm/src/armv7-m/vfork.S
View File

@ -105,7 +105,7 @@
vfork:
/* Create a stack frame */
mov r0, sp /* Save the value of the stack frame on entry */
mov r0, sp /* Save the value of the stack on entry */
sub sp, sp, #VFORK_SIZEOF /* Allocate the structure on the stack */
/* Save the volatile registers */
@ -131,6 +131,7 @@ vfork:
/* Release the stack data and return the value returned by up_vfork */
ldr lr, [sp, #VFORK_LR_OFFSET]
add sp, sp, #VFORK_SIZEOF
bx lr
.size vfork, .-vfork

2
nuttx/arch/arm/src/common/up_vfork.c
View File

@ -124,7 +124,7 @@
*
****************************************************************************/
pid_t up_vfork(struct vfork_s *context)
pid_t up_vfork(const struct vfork_s *context)
{
_TCB *parent = (FAR _TCB *)g_readytorun.head;
_TCB *child;