From a9f2c6fa8ae6936da9489e4acf2a2d2cd6c0f664 Mon Sep 17 00:00:00 2001
From: patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>
Date: Mon, 7 Jan 2013 23:50:25 +0000
Subject: [PATCH] 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
---
 apps/examples/ostest/vfork.c         | 6 ------
 nuttx/arch/arm/src/arm/vfork.S       | 3 ++-
 nuttx/arch/arm/src/armv7-m/vfork.S   | 3 ++-
 nuttx/arch/arm/src/common/up_vfork.c | 2 +-
 4 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/apps/examples/ostest/vfork.c b/apps/examples/ostest/vfork.c
index 8657f0cebc..4e1b8c8925 100644
--- a/apps/examples/ostest/vfork.c
+++ b/apps/examples/ostest/vfork.c
@@ -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
  ****************************************************************************/
diff --git a/nuttx/arch/arm/src/arm/vfork.S b/nuttx/arch/arm/src/arm/vfork.S
index b498fd7f70..226d9f7de4 100644
--- a/nuttx/arch/arm/src/arm/vfork.S
+++ b/nuttx/arch/arm/src/arm/vfork.S
@@ -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
diff --git a/nuttx/arch/arm/src/armv7-m/vfork.S b/nuttx/arch/arm/src/armv7-m/vfork.S
index 0d9e144cdf..386fca33c4 100644
--- a/nuttx/arch/arm/src/armv7-m/vfork.S
+++ b/nuttx/arch/arm/src/armv7-m/vfork.S
@@ -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
diff --git a/nuttx/arch/arm/src/common/up_vfork.c b/nuttx/arch/arm/src/common/up_vfork.c
index 3da6026797..5349378bc4 100644
--- a/nuttx/arch/arm/src/common/up_vfork.c
+++ b/nuttx/arch/arm/src/common/up_vfork.c
@@ -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;