Change version labels to work better with GIT

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

diff --git a/src/target/armv7a.h b/src/target/armv7a.h
index b082e0d5d5d19c39bcb493a8236d8d1f22dd0035..5814c13decf2e4f184b4f1df3f26d8b89b2ebd03 100644 (file)
--- a/src/target/armv7a.h
+++ b/src/target/armv7a.h
@@ -40,7 +40,7 @@ typedef enum armv7a_mode
        ARMV7A_MODE_ANY = -1
 } armv7a_t;
 
-char **armv7a_mode_strings;
+extern char **armv7a_mode_strings;
 
 typedef enum armv7a_state
 {
@@ -52,7 +52,7 @@ typedef enum armv7a_state
 
 extern char *armv7a_state_strings[];
 
-int armv7a_core_reg_map[8][17];
+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]]
@@ -79,6 +79,16 @@ enum
 #define ARMV4_5_COMMON_MAGIC 0x0A450A45
 #define ARMV7_COMMON_MAGIC 0x0A450999
 
+/* VA to PA translation operations opc2 values*/
+#define V2PCWPR  0
+#define V2PCWPW  1
+#define V2PCWUR  2
+#define V2PCWUW  3
+#define V2POWPR  4
+#define V2POWPW  5
+#define V2POWUR  6
+#define V2POWUW  7
+
 typedef struct armv7a_common_s
 {
        int common_magic;
@@ -88,6 +98,13 @@ typedef struct armv7a_common_s
 
        /* arm adp debug port */
        swjdp_common_t swjdp_info;
+
+       /* Core Debug Unit */
+       uint32_t debug_base;
+       uint8_t debug_ap;
+       uint8_t memory_ap;
+
+       /* Cache and Memory Management Unit */
        armv4_5_mmu_common_t armv4_5_mmu;
        armv4_5_common_t armv4_5_common;
        void *arch_info;
@@ -148,7 +165,7 @@ static inline int armv7a_mode_to_number(enum armv7a_mode mode)
                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");
+                       LOG_ERROR("invalid mode value encountered, val %d", mode);
                        return -1;
        }
 }
@@ -173,4 +190,4 @@ static inline enum armv7a_mode armv7a_number_to_mode(int number)
 };
 
 
-#endif /* ARMV4_5_H */
\ No newline at end of file
+#endif /* ARMV4_5_H */