diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2014-10-16 07:53:50 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2014-10-16 07:53:50 +0000 |
| commit | 005c5734247da57c4fe2b791a404375d35dd3278 (patch) | |
| tree | 3a6ba12721824a681b0fb47c73476ea1845aa2f2 /os/rt/ports | |
| parent | 05fbfd18f87f14d932849f013cea0cdef46a3443 (diff) | |
| download | ChibiOS-005c5734247da57c4fe2b791a404375d35dd3278.tar.gz ChibiOS-005c5734247da57c4fe2b791a404375d35dd3278.tar.bz2 ChibiOS-005c5734247da57c4fe2b791a404375d35dd3278.zip | |
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7404 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/rt/ports')
| -rw-r--r-- | os/rt/ports/ARM/compilers/GCC/chcoreasm.s | 74 |
1 files changed, 1 insertions, 73 deletions
diff --git a/os/rt/ports/ARM/compilers/GCC/chcoreasm.s b/os/rt/ports/ARM/compilers/GCC/chcoreasm.s index 01f9434b1..31d1a0037 100644 --- a/os/rt/ports/ARM/compilers/GCC/chcoreasm.s +++ b/os/rt/ports/ARM/compilers/GCC/chcoreasm.s @@ -246,7 +246,7 @@ _port_irq_common: #endif /* !defined(THUMB_NO_INTERWORKING) */
// Re-establish the IRQ conditions again.
- ldmfd sp!, {r0, r1} // Pop R0=SPSR, R1=LR_IRQ.
+ ldmfd sp!, {r0, r1} // Pop R0=SPSR, R1=LR_IRQ.
msr CPSR_c, #MODE_IRQ | I_BIT
msr SPSR_fsxc, r0
mov lr, r1
@@ -256,46 +256,6 @@ _port_irq_common: subs pc, lr, #4
.endfunc
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- msr CPSR_c, #MODE_SYS | I_BIT
- bl chSchIsPreemptionRequired
- cmp r0, #0
- beq noschd
-#if CH_DBG_SYSTEM_STATE_CHECK
- bl _dbg_check_lock
-#endif
- bl chSchDoReschedule
-#if CH_DBG_SYSTEM_STATE_CHECK
- bl _dbg_check_unlock
-#endif
-noschd:
- ldmfd sp!, {r0, r1} // Pop R0=SPSR, R1=LR_IRQ.
- msr CPSR_c, #MODE_IRQ | I_BIT
- msr SPSR_fsxc, r0
- mov lr, r1
- msr CPSR_c, #MODE_SYS | I_BIT
- ldmfd sp!, {r0-r3, r12, lr}
- msr CPSR_c, #MODE_IRQ | I_BIT
- subs pc, lr, #4
-
/*
* Threads trampoline code.
* NOTE: The threads always start in ARM mode and then switches to the
@@ -326,38 +286,6 @@ _port_thread_start: bl chThdExit
.endfunc
-#if 0
-#if CH_DBG_SYSTEM_STATE_CHECK
-#if defined(THUMB_NO_INTERWORKING)
- add r0, pc, #1
- bx r0
- .code 16
-#endif
- bl _dbg_check_unlock
-#if defined(THUMB_NO_INTERWORKING)
- mov lr, pc
- bx lr
- .code 32
-#endif
-#endif
- msr CPSR_c, #MODE_SYS
-#if !defined(THUMB_NO_INTERWORKING)
- mov r0, r5
- mov lr, pc
- bx r4
- bl chThdExit
-#else /* defined(THUMB_NO_INTERWORKING) */
- add r0, pc, #1
- bx r0
- .code 16
- mov r0, r5
- bl jmpr4
- bl chThdExit
-jmpr4:
- bx r4
-#endif /* defined(THUMB_NO_INTERWORKING) */
-#endif
-
#endif /* !defined(__DOXYGEN__) */
/** @} */
|