From 00143c4401c327695a7c411f4bff9df2c471e9f0 Mon Sep 17 00:00:00 2001 From: patacongo Date: Tue, 26 Feb 2013 20:53:21 +0000 Subject: [PATCH] Cortex-M0/NUC120 now passes OS test; calibration NuTiny-NUC120 delay loop git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5677 42af7a65-404d-4744-a932-0658087f49c3 --- arch/arm/src/armv6-m/vfork.S | 5 ++--- arch/arm/src/common/up_vfork.c | 7 ++++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/arm/src/armv6-m/vfork.S b/arch/arm/src/armv6-m/vfork.S index 0e9b9790df..112d2d88da 100644 --- a/arch/arm/src/armv6-m/vfork.S +++ b/arch/arm/src/armv6-m/vfork.S @@ -119,9 +119,8 @@ vfork: mov r6, r10 mov r7, fp stmia r1!, {r4-r7} /* Save r8-r10 and fp in the structure */ - str r0, [r1, #0] /* Save the stack pointer in the structure */ - mov r0, r14 /* Copy lr to a low registers */ - str r0, [r1, #0] /* Save the stack pointer in the structure */ + mov r5, lr /* Copy lr to a low register */ + stmia r1!, {r0,r5} /* Save sp and lr in the structure */ /* Then, call up_vfork(), passing it a pointer to the stack structure */ diff --git a/arch/arm/src/common/up_vfork.c b/arch/arm/src/common/up_vfork.c index a6fe6c8731..6340cb3b8a 100644 --- a/arch/arm/src/common/up_vfork.c +++ b/arch/arm/src/common/up_vfork.c @@ -134,11 +134,12 @@ pid_t up_vfork(const struct vfork_s *context) uint32_t stackutil; int ret; - svdbg("r4:%08x r5:%08x r6:%08x r7:%08x\n", + svdbg("vfork context [%p]:\n", context); + svdbg(" r4:%08x r5:%08x r6:%08x r7:%08x\n", context->r4, context->r5, context->r6, context->r7); - svdbg("r8:%08x r9:%08x r10:%08x\n", + svdbg(" r8:%08x r9:%08x r10:%08x\n", context->r8, context->r9, context->r10); - svdbg("fp:%08x sp:%08x lr:%08x\n", + svdbg(" fp:%08x sp:%08x lr:%08x\n", context->fp, context->sp, context->lr); /* Allocate and initialize a TCB for the child task. */