* armdefs.h (SYSTEMBANK): Define as USERBANK.

* armsupp.c (ARMul_SwitchMode): Remove SYSTEMBANK cases.

diff --git a/sim/arm/ChangeLog b/sim/arm/ChangeLog
index c0990c72b40c4a73ce6013a04946e3e7d04201b9..0e96893ce474fc90eaecee17cfc0d4f888b7ed27 100644 (file)
--- 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 b23f26f51f692293d1bfa6f553a04c0d25dfb84d..d08a94c4e695a26ba31b8716cbd5ba17a3bf696f 100644 (file)
--- 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 5c18ddd3b03e33766dfd3edccfa16566624c2194..e63448a45c1e63b696b1e562c7271eeddbefd170 100644 (file)
--- 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: