diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2006-11-14 21:45:08 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2006-11-14 21:45:08 +0000 |
| commit | 1201ef93c3e256bc63911b6a8a7ab2254bad073e (patch) | |
| tree | 533fe9a09fb40d4c158f349a7b27d303f1d5ef5d | |
| parent | fca53e8830d38c8f6e281a8690c5cbc60c80e786 (diff) | |
2006-11-14 Jiri Gaisler <jiri@gaisler.com>
* cpu_asm.S: Properly support synchronous traps.
| -rw-r--r-- | cpukit/score/cpu/sparc/ChangeLog | 4 | ||||
| -rw-r--r-- | cpukit/score/cpu/sparc/cpu_asm.S | 5 |
2 files changed, 9 insertions, 0 deletions
diff --git a/cpukit/score/cpu/sparc/ChangeLog b/cpukit/score/cpu/sparc/ChangeLog index a016941a21..f7ff48b547 100644 --- a/cpukit/score/cpu/sparc/ChangeLog +++ b/cpukit/score/cpu/sparc/ChangeLog @@ -1,3 +1,7 @@ +2006-11-14 Jiri Gaisler <jiri@gaisler.com> + + * cpu_asm.S: Properly support synchronous traps. + 2006-09-07 Ken Peters <ken.peters@jpl.nasa.gov> PR 1173/rtems 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 |