ARMv7-A: use standard ARM core states

[openocd.git] / src / target / armv7a.h

diff --git a/src/target/armv7a.h b/src/target/armv7a.h
index 625c3a9ae92666038933a8b3877617b31280e01c..635cd40e639c8094cb3194572b4cd14eb416a383 100644 (file)
--- a/src/target/armv7a.h
+++ b/src/target/armv7a.h
@@ -19,45 +19,11 @@
 #ifndef ARMV7A_H
 #define ARMV7A_H
 
-#include "register.h"
-#include "target.h"
 #include "arm_adi_v5.h"
 #include "armv4_5.h"
 #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;
-
-extern char **armv7a_mode_strings;
-
-typedef enum armv7a_state
-{
-       ARMV7A_STATE_ARM,
-       ARMV7A_STATE_THUMB,
-       ARMV7A_STATE_JAZELLE,
-       ARMV7A_STATE_THUMBEE,
-} armv7a_state_t;
-
-extern char *armv7a_state_strings[];
-
-extern int armv7a_core_reg_map[8][17];
-
-#define ARMV7A_CORE_REG_MODE(cache, mode, num) \
-               cache->reg_list[armv7a_core_reg_map[armv7a_mode_to_number(mode)][num]]
-#define ARMV7A_CORE_REG_MODENUM(cache, mode, num) \
-               cache->reg_list[armv7a_core_reg_map[mode][num]]
-
 enum
 {
        ARM_PC  = 15,
@@ -75,7 +41,6 @@ enum
        ARMV7A_SPSR_UND = 36
 };
 
-#define ARMV4_5_COMMON_MAGIC 0x0A450A45
 #define ARMV7_COMMON_MAGIC 0x0A450999
 
 /* VA to PA translation operations opc2 values*/
@@ -90,10 +55,9 @@ enum
 
 struct armv7a_common
 {
+       struct arm armv4_5_common;
        int common_magic;
        struct reg_cache *core_cache;
-       enum armv7a_mode core_mode;
-       enum armv7a_state core_state;
 
        /* arm adp debug port */
        struct swjdp_common swjdp_info;
@@ -105,11 +69,7 @@ struct armv7a_common
 
        /* Cache and Memory Management Unit */
        struct armv4_5_mmu_common armv4_5_mmu;
-       struct arm armv4_5_common;
 
-//     int (*full_context)(struct target *target);
-//     int (*read_core_reg)(struct target *target, int num, enum armv7a_mode mode);
-//     int (*write_core_reg)(struct target *target, int num, enum armv7a_mode mode, u32 value);
        int (*read_cp15)(struct target *target,
                        uint32_t op1, uint32_t op2,
                        uint32_t CRn, uint32_t CRm, uint32_t *value);
@@ -136,14 +96,14 @@ struct armv7a_algorithm
 {
        int common_magic;
 
-       enum armv7a_mode core_mode;
-       enum armv7a_state core_state;
+       enum armv4_5_mode core_mode;
+       enum armv4_5_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;
 };
@@ -154,44 +114,4 @@ struct reg_cache *armv7a_build_reg_cache(struct target *target,
 int armv7a_register_commands(struct command_context *cmd_ctx);
 int armv7a_init_arch_info(struct target *target, struct armv7a_common *armv7a);
 
-/* map psr mode bits to linear number */
-static inline int armv7a_mode_to_number(enum armv7a_mode mode)
-{
-       switch (mode)
-       {
-               case ARMV7A_MODE_USR: return 0; break;
-               case ARMV7A_MODE_FIQ: return 1; break;
-               case ARMV7A_MODE_IRQ: return 2; break;
-               case ARMV7A_MODE_SVC: return 3; break;
-               case ARMV7A_MODE_ABT: return 4; break;
-               case ARMV7A_MODE_UND: return 5; break;
-               case ARMV7A_MODE_SYS: return 6; break;
-               case ARMV7A_MODE_MON: return 7; break;
-               case ARMV7A_MODE_ANY: return 0; break;  /* map MODE_ANY to user mode */
-               default:
-                       LOG_ERROR("invalid mode value encountered, val %d", mode);
-                       return -1;
-       }
-}
-
-/* map linear number to mode bits */
-static inline enum armv7a_mode armv7a_number_to_mode(int number)
-{
-       switch(number)
-       {
-               case 0: return ARMV7A_MODE_USR; break;
-               case 1: return ARMV7A_MODE_FIQ; break;
-               case 2: return ARMV7A_MODE_IRQ; break;
-               case 3: return ARMV7A_MODE_SVC; break;
-               case 4: return ARMV7A_MODE_ABT; break;
-               case 5: return ARMV7A_MODE_UND; break;
-               case 6: return ARMV7A_MODE_SYS; break;
-               case 7: return ARMV7A_MODE_MON; break;
-               default:
-                       LOG_ERROR("mode index out of bounds");
-                       return ARMV7A_MODE_ANY;
-       }
-};
-
-
 #endif /* ARMV4_5_H */