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

2011-10-07 Daniel Hellstrom <daniel@gaisler.com>

Browse Source 
PR 1932/cpukit
	* cpu_asm.S: At some point the interrupt trap handler causes a
	window-overflow and the window overflow trap handler crashes when
	writing to 0. I found that this is because the WIM was bad, to the
	window overflow handler uses a uninitialized stack pointer in a
	window never used.
	 * g3=CWP, not WIM
	 * CWP is incremented by done_flushing no need doing that here also
	 * I see no reason to create an additional stack frame (save)
	 * Must turn off traps when updating WIM (maybe already done by caller?)
This commit is contained in:
Joel Sherrill
2011-10-07 14:31:44 +00:00
parent 591e964eb8
commit 8f582bc637
2 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
cpukit/score/cpu/sparc/ChangeLog
View File

@@ -1,3 +1,15 @@
2011-10-07 Daniel Hellstrom <daniel@gaisler.com>
PR 1932/cpukit
* cpu_asm.S: At some point the interrupt trap handler causes a
window-overflow and the window overflow trap handler crashes when
writing to 0. I found that this is because the WIM was bad, to the
window overflow handler uses a uninitialized stack pointer in a
window never used.
* g3=CWP, not WIM
* CWP is incremented by done_flushing no need doing that here also
* I see no reason to create an additional stack frame (save)
* Must turn off traps when updating WIM (maybe already done by caller?)
2011-09-27 Sebastian Huber <sebastian.huber@embedded-brains.de>
PR 1914/cpukit

22
cpukit/score/cpu/sparc/cpu_asm.S
View File

@@ -336,22 +336,22 @@ SYM(_CPU_Context_restore):
*
* This routine is only used to switch to the first task on a
* secondary core in an SMP configuration. We do not need to
* flush all the windows and, in fact, this can be dangerous
* flush any windows and, in fact, this can be dangerous
* as they may or may not be initialized properly. So we just
* reinitialize the PSR and WIM.
*/
PUBLIC(_CPU_Context_switch_to_first_task_smp)
SYM(_CPU_Context_switch_to_first_task_smp):
save %sp, -CPU_MINIMUM_STACK_FRAME_SIZE, %sp
mov %psr, %g1 ! Initialize WIM
add %g1, 1, %g2
and %g2, 0x7, %g2
set 1, %g3
sll %g3, %g2, %g3
mov %g3, %wim
ba done_flushing
mov %i0, %o1 ! in the delay slot
mov %psr, %g1 ! Turn of traps when modifying WIM
andn %g1, SPARC_PSR_ET_MASK, %g1
mov %g1, %psr
/* WIM and PSR will be set in done_flushing, it need args:
* g1=PSR, g3=CWP, o1=Context
*/
and %g1, SPARC_NUMBER_OF_REGISTER_WINDOWS - 1, %g3
nop
mov %o0, %o1 ! in the delay slot
ba,a done_flushing
#endif
/* end of file */