sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed ARM vfork; re-enabled vfork OS test

Browse Source 
git-svn-id: svn://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 7408f8da44
commit 4ebf07ab45
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

2
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 *parent = (FAR _TCB *)g_readytorun.head;
_TCB *child; _TCB *child;