summaryrefslogtreecommitdiff
path: root/cpukit/score/cpu/sparc/cpu_asm.S
diff options
context:
space:
mode:
Diffstat (limited to 'cpukit/score/cpu/sparc/cpu_asm.S')
-rw-r--r--cpukit/score/cpu/sparc/cpu_asm.S5
1 files changed, 5 insertions, 0 deletions
diff --git a/cpukit/score/cpu/sparc/cpu_asm.S b/cpukit/score/cpu/sparc/cpu_asm.S
index 201759df38..aa7b629689 100644
--- a/cpukit/score/cpu/sparc/cpu_asm.S
+++ b/cpukit/score/cpu/sparc/cpu_asm.S
@@ -592,10 +592,13 @@ __sparc_fq:
sll %g4, 8, %g4
and %g4, SPARC_PSR_PIL_MASK, %g4
andn %l0, SPARC_PSR_PIL_MASK, %g5
+ ba pil_fixed
or %g4, %g5, %g5
#endif
dont_fix_pil:
+ or %g5, SPARC_PSR_PIL_MASK, %g5
+pil_fixed:
wr %g5, SPARC_PSR_ET_MASK, %psr ! **** ENABLE TRAPS ****
dont_fix_pil2:
@@ -627,6 +630,7 @@ dont_fix_pil2:
*/
mov %l0, %psr ! **** DISABLE TRAPS ****
+ nop; nop; nop
/*
* Decrement ISR nest level and Thread dispatch disable level.
@@ -820,6 +824,7 @@ simple_return:
good_task_window:
mov %l0, %psr ! **** DISABLE TRAPS ****
+ nop; nop; nop
! and restore condition codes.
ld [%g1 + ISF_G1_OFFSET], %g1 ! restore g1
jmp %l1 ! transfer control and