X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Farm7_9_common.h;h=811f9c593e959c1e135b0c91afc72029dad4c147;hp=780d6c9a3632abb011814a7f33dc840ab22c3d52;hb=a851b91c4c1db76dd1e26a7d1a99124ad456b020;hpb=3b7c9585db2dd49b48123d50e9e8af7bc527be52 diff --git a/src/target/arm7_9_common.h b/src/target/arm7_9_common.h index 780d6c9a36..811f9c593e 100644 --- a/src/target/arm7_9_common.h +++ b/src/target/arm7_9_common.h @@ -22,12 +22,11 @@ * 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 ARM7_9_COMMON_H -#define ARM7_9_COMMON_H + +#ifndef OPENOCD_TARGET_ARM7_9_COMMON_H +#define OPENOCD_TARGET_ARM7_9_COMMON_H #include "arm.h" #include "arm_jtag.h" @@ -37,9 +36,8 @@ /** * Structure for items that are common between both ARM7 and ARM9 targets. */ -struct arm7_9_common -{ - struct arm armv4_5_common; +struct arm7_9_common { + struct arm arm; uint32_t common_magic; struct arm_jtag jtag_info; /**< JTAG information for target */ @@ -71,16 +69,26 @@ struct arm7_9_common struct working_area *dcc_working_area; - int (*examine_debug_reason)(struct target *target); /**< Function for determining why debug state was entered */ + int (*examine_debug_reason)(struct target *target); + /**< Function for determining why debug state was entered */ + + void (*change_to_arm)(struct target *target, uint32_t *r0, uint32_t *pc); + /**< Function for changing from Thumb to ARM mode */ + + void (*read_core_regs)(struct target *target, uint32_t mask, uint32_t *core_regs[16]); + /**< Function for reading the core registers */ + + void (*read_core_regs_target_buffer)(struct target *target, uint32_t mask, + void *buffer, int size); + void (*read_xpsr)(struct target *target, uint32_t *xpsr, int spsr); + /**< Function for reading CPSR or SPSR */ - void (*change_to_arm)(struct target *target, uint32_t *r0, uint32_t *pc); /**< Function for changing from Thumb to ARM mode */ + void (*write_xpsr)(struct target *target, uint32_t xpsr, int spsr); + /**< Function for writing to CPSR or SPSR */ - void (*read_core_regs)(struct target *target, uint32_t mask, uint32_t *core_regs[16]); /**< Function for reading the core registers */ - void (*read_core_regs_target_buffer)(struct target *target, uint32_t mask, void *buffer, int size); - void (*read_xpsr)(struct target *target, uint32_t *xpsr, int spsr); /**< Function for reading CPSR or SPSR */ + void (*write_xpsr_im8)(struct target *target, uint8_t xpsr_im, int rot, int spsr); + /**< Function for writing an immediate value to CPSR or SPSR */ - void (*write_xpsr)(struct target *target, uint32_t xpsr, int spsr); /**< Function for writing to CPSR or SPSR */ - void (*write_xpsr_im8)(struct target *target, uint8_t xpsr_im, int rot, int spsr); /**< Function for writing an immediate value to CPSR or SPSR */ void (*write_core_regs)(struct target *target, uint32_t mask, uint32_t core_regs[16]); void (*load_word_regs)(struct target *target, uint32_t mask); @@ -91,25 +99,42 @@ struct arm7_9_common void (*store_hword_reg)(struct target *target, int num); void (*store_byte_reg)(struct target *target, int num); - void (*write_pc)(struct target *target, uint32_t pc); /**< Function for writing to the program counter */ + void (*write_pc)(struct target *target, uint32_t pc); + /**< Function for writing to the program counter */ + void (*branch_resume)(struct target *target); void (*branch_resume_thumb)(struct target *target); void (*enable_single_step)(struct target *target, uint32_t next_pc); void (*disable_single_step)(struct target *target); - void (*set_special_dbgrq)(struct target *target); /**< Function for setting DBGRQ if the normal way won't work */ - - int (*post_debug_entry)(struct target *target); /**< Callback function called after entering debug mode */ - - void (*pre_restore_context)(struct target *target); /**< Callback function called before restoring the processor context */ + void (*set_special_dbgrq)(struct target *target); + /**< Function for setting DBGRQ if the normal way won't work */ + + int (*post_debug_entry)(struct target *target); + /**< Callback function called after entering debug mode */ + + void (*pre_restore_context)(struct target *target); + /**< Callback function called before restoring the processor context */ + + /** + * Variant specific memory write function that does not dispatch to bulk_write_memory. + * Used as a fallback when bulk writes are unavailable, or for writing data needed to + * do the bulk writes. + */ + int (*write_memory)(struct target *target, target_addr_t address, + uint32_t size, uint32_t count, const uint8_t *buffer); + /** + * Write target memory in multiples of 4 bytes, optimized for + * writing large quantities of data. + */ + int (*bulk_write_memory)(struct target *target, target_addr_t address, + uint32_t count, const uint8_t *buffer); }; -static inline struct arm7_9_common * -target_to_arm7_9(struct target *target) +static inline struct arm7_9_common *target_to_arm7_9(struct target *target) { - return container_of(target->arch_info, struct arm7_9_common, - armv4_5_common); + return container_of(target->arch_info, struct arm7_9_common, arm); } static inline bool is_arm7_9(struct arm7_9_common *arm7_9) @@ -128,16 +153,26 @@ int arm7_9_deassert_reset(struct target *target); int arm7_9_reset_request_halt(struct target *target); int arm7_9_early_halt(struct target *target); int arm7_9_soft_reset_halt(struct target *target); -int arm7_9_prepare_reset_halt(struct target *target); int arm7_9_halt(struct target *target); -int arm7_9_resume(struct target *target, int current, uint32_t address, int handle_breakpoints, int debug_execution); -int arm7_9_step(struct target *target, int current, uint32_t address, int handle_breakpoints); -int arm7_9_read_memory(struct target *target, uint32_t address, uint32_t size, uint32_t count, uint8_t *buffer); -int arm7_9_write_memory(struct target *target, uint32_t address, uint32_t size, uint32_t count, const uint8_t *buffer); -int arm7_9_bulk_write_memory(struct target *target, uint32_t address, uint32_t count, const uint8_t *buffer); - -int arm7_9_run_algorithm(struct target *target, int num_mem_params, struct mem_param *mem_params, int num_reg_prams, struct reg_param *reg_param, uint32_t entry_point, void *arch_info); +int arm7_9_resume(struct target *target, int current, target_addr_t address, + int handle_breakpoints, int debug_execution); +int arm7_9_step(struct target *target, int current, target_addr_t address, + int handle_breakpoints); +int arm7_9_read_memory(struct target *target, target_addr_t address, + uint32_t size, uint32_t count, uint8_t *buffer); +int arm7_9_write_memory(struct target *target, target_addr_t address, + uint32_t size, uint32_t count, const uint8_t *buffer); +int arm7_9_write_memory_opt(struct target *target, target_addr_t address, + uint32_t size, uint32_t count, const uint8_t *buffer); +int arm7_9_write_memory_no_opt(struct target *target, uint32_t address, + uint32_t size, uint32_t count, const uint8_t *buffer); +int arm7_9_bulk_write_memory(struct target *target, target_addr_t address, + uint32_t count, const uint8_t *buffer); + +int arm7_9_run_algorithm(struct target *target, int num_mem_params, + struct mem_param *mem_params, int num_reg_prams, + struct reg_param *reg_param, uint32_t entry_point, void *arch_info); int arm7_9_add_breakpoint(struct target *target, struct breakpoint *breakpoint); int arm7_9_remove_breakpoint(struct target *target, struct breakpoint *breakpoint); @@ -153,4 +188,8 @@ int arm7_9_init_arch_info(struct target *target, struct arm7_9_common *arm7_9); int arm7_9_examine(struct target *target); int arm7_9_check_reset(struct target *target); -#endif /* ARM7_9_COMMON_H */ +int arm7_9_endianness_callback(jtag_callback_data_t pu8_in, + jtag_callback_data_t i_size, jtag_callback_data_t i_be, + jtag_callback_data_t i_flip); + +#endif /* OPENOCD_TARGET_ARM7_9_COMMON_H */