summaryrefslogtreecommitdiffstats
path: root/nuttx/arch
diff options
context:
space:
mode:
authorpatacongo <patacongo@7fd9a85b-ad96-42d3-883c-3090e2eb8679>2011-04-08 03:54:17 +0000
committerpatacongo <patacongo@7fd9a85b-ad96-42d3-883c-3090e2eb8679>2011-04-08 03:54:17 +0000
commit789ce8e8ce7da989bc7911143e9737ed2cc3957e (patch)
treeac51801a1589a0bee815abcee5c66f34c53a590e /nuttx/arch
parentb6d01fa79d26709eebdd36155eee798444743de3 (diff)
Fix error introduced in last commit
git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@3481 7fd9a85b-ad96-42d3-883c-3090e2eb8679
Diffstat (limited to 'nuttx/arch')
-rw-r--r--nuttx/arch/arm/src/lm3s/lm3s_vectors.S4
-rwxr-xr-xnuttx/arch/arm/src/lpc17xx/lpc17_vectors.S4
-rwxr-xr-xnuttx/arch/arm/src/sam3u/sam3u_vectors.S4
-rw-r--r--nuttx/arch/arm/src/stm32/stm32_vectors.S4
4 files changed, 8 insertions, 8 deletions
diff --git a/nuttx/arch/arm/src/lm3s/lm3s_vectors.S b/nuttx/arch/arm/src/lm3s/lm3s_vectors.S
index 90f2850af1..87d995b29b 100644
--- a/nuttx/arch/arm/src/lm3s/lm3s_vectors.S
+++ b/nuttx/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/nuttx/arch/arm/src/lpc17xx/lpc17_vectors.S b/nuttx/arch/arm/src/lpc17xx/lpc17_vectors.S
index 4cfa9a3ce5..75eb71f17f 100755
--- a/nuttx/arch/arm/src/lpc17xx/lpc17_vectors.S
+++ b/nuttx/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/nuttx/arch/arm/src/sam3u/sam3u_vectors.S b/nuttx/arch/arm/src/sam3u/sam3u_vectors.S
index c4ab12ba01..7e7ad188ee 100755
--- a/nuttx/arch/arm/src/sam3u/sam3u_vectors.S
+++ b/nuttx/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/nuttx/arch/arm/src/stm32/stm32_vectors.S b/nuttx/arch/arm/src/stm32/stm32_vectors.S
index 908dc5b440..60f08b375b 100644
--- a/nuttx/arch/arm/src/stm32/stm32_vectors.S
+++ b/nuttx/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