RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

NIOS2: Fix register restore sequence in epilogue

Browse Source 
This fix is critical.  The previous implementation leads to system
corruption.
This commit is contained in:
Sebastian Huber
2013-01-14 09:54:21 +01:00
parent f7351e4ea5
commit 0cce75e696
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cpukit/score/cpu/nios2/nios2-eic-il-low-level.S
View File

@@ -160,7 +160,6 @@ do_thread_dispatch:
ldw r10, FRAME_OFFSET_R10(sp) ldw r10, FRAME_OFFSET_R10(sp)
ldw r11, FRAME_OFFSET_R11(sp) ldw r11, FRAME_OFFSET_R11(sp)
ldw r12, FRAME_OFFSET_R12(sp) ldw r12, FRAME_OFFSET_R12(sp)
ldw r13, FRAME_OFFSET_R13(sp)
/* /*
* Disable interrupts. * Disable interrupts.
@@ -180,15 +179,16 @@ do_thread_dispatch:
wrctl status, r15 wrctl status, r15
/* Load thread dispatch necessary */ /* Load thread dispatch necessary */
ldb r12, %gprel(_Per_CPU_Information + PER_CPU_DISPATCH_NEEDED)(gp) ldb r13, %gprel(_Per_CPU_Information + PER_CPU_DISPATCH_NEEDED)(gp)
/* Is thread dispatch necessary? */ /* Is thread dispatch necessary? */
bne r12, zero, enable_interrupts_before_thread_dispatch bne r13, zero, enable_interrupts_before_thread_dispatch
/* Enable Nios II specific thread dispatch */ /* Enable Nios II specific thread dispatch */
stw zero, %gprel(_Nios2_Thread_dispatch_disabled)(gp) stw zero, %gprel(_Nios2_Thread_dispatch_disabled)(gp)
/* Restore remaining volatile register */ /* Restore remaining volatile register */
ldw r13, FRAME_OFFSET_R13(sp)
ldw r14, FRAME_OFFSET_R14(sp) ldw r14, FRAME_OFFSET_R14(sp)
ldw r15, FRAME_OFFSET_R15(sp) ldw r15, FRAME_OFFSET_R15(sp)