From 94757a2ada12edf9c0a5cd0129f4cb892df206d1 Mon Sep 17 00:00:00 2001 From: patacongo Date: Fri, 8 Apr 2011 03:54:17 +0000 Subject: [PATCH] Fix error introduced in last commit git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3481 42af7a65-404d-4744-a932-0658087f49c3 --- arch/arm/src/lm3s/lm3s_vectors.S | 4 ++-- arch/arm/src/lpc17xx/lpc17_vectors.S | 4 ++-- arch/arm/src/sam3u/sam3u_vectors.S | 4 ++-- arch/arm/src/stm32/stm32_vectors.S | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/arch/arm/src/lm3s/lm3s_vectors.S b/arch/arm/src/lm3s/lm3s_vectors.S index 90f2850af1b..87d995b29b6 100644 --- a/arch/arm/src/lm3s/lm3s_vectors.S +++ b/arch/arm/src/lm3s/lm3s_vectors.S @@ -643,9 +643,9 @@ lm3s_irqcommon: */ 1: #ifdef CONFIG_NUTTX_KERNEL - ldmia r0, {r2-r11,r14} /* Recover R4-R11, r14 + 2 temp values */ + ldmia r1!, {r2-r11,r14} /* Recover R4-R11, r14 + 2 temp values */ #else - ldmia r0, {r2-r11} /* Recover R4-R11 + 2 temp values */ + ldmia r1!, {r2-r11} /* Recover R4-R11 + 2 temp values */ #endif 2: #ifdef CONFIG_NUTTX_KERNEL diff --git a/arch/arm/src/lpc17xx/lpc17_vectors.S b/arch/arm/src/lpc17xx/lpc17_vectors.S index 4cfa9a3ce52..75eb71f17fd 100755 --- a/arch/arm/src/lpc17xx/lpc17_vectors.S +++ b/arch/arm/src/lpc17xx/lpc17_vectors.S @@ -317,9 +317,9 @@ lpc17_common: */ 1: #ifdef CONFIG_NUTTX_KERNEL - ldmia r0, {r2-r11,r14} /* Recover R4-R11, r14 + 2 temp values */ + ldmia r1!, {r2-r11,r14} /* Recover R4-R11, r14 + 2 temp values */ #else - ldmia r0, {r2-r11} /* Recover R4-R11 + 2 temp values */ + ldmia r1!, {r2-r11} /* Recover R4-R11 + 2 temp values */ #endif 2: #ifdef CONFIG_NUTTX_KERNEL diff --git a/arch/arm/src/sam3u/sam3u_vectors.S b/arch/arm/src/sam3u/sam3u_vectors.S index c4ab12ba01f..7e7ad188eeb 100755 --- a/arch/arm/src/sam3u/sam3u_vectors.S +++ b/arch/arm/src/sam3u/sam3u_vectors.S @@ -308,9 +308,9 @@ sam3u_common: */ 1: #ifdef CONFIG_NUTTX_KERNEL - ldmia r0, {r2-r11,r14} /* Recover R4-R11, r14 + 2 temp values */ + ldmia r1!, {r2-r11,r14} /* Recover R4-R11, r14 + 2 temp values */ #else - ldmia r0, {r2-r11} /* Recover R4-R11 + 2 temp values */ + ldmia r1!, {r2-r11} /* Recover R4-R11 + 2 temp values */ #endif 2: #ifdef CONFIG_NUTTX_KERNEL diff --git a/arch/arm/src/stm32/stm32_vectors.S b/arch/arm/src/stm32/stm32_vectors.S index 908dc5b440d..60f08b375be 100644 --- a/arch/arm/src/stm32/stm32_vectors.S +++ b/arch/arm/src/stm32/stm32_vectors.S @@ -500,9 +500,9 @@ stm32_common: */ 1: #ifdef CONFIG_NUTTX_KERNEL - ldmia r0, {r2-r11,r14} /* Recover R4-R11, r14 + 2 temp values */ + ldmia r1!, {r2-r11,r14} /* Recover R4-R11, r14 + 2 temp values */ #else - ldmia r0, {r2-r11} /* Recover R4-R11 + 2 temp values */ + ldmia r1!, {r2-r11} /* Recover R4-R11 + 2 temp values */ #endif 2: #ifdef CONFIG_NUTTX_KERNEL