X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Farmv7m.h;h=01bf19e5c1733ff79313afb8fc7e65113759581d;hp=bcf0ee1aaeb03c125791352fd6ce0b6f27221942;hb=0627e4686aa18159327751361940595e19b0c525;hpb=ec5e4bae251e01d2b7681e370a6c5e82a81e5962 diff --git a/src/target/armv7m.h b/src/target/armv7m.h index bcf0ee1aae..01bf19e5c1 100644 --- a/src/target/armv7m.h +++ b/src/target/armv7m.h @@ -19,45 +19,20 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ -#ifndef ARMV7M_COMMON_H -#define ARMV7M_COMMON_H +#ifndef OPENOCD_TARGET_ARMV7M_H +#define OPENOCD_TARGET_ARMV7M_H #include "arm_adi_v5.h" #include "arm.h" +#include "armv7m_trace.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, - ARMV7M_MODE_USER_THREAD = 1, - ARMV7M_MODE_HANDLER = 2, - ARMV7M_MODE_ANY = -1 -}; - -extern char *armv7m_mode_strings[]; extern const int armv7m_psp_reg_map[]; extern const int armv7m_msp_reg_map[]; -enum armv7m_regtype { - ARMV7M_REGISTER_CORE_GP, - ARMV7M_REGISTER_CORE_SP, - ARMV7M_REGISTER_MEMMAP -}; - -char *armv7m_exception_string(int number); +const char *armv7m_exception_string(int number); /* offsets into armv7m core register cache */ enum { @@ -157,18 +132,23 @@ enum { enum { FP_NONE = 0, FPv4_SP, + FPv5_SP, + FPv5_DP, }; +#define ARMV7M_NUM_CORE_REGS (ARMV7M_xPSR + 1) +#define ARMV7M_NUM_CORE_REGS_NOFP (ARMV7M_NUM_CORE_REGS + 6) + #define ARMV7M_COMMON_MAGIC 0x2A452A45 struct armv7m_common { struct arm arm; int common_magic; - struct reg_cache *core_cache; - enum armv7m_mode core_mode; int exception_number; - struct adiv5_dap dap; + + /* AP this processor is connected to in the DAP */ + struct adiv5_ap *debug_ap; int fp_feature; uint32_t demcr; @@ -176,15 +156,11 @@ struct armv7m_common { /* stlink is a high level adapter, does not support all functions */ bool stlink; - /* Direct processor core register read and writes */ - 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); + struct armv7m_trace_config trace_config; - /* register cache to processor synchronization */ - int (*read_core_reg)(struct target *target, unsigned num); - int (*write_core_reg)(struct target *target, unsigned num); + /* Direct processor core register read and writes */ + int (*load_core_reg_u32)(struct target *target, uint32_t num, uint32_t *value); + int (*store_core_reg_u32)(struct target *target, uint32_t num, uint32_t value); int (*examine_debug_reason)(struct target *target); int (*post_debug_entry)(struct target *target); @@ -198,7 +174,7 @@ target_to_armv7m(struct target *target) return container_of(target->arch_info, struct armv7m_common, arm); } -static inline bool is_armv7m(struct armv7m_common *armv7m) +static inline bool is_armv7m(const struct armv7m_common *armv7m) { return armv7m->common_magic == ARMV7M_COMMON_MAGIC; } @@ -206,44 +182,40 @@ static inline bool is_armv7m(struct armv7m_common *armv7m) struct armv7m_algorithm { int common_magic; - enum armv7m_mode core_mode; + enum arm_mode core_mode; uint32_t context[ARMV7M_LAST_REG]; /* ARMV7M_NUM_REGS */ }; -struct armv7m_core_reg { - uint32_t num; - enum armv7m_regtype type; - struct target *target; - struct armv7m_common *armv7m_common; -}; - struct reg_cache *armv7m_build_reg_cache(struct target *target); +void armv7m_free_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 *target); int armv7m_get_gdb_reg_list(struct target *target, - struct reg **reg_list[], int *reg_list_size); + struct reg **reg_list[], int *reg_list_size, + enum target_register_class reg_class); int armv7m_init_arch_info(struct target *target, struct armv7m_common *armv7m); 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, + target_addr_t entry_point, target_addr_t exit_point, int timeout_ms, void *arch_info); 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, + target_addr_t entry_point, target_addr_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, + target_addr_t exit_point, int timeout_ms, void *arch_info); int armv7m_invalidate_core_regs(struct target *target); @@ -251,12 +223,12 @@ int armv7m_invalidate_core_regs(struct target *target); int armv7m_restore_context(struct target *target); int armv7m_checksum_memory(struct target *target, - uint32_t address, uint32_t count, uint32_t *checksum); + target_addr_t address, uint32_t count, uint32_t *checksum); int armv7m_blank_check_memory(struct target *target, - uint32_t address, uint32_t count, uint32_t *blank); + struct target_memory_check_block *blocks, int num_blocks, uint8_t erased_value); int armv7m_maybe_skip_bkpt_inst(struct target *target, bool *inst_found); extern const struct command_registration armv7m_command_handlers[]; -#endif /* ARMV7M_H */ +#endif /* OPENOCD_TARGET_ARMV7M_H */