diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-02-22 18:14:18 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-02-22 18:14:18 +0000 |
| commit | dfb6261f45bb4a34b3fdfc10047c908534e0bee5 (patch) | |
| tree | 73105f0c26928d4c6992417ea780daa36c439549 /nuttx/arch/arm/src/armv7-m/up_svcall.c | |
| parent | 6e7deb2a77bcd3159a47328699e2c489238931b0 (diff) | |
| download | px4-nuttx-dfb6261f45bb4a34b3fdfc10047c908534e0bee5.tar.gz px4-nuttx-dfb6261f45bb4a34b3fdfc10047c908534e0bee5.tar.bz2 px4-nuttx-dfb6261f45bb4a34b3fdfc10047c908534e0bee5.zip | |
Incoporate new ARMv7-M exception handling logic contributed by Mike Smith
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4413 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/arch/arm/src/armv7-m/up_svcall.c')
| -rw-r--r-- | nuttx/arch/arm/src/armv7-m/up_svcall.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/nuttx/arch/arm/src/armv7-m/up_svcall.c b/nuttx/arch/arm/src/armv7-m/up_svcall.c index 85430c0ad..949efb1af 100644 --- a/nuttx/arch/arm/src/armv7-m/up_svcall.c +++ b/nuttx/arch/arm/src/armv7-m/up_svcall.c @@ -1,8 +1,8 @@ /**************************************************************************** * arch/arm/src/armv7-m/up_svcall.c * - * Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt <spudmonkey@racsa.co.cr> + * Copyright (C) 2009, 2011-2012 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt <gnutt@nuttx.org> * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -265,14 +265,14 @@ int up_svcall(int irq, FAR void *context) * R1 = saveregs * * In this case, we simply need to copy the current regsters to the - * save regiser space references in the saved R1 and return. + * save register space references in the saved R1 and return. */ case SYS_save_context: { DEBUGASSERT(regs[REG_R1] != 0); memcpy((uint32_t*)regs[REG_R1], regs, XCPTCONTEXT_SIZE); -#ifdef CONFIG_ARCH_FPU +#if defined(CONFIG_ARCH_FPU) && !defined(CONFIG_ARMV7M_CMNVECTOR) up_savefpu((uint32_t*)regs[REG_R1]); #endif } @@ -324,7 +324,7 @@ int up_svcall(int irq, FAR void *context) } break; - /* This is not an architecture-specify system call. If NuttX is built + /* This is not an architecture-specific system call. If NuttX is built * as a standalone kernel with a system call interface, then all of the * additional system calls must be handled as in the default case. */ |