diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-11-29 13:58:53 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-11-29 13:58:53 +0000 |
| commit | 9309e47377f9d4d2a0c36dc2aa01fcbbaf030941 (patch) | |
| tree | 1725a5025decf0826eda016ccd73b6004c697f05 /nuttx/arch/arm/src | |
| parent | b8f93281beadfbf699e5b09e172b786b86d204f9 (diff) | |
| download | px4-nuttx-9309e47377f9d4d2a0c36dc2aa01fcbbaf030941.tar.gz px4-nuttx-9309e47377f9d4d2a0c36dc2aa01fcbbaf030941.tar.bz2 px4-nuttx-9309e47377f9d4d2a0c36dc2aa01fcbbaf030941.zip | |
Patches for NSH disable background, and ARMv7M assembly from Freddie Chopin
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5398 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/arch/arm/src')
| -rw-r--r-- | nuttx/arch/arm/src/armv7-m/up_exception.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nuttx/arch/arm/src/armv7-m/up_exception.S b/nuttx/arch/arm/src/armv7-m/up_exception.S index 31d8dbb0c..c9f216027 100644 --- a/nuttx/arch/arm/src/armv7-m/up_exception.S +++ b/nuttx/arch/arm/src/armv7-m/up_exception.S @@ -134,9 +134,9 @@ exception_common: #if CONFIG_ARCH_INTERRUPTSTACK > 3 ldr sp, =g_intstackbase - push r1 /* Save the MSP on the interrupt stack */ + push {r1} /* Save the MSP on the interrupt stack */ bl up_doirq /* R0=IRQ, R1=register save area on stack */ - pop r1 /* Recover R1=main stack pointer */ + pop {r1} /* Recover R1=main stack pointer */ #else msr msp, r1 /* We are using the main stack pointer */ bl up_doirq /* R0=IRQ, R1=register save area on stack */ |