Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-05 07:12:54 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fix a duplicate label introduce in recent commit

Browse Source
This commit is contained in:
Gregory Nutt
2013-12-23 14:29:25 -06:00
parent 560ae31a99
commit 1c61bb0c53
5 changed files with 50 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/arm/src/kinetis/kinetis_vectors.S
+10 -8
View File
@@ -720,7 +720,7 @@ exception_common:
*/ */
cmp r0, r1 /* Context switch? */ cmp r0, r1 /* Context switch? */
beq 1f /* Branch if no context switch */ beq 2f /* Branch if no context switch */
/* We are returning with a pending context switch. /* We are returning with a pending context switch.
* *
@@ -756,7 +756,7 @@ exception_common:
#else #else
ldmia r0, {r2-r11} /* Recover R4-R11 + 2 temp values */ ldmia r0, {r2-r11} /* Recover R4-R11 + 2 temp values */
#endif #endif
b 2f /* Re-join common logic */ b 3f /* Re-join common logic */
/* We are returning with no context switch. We simply need to "unwind" /* We are returning with no context switch. We simply need to "unwind"
* the same stack frame that we created * the same stack frame that we created
@@ -764,7 +764,8 @@ exception_common:
* Here: * Here:
* r1 = Address of the return stack (same as r0) * r1 = Address of the return stack (same as r0)
*/ */
1:
2:
#ifdef CONFIG_NUTTX_KERNEL #ifdef CONFIG_NUTTX_KERNEL
ldmia r1!, {r2-r11,r14} /* Recover R4-R11, r14 + 2 temp values */ ldmia r1!, {r2-r11,r14} /* Recover R4-R11, r14 + 2 temp values */
#else #else
@@ -787,7 +788,8 @@ exception_common:
* r3 = primask or basepri * r3 = primask or basepri
* r4-r11 = restored register values * r4-r11 = restored register values
*/ */
2:
3:
#ifdef CONFIG_NUTTX_KERNEL #ifdef CONFIG_NUTTX_KERNEL
/* The EXC_RETURN value will be 0xfffffff9 (privileged thread) or 0xfffffff1 /* The EXC_RETURN value will be 0xfffffff9 (privileged thread) or 0xfffffff1
@@ -797,15 +799,15 @@ exception_common:
mrs r2, control /* R2=Contents of the control register */ mrs r2, control /* R2=Contents of the control register */
tst r14, #EXC_RETURN_PROCESS_STACK /* nonzero if context on process stack */ tst r14, #EXC_RETURN_PROCESS_STACK /* nonzero if context on process stack */
beq 3f /* Branch if privileged */ beq 4f /* Branch if privileged */
orr r2, r2, #1 /* Unprivileged mode */ orr r2, r2, #1 /* Unprivileged mode */
msr psp, r1 /* R1=The process stack pointer */ msr psp, r1 /* R1=The process stack pointer */
b 4f b 5f
3: 4:
bic r2, r2, #1 /* Privileged mode */ bic r2, r2, #1 /* Privileged mode */
msr msp, r1 /* R1=The main stack pointer */ msr msp, r1 /* R1=The main stack pointer */
4: 5:
msr control, r2 /* Save the updated control register */ msr control, r2 /* Save the updated control register */
#else #else
msr msp, r1 /* Recover the return MSP value */ msr msp, r1 /* Recover the return MSP value */
arch/arm/src/lm/lm_vectors.S
+10 -8
View File
@@ -323,7 +323,7 @@ exception_common:
*/ */
cmp r0, r1 /* Context switch? */ cmp r0, r1 /* Context switch? */
beq 1f /* Branch if no context switch */ beq 2f /* Branch if no context switch */
/* We are returning with a pending context switch. /* We are returning with a pending context switch.
* *
@@ -359,7 +359,7 @@ exception_common:
#else #else
ldmia r0, {r2-r11} /* Recover R4-R11 + 2 temp values */ ldmia r0, {r2-r11} /* Recover R4-R11 + 2 temp values */
#endif #endif
b 2f /* Re-join common logic */ b 3f /* Re-join common logic */
/* We are returning with no context switch. We simply need to "unwind" /* We are returning with no context switch. We simply need to "unwind"
* the same stack frame that we created * the same stack frame that we created
@@ -367,7 +367,8 @@ exception_common:
* Here: * Here:
* r1 = Address of the return stack (same as r0) * r1 = Address of the return stack (same as r0)
*/ */
1:
2:
#ifdef CONFIG_NUTTX_KERNEL #ifdef CONFIG_NUTTX_KERNEL
ldmia r1!, {r2-r11,r14} /* Recover R4-R11, r14 + 2 temp values */ ldmia r1!, {r2-r11,r14} /* Recover R4-R11, r14 + 2 temp values */
#else #else
@@ -390,7 +391,8 @@ exception_common:
* r3 = primask or basepri * r3 = primask or basepri
* r4-r11 = restored register values * r4-r11 = restored register values
*/ */
2:
3:
#ifdef CONFIG_NUTTX_KERNEL #ifdef CONFIG_NUTTX_KERNEL
/* The EXC_RETURN value will be 0xfffffff9 (privileged thread) or 0xfffffff1 /* The EXC_RETURN value will be 0xfffffff9 (privileged thread) or 0xfffffff1
@@ -400,15 +402,15 @@ exception_common:
mrs r2, control /* R2=Contents of the control register */ mrs r2, control /* R2=Contents of the control register */
tst r14, #EXC_RETURN_PROCESS_STACK /* nonzero if context on process stack */ tst r14, #EXC_RETURN_PROCESS_STACK /* nonzero if context on process stack */
beq 3f /* Branch if privileged */ beq 4f /* Branch if privileged */
orr r2, r2, #1 /* Unprivileged mode */ orr r2, r2, #1 /* Unprivileged mode */
msr psp, r1 /* R1=The process stack pointer */ msr psp, r1 /* R1=The process stack pointer */
b 4f b 5f
3: 4:
bic r2, r2, #1 /* Privileged mode */ bic r2, r2, #1 /* Privileged mode */
msr msp, r1 /* R1=The main stack pointer */ msr msp, r1 /* R1=The main stack pointer */
4: 5:
msr control, r2 /* Save the updated control register */ msr control, r2 /* Save the updated control register */
#else #else
msr msp, r1 /* Recover the return MSP value */ msr msp, r1 /* Recover the return MSP value */
arch/arm/src/lpc17xx/lpc17_vectors.S
+10 -8
View File
@@ -332,7 +332,7 @@ exception_common:
*/ */
cmp r0, r1 /* Context switch? */ cmp r0, r1 /* Context switch? */
beq 1f /* Branch if no context switch */ beq 2f /* Branch if no context switch */
/* We are returning with a pending context switch. /* We are returning with a pending context switch.
* *
@@ -368,7 +368,7 @@ exception_common:
#else #else
ldmia r0, {r2-r11} /* Recover R4-R11 + 2 temp values */ ldmia r0, {r2-r11} /* Recover R4-R11 + 2 temp values */
#endif #endif
b 2f /* Re-join common logic */ b 3f /* Re-join common logic */
/* We are returning with no context switch. We simply need to "unwind" /* We are returning with no context switch. We simply need to "unwind"
* the same stack frame that we created * the same stack frame that we created
@@ -376,7 +376,8 @@ exception_common:
* Here: * Here:
* r1 = Address of the return stack (same as r0) * r1 = Address of the return stack (same as r0)
*/ */
1:
2:
#ifdef CONFIG_NUTTX_KERNEL #ifdef CONFIG_NUTTX_KERNEL
ldmia r1!, {r2-r11,r14} /* Recover R4-R11, r14 + 2 temp values */ ldmia r1!, {r2-r11,r14} /* Recover R4-R11, r14 + 2 temp values */
#else #else
@@ -399,7 +400,8 @@ exception_common:
* r3 = primask or basepri * r3 = primask or basepri
* r4-r11 = restored register values * r4-r11 = restored register values
*/ */
2:
3:
#ifdef CONFIG_NUTTX_KERNEL #ifdef CONFIG_NUTTX_KERNEL
/* The EXC_RETURN value will be 0xfffffff9 (privileged thread) or 0xfffffff1 /* The EXC_RETURN value will be 0xfffffff9 (privileged thread) or 0xfffffff1
@@ -409,15 +411,15 @@ exception_common:
mrs r2, control /* R2=Contents of the control register */ mrs r2, control /* R2=Contents of the control register */
tst r14, #EXC_RETURN_PROCESS_STACK /* nonzero if context on process stack */ tst r14, #EXC_RETURN_PROCESS_STACK /* nonzero if context on process stack */
beq 3f /* Branch if privileged */ beq 4f /* Branch if privileged */
orr r2, r2, #1 /* Unprivileged mode */ orr r2, r2, #1 /* Unprivileged mode */
msr psp, r1 /* R1=The process stack pointer */ msr psp, r1 /* R1=The process stack pointer */
b 4f b 5f
3: 4:
bic r2, r2, #1 /* Privileged mode */ bic r2, r2, #1 /* Privileged mode */
msr msp, r1 /* R1=The main stack pointer */ msr msp, r1 /* R1=The main stack pointer */
4: 5:
msr control, r2 /* Save the updated control register */ msr control, r2 /* Save the updated control register */
#else #else
msr msp, r1 /* Recover the return MSP value */ msr msp, r1 /* Recover the return MSP value */
arch/arm/src/sam34/sam_vectors.S
+10 -8
View File
@@ -337,7 +337,7 @@ exception_common:
*/ */
cmp r0, r1 /* Context switch? */ cmp r0, r1 /* Context switch? */
beq 1f /* Branch if no context switch */ beq 2f /* Branch if no context switch */
/* We are returning with a pending context switch. /* We are returning with a pending context switch.
* *
@@ -373,7 +373,7 @@ exception_common:
#else #else
ldmia r0, {r2-r11} /* Recover R4-R11 + 2 temp values */ ldmia r0, {r2-r11} /* Recover R4-R11 + 2 temp values */
#endif #endif
b 2f /* Re-join common logic */ b 3f /* Re-join common logic */
/* We are returning with no context switch. We simply need to "unwind" /* We are returning with no context switch. We simply need to "unwind"
* the same stack frame that we created * the same stack frame that we created
@@ -381,7 +381,8 @@ exception_common:
* Here: * Here:
* r1 = Address of the return stack (same as r0) * r1 = Address of the return stack (same as r0)
*/ */
1:
2:
#ifdef CONFIG_NUTTX_KERNEL #ifdef CONFIG_NUTTX_KERNEL
ldmia r1!, {r2-r11,r14} /* Recover R4-R11, r14 + 2 temp values */ ldmia r1!, {r2-r11,r14} /* Recover R4-R11, r14 + 2 temp values */
#else #else
@@ -404,7 +405,8 @@ exception_common:
* r3 = primask or basepri * r3 = primask or basepri
* r4-r11 = restored register values * r4-r11 = restored register values
*/ */
2:
3:
#ifdef CONFIG_NUTTX_KERNEL #ifdef CONFIG_NUTTX_KERNEL
/* The EXC_RETURN value will be 0xfffffff9 (privileged thread) or 0xfffffff1 /* The EXC_RETURN value will be 0xfffffff9 (privileged thread) or 0xfffffff1
@@ -414,15 +416,15 @@ exception_common:
mrs r2, control /* R2=Contents of the control register */ mrs r2, control /* R2=Contents of the control register */
tst r14, #EXC_RETURN_PROCESS_STACK /* nonzero if context on process stack */ tst r14, #EXC_RETURN_PROCESS_STACK /* nonzero if context on process stack */
beq 3f /* Branch if privileged */ beq 4f /* Branch if privileged */
orr r2, r2, #1 /* Unprivileged mode */ orr r2, r2, #1 /* Unprivileged mode */
msr psp, r1 /* R1=The process stack pointer */ msr psp, r1 /* R1=The process stack pointer */
b 4f b 5f
3: 4:
bic r2, r2, #1 /* Privileged mode */ bic r2, r2, #1 /* Privileged mode */
msr msp, r1 /* R1=The main stack pointer */ msr msp, r1 /* R1=The main stack pointer */
4: 5:
msr control, r2 /* Save the updated control register */ msr control, r2 /* Save the updated control register */
#else #else
msr msp, r1 /* Recover the return MSP value */ msr msp, r1 /* Recover the return MSP value */
arch/arm/src/stm32/stm32_vectors.S
+10 -8
View File
@@ -347,7 +347,7 @@ exception_common:
*/ */
cmp r0, r1 /* Context switch? */ cmp r0, r1 /* Context switch? */
beq 1f /* Branch if no context switch */ beq 2f /* Branch if no context switch */
/* We are returning with a pending context switch. /* We are returning with a pending context switch.
* *
@@ -383,7 +383,7 @@ exception_common:
#else #else
ldmia r0, {r2-r11} /* Recover R4-R11 + 2 temp values */ ldmia r0, {r2-r11} /* Recover R4-R11 + 2 temp values */
#endif #endif
b 2f /* Re-join common logic */ b 3f /* Re-join common logic */
/* We are returning with no context switch. We simply need to "unwind" /* We are returning with no context switch. We simply need to "unwind"
* the same stack frame that we created * the same stack frame that we created
@@ -391,7 +391,8 @@ exception_common:
* Here: * Here:
* r1 = Address of the return stack (same as r0) * r1 = Address of the return stack (same as r0)
*/ */
1:
2:
#ifdef CONFIG_NUTTX_KERNEL #ifdef CONFIG_NUTTX_KERNEL
ldmia r1!, {r2-r11,r14} /* Recover R4-R11, r14 + 2 temp values */ ldmia r1!, {r2-r11,r14} /* Recover R4-R11, r14 + 2 temp values */
#else #else
@@ -414,7 +415,8 @@ exception_common:
* r3 = primask or basepri * r3 = primask or basepri
* r4-r11 = restored register values * r4-r11 = restored register values
*/ */
2:
3:
#ifdef CONFIG_NUTTX_KERNEL #ifdef CONFIG_NUTTX_KERNEL
/* The EXC_RETURN value will be 0xfffffff9 (privileged thread) or 0xfffffff1 /* The EXC_RETURN value will be 0xfffffff9 (privileged thread) or 0xfffffff1
@@ -424,15 +426,15 @@ exception_common:
mrs r2, control /* R2=Contents of the control register */ mrs r2, control /* R2=Contents of the control register */
tst r14, #EXC_RETURN_PROCESS_STACK /* nonzero if context on process stack */ tst r14, #EXC_RETURN_PROCESS_STACK /* nonzero if context on process stack */
beq 3f /* Branch if privileged */ beq 4f /* Branch if privileged */
orr r2, r2, #1 /* Unprivileged mode */ orr r2, r2, #1 /* Unprivileged mode */
msr psp, r1 /* R1=The process stack pointer */ msr psp, r1 /* R1=The process stack pointer */
b 4f b 5f
3: 4:
bic r2, r2, #1 /* Privileged mode */ bic r2, r2, #1 /* Privileged mode */
msr msp, r1 /* R1=The main stack pointer */ msr msp, r1 /* R1=The main stack pointer */
4: 5:
msr control, r2 /* Save the updated control register */ msr control, r2 /* Save the updated control register */
#else #else
msr msp, r1 /* Recover the return MSP value */ msr msp, r1 /* Recover the return MSP value */