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

2006-11-14 Jiri Gaisler <jiri@gaisler.com>

Browse Source 
* cpu_asm.S: Properly support synchronous traps.
This commit is contained in:
Joel Sherrill
2006-11-14 21:44:09 +00:00
parent 12fbe4956f
commit 5b0f138d2e
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,3 +1,7 @@
2006-11-14 Jiri Gaisler <jiri@gaisler.com>
* cpu_asm.S: Properly support synchronous traps.
2006-01-16 Joel Sherrill <joel@OARcorp.com> 2006-01-16 Joel Sherrill <joel@OARcorp.com>
* rtems/score/cpu.h: Part of a large patch to improve Doxygen output. * rtems/score/cpu.h: Part of a large patch to improve Doxygen output.

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

@@ -570,10 +570,13 @@ __sparc_fq:
sll %g4, 8, %g4 sll %g4, 8, %g4
and %g4, SPARC_PSR_PIL_MASK, %g4 and %g4, SPARC_PSR_PIL_MASK, %g4
andn %l0, SPARC_PSR_PIL_MASK, %g5 andn %l0, SPARC_PSR_PIL_MASK, %g5
ba pil_fixed
or %g4, %g5, %g5 or %g4, %g5, %g5
#endif #endif
dont_fix_pil: dont_fix_pil:
or %g5, SPARC_PSR_PIL_MASK, %g5
pil_fixed:
wr %g5, SPARC_PSR_ET_MASK, %psr ! **** ENABLE TRAPS **** wr %g5, SPARC_PSR_ET_MASK, %psr ! **** ENABLE TRAPS ****
dont_fix_pil2: dont_fix_pil2:
@@ -605,6 +608,7 @@ dont_fix_pil2:
*/ */
mov %l0, %psr ! **** DISABLE TRAPS **** mov %l0, %psr ! **** DISABLE TRAPS ****
nop; nop; nop
/* /*
* Decrement ISR nest level and Thread dispatch disable level. * Decrement ISR nest level and Thread dispatch disable level.
@@ -798,6 +802,7 @@ simple_return:
good_task_window: good_task_window:
mov %l0, %psr ! **** DISABLE TRAPS **** mov %l0, %psr ! **** DISABLE TRAPS ****
nop; nop; nop
! and restore condition codes. ! and restore condition codes.
ld [%g1 + ISF_G1_OFFSET], %g1 ! restore g1 ld [%g1 + ISF_G1_OFFSET], %g1 ! restore g1
jmp %l1 ! transfer control and jmp %l1 ! transfer control and