sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix interrupt stack compilation problem

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@2804 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2010-07-16 02:58:42 +00:00
parent be4968d840
commit 8a753e002b
4 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
arch/arm/src/lm3s/lm3s_vectors.S
View File

@ -377,7 +377,7 @@ lm3s_irqcommon:
*/ */
#ifdef CONFIG_ARCH_INTERRUPTSTACK #ifdef CONFIG_ARCH_INTERRUPTSTACK
ld sp, #up_interruptstack_base ldr sp, =g_intstackbase
str r1, [sp, #-4]! /* Save the MSP on the interrupt stack */ str r1, [sp, #-4]! /* Save the MSP on the interrupt stack */
bl up_doirq /* R0=IRQ, R1=register save (msp) */ bl up_doirq /* R0=IRQ, R1=register save (msp) */
ldr r1, [sp, #+4]! /* Recover R1=main stack pointer */ ldr r1, [sp, #+4]! /* Recover R1=main stack pointer */
@ -431,7 +431,7 @@ lm3s_irqcommon:
.size handlers, .-handlers .size handlers, .-handlers
/************************************************************************************ /************************************************************************************
* Name: up_interruptstack/g_userstack * Name: up_interruptstack/g_intstackbase
* *
* Description: * Description:
* Shouldn't happen * Shouldn't happen
@ -440,10 +440,11 @@ lm3s_irqcommon:
#if CONFIG_ARCH_INTERRUPTSTACK > 3 #if CONFIG_ARCH_INTERRUPTSTACK > 3
.bss .bss
.global g_intstackbase
.align 4 .align 4
up_interruptstack: up_interruptstack:
.skip (CONFIG_ARCH_INTERRUPTSTACK & ~3) .skip (CONFIG_ARCH_INTERRUPTSTACK & ~3)
up_interruptstack_base: g_intstackbase:
.size up_interruptstack, .-up_interruptstack .size up_interruptstack, .-up_interruptstack
#endif #endif

9
arch/arm/src/lpc17xx/lpc17_vectors.S
View File

@ -255,8 +255,8 @@ lpc17_common:
* Otherwise, we will re-use the main stack for interrupt level processing. * Otherwise, we will re-use the main stack for interrupt level processing.
*/ */
#ifdef CONFIG_ARCH_INTERRUPTSTACK #if CONFIG_ARCH_INTERRUPTSTACK > 3
ld sp, #up_interruptstack_base ldr sp, =g_intstackbase
str r1, [sp, #-4]! /* Save the MSP on the interrupt stack */ str r1, [sp, #-4]! /* Save the MSP on the interrupt stack */
bl up_doirq /* R0=IRQ, R1=register save (msp) */ bl up_doirq /* R0=IRQ, R1=register save (msp) */
ldr r1, [sp, #+4]! /* Recover R1=main stack pointer */ ldr r1, [sp, #+4]! /* Recover R1=main stack pointer */
@ -310,7 +310,7 @@ lpc17_common:
.size handlers, .-handlers .size handlers, .-handlers
/************************************************************************************************ /************************************************************************************************
* Name: up_interruptstack/g_userstack * Name: up_interruptstack/g_intstackbase
* *
* Description: * Description:
* Shouldn't happen * Shouldn't happen
@ -319,10 +319,11 @@ lpc17_common:
#if CONFIG_ARCH_INTERRUPTSTACK > 3 #if CONFIG_ARCH_INTERRUPTSTACK > 3
.bss .bss
.global g_intstackbase
.align 4 .align 4
up_interruptstack: up_interruptstack:
.skip (CONFIG_ARCH_INTERRUPTSTACK & ~3) .skip (CONFIG_ARCH_INTERRUPTSTACK & ~3)
up_interruptstack_base: g_intstackbase:
.size up_interruptstack, .-up_interruptstack .size up_interruptstack, .-up_interruptstack
#endif #endif

7
arch/arm/src/sam3u/sam3u_vectors.S
View File

@ -247,7 +247,7 @@ sam3u_common:
*/ */
#ifdef CONFIG_ARCH_INTERRUPTSTACK #ifdef CONFIG_ARCH_INTERRUPTSTACK
ld sp, #up_interruptstack_base ldr sp, =g_intstackbase
str r1, [sp, #-4]! /* Save the MSP on the interrupt stack */ str r1, [sp, #-4]! /* Save the MSP on the interrupt stack */
bl up_doirq /* R0=IRQ, R1=register save (msp) */ bl up_doirq /* R0=IRQ, R1=register save (msp) */
ldr r1, [sp, #+4]! /* Recover R1=main stack pointer */ ldr r1, [sp, #+4]! /* Recover R1=main stack pointer */
@ -301,7 +301,7 @@ sam3u_common:
.size handlers, .-handlers .size handlers, .-handlers
/************************************************************************************************ /************************************************************************************************
* Name: up_interruptstack/g_userstack * Name: up_interruptstack/g_intstackbase
* *
* Description: * Description:
* Shouldn't happen * Shouldn't happen
@ -310,10 +310,11 @@ sam3u_common:
#if CONFIG_ARCH_INTERRUPTSTACK > 3 #if CONFIG_ARCH_INTERRUPTSTACK > 3
.bss .bss
.global g_intstackbase
.align 4 .align 4
up_interruptstack: up_interruptstack:
.skip (CONFIG_ARCH_INTERRUPTSTACK & ~3) .skip (CONFIG_ARCH_INTERRUPTSTACK & ~3)
up_interruptstack_base: g_intstackbase:
.size up_interruptstack, .-up_interruptstack .size up_interruptstack, .-up_interruptstack
#endif #endif

9
arch/arm/src/stm32/stm32_vectors.S
View File

@ -2,7 +2,7 @@
* arch/arm/src/stm32/stm32_vectors.S * arch/arm/src/stm32/stm32_vectors.S
* arch/arm/src/chip/stm32_vectors.S * arch/arm/src/chip/stm32_vectors.S
* *
* Copyright (C) 2009 Gregory Nutt. All rights reserved. * Copyright (C) 2009-2010 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr> * Author: Gregory Nutt <spudmonkey@racsa.co.cr>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -439,7 +439,7 @@ stm32_common:
*/ */
#ifdef CONFIG_ARCH_INTERRUPTSTACK #ifdef CONFIG_ARCH_INTERRUPTSTACK
ld sp, #up_interruptstack_base ldr sp, =g_intstackbase
str r1, [sp, #-4]! /* Save the MSP on the interrupt stack */ str r1, [sp, #-4]! /* Save the MSP on the interrupt stack */
bl up_doirq /* R0=IRQ, R1=register save (msp) */ bl up_doirq /* R0=IRQ, R1=register save (msp) */
ldr r1, [sp, #+4]! /* Recover R1=main stack pointer */ ldr r1, [sp, #+4]! /* Recover R1=main stack pointer */
@ -493,7 +493,7 @@ stm32_common:
.size handlers, .-handlers .size handlers, .-handlers
/************************************************************************************ /************************************************************************************
* Name: up_interruptstack/g_userstack * Name: up_interruptstack/g_intstackbase
* *
* Description: * Description:
* Shouldn't happen * Shouldn't happen
@ -502,10 +502,11 @@ stm32_common:
#if CONFIG_ARCH_INTERRUPTSTACK > 3 #if CONFIG_ARCH_INTERRUPTSTACK > 3
.bss .bss
.global g_intstackbase
.align 4 .align 4
up_interruptstack: up_interruptstack:
.skip (CONFIG_ARCH_INTERRUPTSTACK & ~3) .skip (CONFIG_ARCH_INTERRUPTSTACK & ~3)
up_interruptstack_base: g_intstackbase:
.size up_interruptstack, .-up_interruptstack .size up_interruptstack, .-up_interruptstack
#endif #endif