X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Farmv7a.h;h=f93245634adb3bd147f9f076b4c1cfa1f779af06;hp=3fc97f1fe36abbb689d2a8e8c65b4ad39fe8dbd7;hb=89fa8ce2d8c58707f3dfda397138f8ee336e1a47;hpb=db116b1ea3c77a3c5850fccbce9e0795faa21dda diff --git a/src/target/armv7a.h b/src/target/armv7a.h index 3fc97f1fe3..f93245634a 100644 --- 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 "log.h" #include "arm_adi_v5.h" -#include "armv4_5.h" +#include "arm.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]] +#include "arm_dpm.h" enum { @@ -65,18 +31,7 @@ enum ARM_CPSR = 16 } ; -/* offsets into armv4_5 core register cache */ -enum -{ - ARMV7A_CPSR = 31, - ARMV7A_SPSR_FIQ = 32, - ARMV7A_SPSR_IRQ = 33, - ARMV7A_SPSR_SVC = 34, - ARMV7A_SPSR_ABT = 35, - ARMV7A_SPSR_UND = 36 -}; -#define ARMV4_5_COMMON_MAGIC 0x0A450A45 #define ARMV7_COMMON_MAGIC 0x0A450999 /* VA to PA translation operations opc2 values*/ @@ -89,111 +44,78 @@ enum #define V2POWUR 6 #define V2POWUW 7 -typedef struct armv7a_common_s +struct armv7a_common { + struct arm armv4_5_common; int common_magic; - reg_cache_t *core_cache; - enum armv7a_mode core_mode; - enum armv7a_state core_state; + struct reg_cache *core_cache; - /* arm adp debug port */ - swjdp_common_t swjdp_info; + struct adiv5_dap dap; /* Core Debug Unit */ + struct arm_dpm dpm; 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; - -// int (*full_context)(struct target_s *target); -// int (*read_core_reg)(struct target_s *target, int num, enum armv7a_mode mode); -// int (*write_core_reg)(struct target_s *target, int num, enum armv7a_mode mode, u32 value); - int (*read_cp15)(struct target_s *target, - uint32_t op1, uint32_t op2, - uint32_t CRn, uint32_t CRm, uint32_t *value); - int (*write_cp15)(struct target_s *target, - uint32_t op1, uint32_t op2, - uint32_t CRn, uint32_t CRm, uint32_t value); - - int (*examine_debug_reason)(target_t *target); - void (*post_debug_entry)(target_t *target); - - void (*pre_restore_context)(target_t *target); - void (*post_restore_context)(target_t *target); - -} armv7a_common_t; - -static inline struct armv7a_common_s * -target_to_armv7a(struct target_s *target) -{ - return container_of(target->arch_info, struct armv7a_common_s, - armv4_5_common); -} + struct armv4_5_mmu_common armv4_5_mmu; -typedef struct armv7a_algorithm_s -{ - int common_magic; + int (*examine_debug_reason)(struct target *target); + int (*post_debug_entry)(struct target *target); - enum armv7a_mode core_mode; - enum armv7a_state core_state; -} armv7a_algorithm_t; + void (*pre_restore_context)(struct target *target); +}; -typedef struct armv7a_core_reg_s +static inline struct armv7a_common * +target_to_armv7a(struct target *target) { - int num; - enum armv7a_mode mode; - target_t *target; - armv7a_common_t *armv7a_common; -} armv7a_core_reg_t; - -int armv7a_arch_state(struct target_s *target); -reg_cache_t *armv7a_build_reg_cache(target_t *target, - armv7a_common_t *armv7a_common); -int armv7a_register_commands(struct command_context_s *cmd_ctx); -int armv7a_init_arch_info(target_t *target, armv7a_common_t *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; - } + return container_of(target->arch_info, struct armv7a_common, + armv4_5_common); } -/* 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; - } -}; - +/* register offsets from armv7a.debug_base */ + +/* See ARMv7a arch spec section C10.2 */ +#define CPUDBG_DIDR 0x000 + +/* See ARMv7a arch spec section C10.3 */ +#define CPUDBG_WFAR 0x018 +/* PCSR at 0x084 -or- 0x0a0 -or- both ... based on flags in DIDR */ +#define CPUDBG_DSCR 0x088 +#define CPUDBG_DRCR 0x090 +#define CPUDBG_PRCR 0x310 +#define CPUDBG_PRSR 0x314 + +/* See ARMv7a arch spec section C10.4 */ +#define CPUDBG_DTRRX 0x080 +#define CPUDBG_ITR 0x084 +#define CPUDBG_DTRTX 0x08c + +/* See ARMv7a arch spec section C10.5 */ +#define CPUDBG_BVR_BASE 0x100 +#define CPUDBG_BCR_BASE 0x140 +#define CPUDBG_WVR_BASE 0x180 +#define CPUDBG_WCR_BASE 0x1C0 +#define CPUDBG_VCR 0x01C + +/* See ARMv7a arch spec section C10.6 */ +#define CPUDBG_OSLAR 0x300 +#define CPUDBG_OSLSR 0x304 +#define CPUDBG_OSSRR 0x308 +#define CPUDBG_ECR 0x024 + +/* See ARMv7a arch spec section C10.7 */ +#define CPUDBG_DSCCR 0x028 + +/* See ARMv7a arch spec section C10.8 */ +#define CPUDBG_AUTHSTATUS 0xFB8 + +int armv7a_arch_state(struct target *target); +struct reg_cache *armv7a_build_reg_cache(struct target *target, + struct armv7a_common *armv7a_common); +int armv7a_init_arch_info(struct target *target, struct armv7a_common *armv7a); + +extern const struct command_registration armv7a_command_handlers[]; #endif /* ARMV4_5_H */