X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Farmv7m.h;h=ca921468fc15c4511bf9d5e8ebd8a1518b414a6c;hp=76016856265c4524d4bd74076b844f3db9cfcd49;hb=9d4c466c219039bd6a2ea03467cd3ee8be2a0e76;hpb=3885ab5a5af7ece410ce3eeb1059da3ea950436a diff --git a/src/target/armv7m.h b/src/target/armv7m.h index 7601685626..ca921468fc 100644 --- a/src/target/armv7m.h +++ b/src/target/armv7m.h @@ -27,12 +27,19 @@ #define ARMV7M_COMMON_H #include "arm_adi_v5.h" +#include "arm.h" /* define for enabling armv7 gdb workarounds */ #if 1 #define ARMV7_GDB_HACKS #endif +#ifdef ARMV7_GDB_HACKS +extern uint8_t armv7m_gdb_dummy_cpsr_value[]; +extern struct reg armv7m_gdb_dummy_cpsr_reg; +#endif + + enum armv7m_mode { ARMV7M_MODE_THREAD = 0, @@ -91,152 +98,101 @@ enum #define ARMV7M_COMMON_MAGIC 0x2A452A45 -typedef struct armv7m_common_s +struct armv7m_common { + struct arm arm; + int common_magic; - reg_cache_t *core_cache; + struct reg_cache *core_cache; enum armv7m_mode core_mode; int exception_number; - swjdp_common_t swjdp_info; + struct adiv5_dap dap; + + uint32_t demcr; /* Direct processor core register read and writes */ - int (*load_core_reg_u32)(struct target_s *target, enum armv7m_regtype type, uint32_t num, uint32_t *value); - int (*store_core_reg_u32)(struct target_s *target, enum armv7m_regtype type, uint32_t num, uint32_t value); + int (*load_core_reg_u32)(struct target *target, + enum armv7m_regtype type, uint32_t num, uint32_t *value); + int (*store_core_reg_u32)(struct target *target, + enum armv7m_regtype type, uint32_t num, uint32_t value); + /* register cache to processor synchronization */ - int (*read_core_reg)(struct target_s *target, int num); - int (*write_core_reg)(struct target_s *target, int num); + int (*read_core_reg)(struct target *target, unsigned num); + int (*write_core_reg)(struct target *target, unsigned num); - int (*examine_debug_reason)(target_t *target); - void (*post_debug_entry)(target_t *target); + int (*examine_debug_reason)(struct target *target); + int (*post_debug_entry)(struct target *target); - void (*pre_restore_context)(target_t *target); - void (*post_restore_context)(target_t *target); -} armv7m_common_t; + void (*pre_restore_context)(struct target *target); +}; -static inline struct armv7m_common_s * -target_to_armv7m(struct target_s *target) +static inline struct armv7m_common * +target_to_armv7m(struct target *target) { - return target->arch_info; + return container_of(target->arch_info, struct armv7m_common, arm); } -typedef struct armv7m_algorithm_s +static inline bool is_armv7m(struct armv7m_common *armv7m) +{ + return armv7m->common_magic == ARMV7M_COMMON_MAGIC; +} + +struct armv7m_algorithm { int common_magic; enum armv7m_mode core_mode; -} armv7m_algorithm_t; -typedef struct armv7m_core_reg_s + uint32_t context[ARMV7M_CONTROL + 1]; //ARMV7M_NUM_REGS +}; + +struct armv7m_core_reg { uint32_t num; enum armv7m_regtype type; - target_t *target; - armv7m_common_t *armv7m_common; -} armv7m_core_reg_t; + struct target *target; + struct armv7m_common *armv7m_common; +}; -reg_cache_t *armv7m_build_reg_cache(target_t *target); +struct reg_cache *armv7m_build_reg_cache(struct target *target); enum armv7m_mode armv7m_number_to_mode(int number); int armv7m_mode_to_number(enum armv7m_mode mode); -int armv7m_arch_state(struct target_s *target); -int armv7m_get_gdb_reg_list(target_t *target, - reg_t **reg_list[], int *reg_list_size); +int armv7m_arch_state(struct target *target); +int armv7m_get_gdb_reg_list(struct target *target, + struct reg **reg_list[], int *reg_list_size); -int armv7m_register_commands(struct command_context_s *cmd_ctx); -int armv7m_init_arch_info(target_t *target, armv7m_common_t *armv7m); +int armv7m_init_arch_info(struct target *target, struct armv7m_common *armv7m); -int armv7m_run_algorithm(struct target_s *target, - int num_mem_params, mem_param_t *mem_params, - int num_reg_params, reg_param_t *reg_params, +int armv7m_run_algorithm(struct target *target, + int num_mem_params, struct mem_param *mem_params, + int num_reg_params, struct reg_param *reg_params, uint32_t entry_point, uint32_t exit_point, int timeout_ms, void *arch_info); -int armv7m_invalidate_core_regs(target_t *target); +int armv7m_start_algorithm(struct target *target, + int num_mem_params, struct mem_param *mem_params, + int num_reg_params, struct reg_param *reg_params, + uint32_t entry_point, uint32_t exit_point, + void *arch_info); + +int armv7m_wait_algorithm(struct target *target, + int num_mem_params, struct mem_param *mem_params, + int num_reg_params, struct reg_param *reg_params, + uint32_t exit_point, int timeout_ms, + void *arch_info); -int armv7m_restore_context(target_t *target); +int armv7m_invalidate_core_regs(struct target *target); -int armv7m_checksum_memory(struct target_s *target, +int armv7m_restore_context(struct target *target); + +int armv7m_checksum_memory(struct target *target, uint32_t address, uint32_t count, uint32_t* checksum); -int armv7m_blank_check_memory(struct target_s *target, +int armv7m_blank_check_memory(struct target *target, uint32_t address, uint32_t count, uint32_t* blank); -/* Thumb mode instructions - */ - -/* Move to Register from Special Register (Thumb mode) 32 bit Thumb2 instruction - * Rd: destination register - * SYSm: source special register - */ -#define ARMV7M_T_MRS(Rd, SYSm) ((0xF3EF) | ((0x8000 | (Rd << 8) | SYSm) << 16)) - -/* Move from Register from Special Register (Thumb mode) 32 bit Thumb2 instruction - * Rd: source register - * SYSm: destination special register - */ -#define ARMV7M_T_MSR(SYSm, Rn) ((0xF380 | (Rn << 8)) | ((0x8800 | SYSm) << 16)) - -/* Change Processor State. The instruction modifies the PRIMASK and FAULTMASK - * special-purpose register values (Thumb mode) 16 bit Thumb2 instruction - * Rd: source register - * IF: - */ -#define I_FLAG 2 -#define F_FLAG 1 -#define ARMV7M_T_CPSID(IF) ((0xB660 | (1 << 8) | (IF&0x3)) | ((0xB660 | (1 << 8) | (IF&0x3)) << 16)) -#define ARMV7M_T_CPSIE(IF) ((0xB660 | (0 << 8) | (IF&0x3)) | ((0xB660 | (0 << 8) | (IF&0x3)) << 16)) - -/* Breakpoint (Thumb mode) v5 onwards - * Im: immediate value used by debugger - */ -#define ARMV7M_T_BKPT(Im) ((0xBE00 | Im) | ((0xBE00 | Im) << 16)) - -/* Store register (Thumb mode) - * Rd: source register - * Rn: base register - */ -#define ARMV7M_T_STR(Rd, Rn) ((0x6000 | Rd | (Rn << 3)) | ((0x6000 | Rd | (Rn << 3)) << 16)) - -/* Load register (Thumb state) - * Rd: destination register - * Rn: base register - */ -#define ARMV7M_T_LDR(Rd, Rn) ((0x6800 | (Rn << 3) | Rd) | ((0x6800 | (Rn << 3) | Rd) << 16)) - -/* Load multiple (Thumb state) - * Rn: base register - * List: for each bit in list: store register - */ -#define ARMV7M_T_LDMIA(Rn, List) ((0xc800 | (Rn << 8) | List) | ((0xc800 | (Rn << 8) | List) << 16)) - -/* Load register with PC relative addressing - * Rd: register to load - */ -#define ARMV7M_T_LDR_PCREL(Rd) ((0x4800 | (Rd << 8)) | ((0x4800 | (Rd << 8)) << 16)) - -/* Move hi register (Thumb mode) - * Rd: destination register - * Rm: source register - */ -#define ARMV7M_T_MOV(Rd, Rm) ((0x4600 | (Rd & 0x7) | ((Rd & 0x8) << 4) | ((Rm & 0x7) << 3) | ((Rm & 0x8) << 3)) | ((0x4600 | (Rd & 0x7) | ((Rd & 0x8) << 4) | ((Rm & 0x7) << 3) | ((Rm & 0x8) << 3)) << 16)) - -/* No operation (Thumb mode) - */ -#define ARMV7M_T_NOP (0x46c0 | (0x46c0 << 16)) - -/* Move immediate to register (Thumb state) - * Rd: destination register - * Im: 8-bit immediate value - */ -#define ARMV7M_T_MOV_IM(Rd, Im) ((0x2000 | (Rd << 8) | Im) | ((0x2000 | (Rd << 8) | Im) << 16)) - -/* Branch and Exchange - * Rm: register containing branch target - */ -#define ARMV7M_T_BX(Rm) ((0x4700 | (Rm << 3)) | ((0x4700 | (Rm << 3)) << 16)) - -/* Branch (Thumb state) - * Imm: Branch target - */ -#define ARMV7M_T_B(Imm) ((0xe000 | Imm) | ((0xe000 | Imm) << 16)) +int armv7m_maybe_skip_bkpt_inst(struct target *target, bool *inst_found); + +extern const struct command_registration armv7m_command_handlers[]; #endif /* ARMV7M_H */