ARMv7-A: use standard ARM core_mode symbols

The only way ARMv7-A modes differ from ARMv4/ARMv5 flavors
is that v7-A is allowed to include "Secure monitor" support.
That's now handled by our standard top-level ARM code ... so
phase out the stuff that's specific to ARMv7-A.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>

diff --git a/src/target/armv7a.c b/src/target/armv7a.c
index 6aa9d2f57010abdbde433c752982253e39ad0dc3..98e3fa3f23793d19e99806f00cd7413951c612f8 100644 (file)
--- a/src/target/armv7a.c
+++ b/src/target/armv7a.c
@@ -86,7 +86,7 @@ int armv7a_arch_state(struct target *target)
                 state[armv7a->armv4_5_mmu.armv4_5_cache.d_u_cache_enabled],
                 state[armv7a->armv4_5_mmu.armv4_5_cache.i_cache_enabled]);
 
-       if (armv4_5->core_mode == ARMV7A_MODE_ABT)
+       if (armv4_5->core_mode == ARMV4_5_MODE_ABT)
                armv7a_show_fault_registers(target);
 
        return ERROR_OK;

diff --git a/src/target/armv7a.h b/src/target/armv7a.h
index b0083619fd0de888956bdf7ee045ae01609d181f..f31a7af84ad97400720dbc98b1f181609ccab7c6 100644 (file)
--- a/src/target/armv7a.h
+++ b/src/target/armv7a.h
@@ -24,18 +24,6 @@
 #include "armv4_5_mmu.h"
 #include "armv4_5_cache.h"
 
-typedef enum armv7a_mode
-{
-       ARMV7A_MODE_USR = 16,
-       ARMV7A_MODE_FIQ = 17,
-       ARMV7A_MODE_IRQ = 18,
-       ARMV7A_MODE_SVC = 19,
-       ARMV7A_MODE_ABT = 23,
-       ARMV7A_MODE_UND = 27,
-       ARMV7A_MODE_SYS = 31,
-       ARMV7A_MODE_MON = 22,
-       ARMV7A_MODE_ANY = -1
-} armv7a_t;
 
 typedef enum armv7a_state
 {
@@ -78,7 +66,6 @@ struct armv7a_common
 {
        int common_magic;
        struct reg_cache *core_cache;
-       enum armv7a_mode core_mode;
        enum armv7a_state core_state;
 
        /* arm adp debug port */
@@ -119,14 +106,14 @@ struct armv7a_algorithm
 {
        int common_magic;
 
-       enum armv7a_mode core_mode;
+       enum armv4_5_mode core_mode;
        enum armv7a_state core_state;
 };
 
 struct armv7a_core_reg
 {
        int num;
-       enum armv7a_mode mode;
+       enum armv4_5_mode mode;
        struct target *target;
        struct armv7a_common *armv7a_common;
 };