diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2007-09-10 22:24:57 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2007-09-10 22:24:57 +0000 |
| commit | c55364c4a24411085474f2603dd333723d22bb48 (patch) | |
| tree | b818bbc86910bdb8306dd667dc2155402b017ca8 /cpukit | |
| parent | 2007-09-10 Alain Schaefer <alani@easc.ch> (diff) | |
| download | rtems-c55364c4a24411085474f2603dd333723d22bb48.tar.bz2 | |
2007-09-10 Alain Schaefer <alani@easc.ch>
* cpu_asm.S: Fix two problems:
- CC bit has been clobbered and was not correctly restored
- bfin hardware does not allow to read instructions from the L1
Diffstat (limited to 'cpukit')
| -rw-r--r-- | cpukit/score/cpu/bfin/ChangeLog | 7 | ||||
| -rw-r--r-- | cpukit/score/cpu/bfin/cpu_asm.S | 18 |
2 files changed, 21 insertions, 4 deletions
diff --git a/cpukit/score/cpu/bfin/ChangeLog b/cpukit/score/cpu/bfin/ChangeLog index 17a730dd99..0fbac70cfa 100644 --- a/cpukit/score/cpu/bfin/ChangeLog +++ b/cpukit/score/cpu/bfin/ChangeLog @@ -1,5 +1,12 @@ 2007-09-10 Alain Schaefer <alani@easc.ch> + * cpu_asm.S: Fix two problems: + - CC bit has been clobbered and was not correctly restored + - bfin hardware does not allow to read instructions from the L1 + + +2007-09-10 Alain Schaefer <alani@easc.ch> + * rtems/bfin/bf533.h: Add more definitions. 2007-05-31 Alain Schaefer <alani@easc.ch> diff --git a/cpukit/score/cpu/bfin/cpu_asm.S b/cpukit/score/cpu/bfin/cpu_asm.S index e5cb4fcf0e..e3b253bf23 100644 --- a/cpukit/score/cpu/bfin/cpu_asm.S +++ b/cpukit/score/cpu/bfin/cpu_asm.S @@ -268,7 +268,8 @@ __ISR_Handler: /* load base adress of scratchpad */ P0.H = HI(SCRATCH); P0.L = LO(SCRATCH); - + + [--SP] = ASTAT; /* save cc flag*/ /* if SP is already inside the SCRATCHPAD */ CC=SP<P0 (iu) if !CC jump continue; @@ -302,19 +303,27 @@ __ISR_Handler: * Thread_Dispatch would not be possible. */ P0 = RETI; - R0 = W[P0]; + R0 = P0; + R0.L = 0x0000; + R1.H = 0xffa0; + R1.L = 0x0000; + CC = R0 == R1; + if CC jump disablethreaddispatch; + + R0 = W[P0](Z); + /* shift 16 bits to the right (select the high nibble ) */ /*R0 >>= 16;*/ R3 = 0; /* Check if RETI is a LINK instruction */ - R1.h = HI(0xE800); + R1.h = HI(0x0000); R1.l = LO(0xE800); CC=R0==R1; if cc jump disablethreaddispatch; /* Check if RETI is a RTS instruction */ - R1.h = HI(0x0010); + R1.h = HI(0x0000); R1.l = LO(0x0010); CC=R0==R1; if cc jump disablethreaddispatch; @@ -401,6 +410,7 @@ __ISR_Handler: restoreP0: P0 = USP; + ASTAT = [SP++]; /* restore cc flag */ /*now we should be on the old "user-stack" again */ |