diff options
| -rw-r--r-- | sim/arm/ChangeLog | 5 | ||||
| -rw-r--r-- | sim/arm/armdefs.h | 2 | ||||
| -rw-r--r-- | sim/arm/armsupp.c | 7 |
3 files changed, 6 insertions, 8 deletions
diff --git a/sim/arm/ChangeLog b/sim/arm/ChangeLog index c0990c7..0e96893 100644 --- a/sim/arm/ChangeLog +++ b/sim/arm/ChangeLog @@ -1,3 +1,8 @@ +2000-07-04 Alexandre Oliva <aoliva@redhat.com> + + * armdefs.h (SYSTEMBANK): Define as USERBANK. + * armsupp.c (ARMul_SwitchMode): Remove SYSTEMBANK cases. + 2000-06-22 Alexandre Oliva <aoliva@cygnus.com> * armemu.c (Multiply64): Fix computation of flag N. diff --git a/sim/arm/armdefs.h b/sim/arm/armdefs.h index b23f26f..d08a94c 100644 --- a/sim/arm/armdefs.h +++ b/sim/arm/armdefs.h @@ -226,7 +226,7 @@ struct ARMul_State #define ABORTBANK 4 #define UNDEFBANK 5 #define DUMMYBANK 6 -#define SYSTEMBANK 7 +#define SYSTEMBANK USERBANK #define BANK_CAN_ACCESS_SPSR(bank) \ ((bank) != USERBANK && (bank) != SYSTEMBANK && (bank) != DUMMYBANK) diff --git a/sim/arm/armsupp.c b/sim/arm/armsupp.c index 5c18ddd..e63448a 100644 --- a/sim/arm/armsupp.c +++ b/sim/arm/armsupp.c @@ -369,10 +369,6 @@ ARMul_SwitchMode (ARMul_State * state, ARMword oldmode, ARMword newmode) { /* really need to do it */ switch (oldbank) { /* save away the old registers */ - case SYSTEMBANK: - /* The System mode uses the USER bank. */ - oldbank = USERBANK; - /* Fall through. */ case USERBANK: case IRQBANK: case SVCBANK: @@ -398,9 +394,6 @@ ARMul_SwitchMode (ARMul_State * state, ARMword oldmode, ARMword newmode) switch (newbank) { /* restore the new registers */ - case SYSTEMBANK: - newbank = USERBANK; - /* Fall through. */ case USERBANK: case IRQBANK: case SVCBANK: |