zcy
/
tinyriscv-openocd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ARM: other code uses the new inheritance/nesting scheme 

Remove most remaining uses of target->arch_info from ARM
infrastructure, where it hasn't already been updated.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
__archive__
David Brownell 2009-11-05 22:04:22 -08:00
parent a81df55f39
commit 03ac53a2cf
6 changed files with 78 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

129
src/target/arm7_9_common.c
View File

@ -172,8 +172,7 @@ static int arm7_9_set_software_breakpoints(arm7_9_common_t *arm7_9)
*/ */
int arm7_9_setup(target_t *target) int arm7_9_setup(target_t *target)
{ {
armv4_5_common_t *armv4_5 = target->arch_info; struct arm7_9_common_s *arm7_9 = target_to_arm7_9(target);
arm7_9_common_t *arm7_9 = armv4_5->arch_info;
return arm7_9_clear_watchpoints(arm7_9); return arm7_9_clear_watchpoints(arm7_9);
} }
@ -192,18 +191,18 @@ int arm7_9_setup(target_t *target)
*/ */
int arm7_9_get_arch_pointers(target_t *target, armv4_5_common_t **armv4_5_p, arm7_9_common_t **arm7_9_p) int arm7_9_get_arch_pointers(target_t *target, armv4_5_common_t **armv4_5_p, arm7_9_common_t **arm7_9_p)
{ {
armv4_5_common_t *armv4_5 = target->arch_info; struct arm7_9_common_s *arm7_9 = target_to_arm7_9(target);
arm7_9_common_t *arm7_9 = armv4_5->arch_info; struct armv4_5_common_s *armv4_5 = &arm7_9->armv4_5_common;
/* FIXME stop using this routine; just target_to_arm7_9() and
* verify the resulting pointer using a replacement routine
* that emits a usage message.
*/
if (armv4_5->common_magic != ARMV4_5_COMMON_MAGIC) if (armv4_5->common_magic != ARMV4_5_COMMON_MAGIC)
{ return ERROR_TARGET_INVALID;
return -1;
}
if (arm7_9->common_magic != ARM7_9_COMMON_MAGIC) if (arm7_9->common_magic != ARM7_9_COMMON_MAGIC)
{ return ERROR_TARGET_INVALID;
return -1;
}
*armv4_5_p = armv4_5; *armv4_5_p = armv4_5;
*arm7_9_p = arm7_9; *arm7_9_p = arm7_9;
@ -224,8 +223,7 @@ int arm7_9_get_arch_pointers(target_t *target, armv4_5_common_t **armv4_5_p, arm
*/ */
int arm7_9_set_breakpoint(struct target_s *target, breakpoint_t *breakpoint) int arm7_9_set_breakpoint(struct target_s *target, breakpoint_t *breakpoint)
{ {
armv4_5_common_t *armv4_5 = target->arch_info; struct arm7_9_common_s *arm7_9 = target_to_arm7_9(target);
arm7_9_common_t *arm7_9 = armv4_5->arch_info;
int retval = ERROR_OK; int retval = ERROR_OK;
LOG_DEBUG("BPID: %d, Address: 0x%08" PRIx32 ", Type: %d" , LOG_DEBUG("BPID: %d, Address: 0x%08" PRIx32 ", Type: %d" ,
@ -355,9 +353,7 @@ int arm7_9_set_breakpoint(struct target_s *target, breakpoint_t *breakpoint)
int arm7_9_unset_breakpoint(struct target_s *target, breakpoint_t *breakpoint) int arm7_9_unset_breakpoint(struct target_s *target, breakpoint_t *breakpoint)
{ {
int retval = ERROR_OK; int retval = ERROR_OK;
struct arm7_9_common_s *arm7_9 = target_to_arm7_9(target);
armv4_5_common_t *armv4_5 = target->arch_info;
arm7_9_common_t *arm7_9 = armv4_5->arch_info;
LOG_DEBUG("BPID: %d, Address: 0x%08" PRIx32, LOG_DEBUG("BPID: %d, Address: 0x%08" PRIx32,
breakpoint->unique_id, breakpoint->unique_id,
@ -451,8 +447,7 @@ int arm7_9_unset_breakpoint(struct target_s *target, breakpoint_t *breakpoint)
*/ */
int arm7_9_add_breakpoint(struct target_s *target, breakpoint_t *breakpoint) int arm7_9_add_breakpoint(struct target_s *target, breakpoint_t *breakpoint)
{ {
armv4_5_common_t *armv4_5 = target->arch_info; struct arm7_9_common_s *arm7_9 = target_to_arm7_9(target);
arm7_9_common_t *arm7_9 = armv4_5->arch_info;
if (target->state != TARGET_HALTED) if (target->state != TARGET_HALTED)
{ {
@ -503,8 +498,7 @@ int arm7_9_add_breakpoint(struct target_s *target, breakpoint_t *breakpoint)
int arm7_9_remove_breakpoint(struct target_s *target, breakpoint_t *breakpoint) int arm7_9_remove_breakpoint(struct target_s *target, breakpoint_t *breakpoint)
{ {
int retval = ERROR_OK; int retval = ERROR_OK;
armv4_5_common_t *armv4_5 = target->arch_info; struct arm7_9_common_s *arm7_9 = target_to_arm7_9(target);
arm7_9_common_t *arm7_9 = armv4_5->arch_info;
if ((retval = arm7_9_unset_breakpoint(target, breakpoint)) != ERROR_OK) if ((retval = arm7_9_unset_breakpoint(target, breakpoint)) != ERROR_OK)
{ {
@ -540,8 +534,7 @@ int arm7_9_remove_breakpoint(struct target_s *target, breakpoint_t *breakpoint)
int arm7_9_set_watchpoint(struct target_s *target, watchpoint_t *watchpoint) int arm7_9_set_watchpoint(struct target_s *target, watchpoint_t *watchpoint)
{ {
int retval = ERROR_OK; int retval = ERROR_OK;
armv4_5_common_t *armv4_5 = target->arch_info; struct arm7_9_common_s *arm7_9 = target_to_arm7_9(target);
arm7_9_common_t *arm7_9 = armv4_5->arch_info;
int rw_mask = 1; int rw_mask = 1;
uint32_t mask; uint32_t mask;
@ -612,8 +605,7 @@ int arm7_9_set_watchpoint(struct target_s *target, watchpoint_t *watchpoint)
int arm7_9_unset_watchpoint(struct target_s *target, watchpoint_t *watchpoint) int arm7_9_unset_watchpoint(struct target_s *target, watchpoint_t *watchpoint)
{ {
int retval = ERROR_OK; int retval = ERROR_OK;
armv4_5_common_t *armv4_5 = target->arch_info; struct arm7_9_common_s *arm7_9 = target_to_arm7_9(target);
arm7_9_common_t *arm7_9 = armv4_5->arch_info;
if (target->state != TARGET_HALTED) if (target->state != TARGET_HALTED)
{ {
@ -660,8 +652,7 @@ int arm7_9_unset_watchpoint(struct target_s *target, watchpoint_t *watchpoint)
*/ */
int arm7_9_add_watchpoint(struct target_s *target, watchpoint_t *watchpoint) int arm7_9_add_watchpoint(struct target_s *target, watchpoint_t *watchpoint)
{ {
armv4_5_common_t *armv4_5 = target->arch_info; struct arm7_9_common_s *arm7_9 = target_to_arm7_9(target);
arm7_9_common_t *arm7_9 = armv4_5->arch_info;
if (target->state != TARGET_HALTED) if (target->state != TARGET_HALTED)
{ {
@ -695,8 +686,7 @@ int arm7_9_add_watchpoint(struct target_s *target, watchpoint_t *watchpoint)
int arm7_9_remove_watchpoint(struct target_s *target, watchpoint_t *watchpoint) int arm7_9_remove_watchpoint(struct target_s *target, watchpoint_t *watchpoint)
{ {
int retval = ERROR_OK; int retval = ERROR_OK;
armv4_5_common_t *armv4_5 = target->arch_info; struct arm7_9_common_s *arm7_9 = target_to_arm7_9(target);
arm7_9_common_t *arm7_9 = armv4_5->arch_info;
if (watchpoint->set) if (watchpoint->set)
{ {
@ -723,9 +713,7 @@ int arm7_9_remove_watchpoint(struct target_s *target, watchpoint_t *watchpoint)
int arm7_9_execute_sys_speed(struct target_s *target) int arm7_9_execute_sys_speed(struct target_s *target)
{ {
int retval; int retval;
struct arm7_9_common_s *arm7_9 = target_to_arm7_9(target);
armv4_5_common_t *armv4_5 = target->arch_info;
arm7_9_common_t *arm7_9 = armv4_5->arch_info;
arm_jtag_t *jtag_info = &arm7_9->jtag_info; arm_jtag_t *jtag_info = &arm7_9->jtag_info;
reg_t *dbg_stat = &arm7_9->eice_cache->reg_list[EICE_DBG_STAT]; reg_t *dbg_stat = &arm7_9->eice_cache->reg_list[EICE_DBG_STAT];
@ -778,8 +766,7 @@ int arm7_9_execute_fast_sys_speed(struct target_s *target)
static int set = 0; static int set = 0;
static uint8_t check_value[4], check_mask[4]; static uint8_t check_value[4], check_mask[4];
armv4_5_common_t *armv4_5 = target->arch_info; struct arm7_9_common_s *arm7_9 = target_to_arm7_9(target);
arm7_9_common_t *arm7_9 = armv4_5->arch_info;
arm_jtag_t *jtag_info = &arm7_9->jtag_info; arm_jtag_t *jtag_info = &arm7_9->jtag_info;
reg_t *dbg_stat = &arm7_9->eice_cache->reg_list[EICE_DBG_STAT]; reg_t *dbg_stat = &arm7_9->eice_cache->reg_list[EICE_DBG_STAT];
@ -820,8 +807,7 @@ int arm7_9_execute_fast_sys_speed(struct target_s *target)
*/ */
int arm7_9_target_request_data(target_t *target, uint32_t size, uint8_t *buffer) int arm7_9_target_request_data(target_t *target, uint32_t size, uint8_t *buffer)
{ {
armv4_5_common_t *armv4_5 = target->arch_info; struct arm7_9_common_s *arm7_9 = target_to_arm7_9(target);
arm7_9_common_t *arm7_9 = armv4_5->arch_info;
arm_jtag_t *jtag_info = &arm7_9->jtag_info; arm_jtag_t *jtag_info = &arm7_9->jtag_info;
uint32_t *data; uint32_t *data;
int retval = ERROR_OK; int retval = ERROR_OK;
@ -857,8 +843,7 @@ int arm7_9_handle_target_request(void *priv)
target_t *target = priv; target_t *target = priv;
if (!target_was_examined(target)) if (!target_was_examined(target))
return ERROR_OK; return ERROR_OK;
armv4_5_common_t *armv4_5 = target->arch_info; struct arm7_9_common_s *arm7_9 = target_to_arm7_9(target);
arm7_9_common_t *arm7_9 = armv4_5->arch_info;
arm_jtag_t *jtag_info = &arm7_9->jtag_info; arm_jtag_t *jtag_info = &arm7_9->jtag_info;
reg_t *dcc_control = &arm7_9->eice_cache->reg_list[EICE_COMMS_CTRL]; reg_t *dcc_control = &arm7_9->eice_cache->reg_list[EICE_COMMS_CTRL];
@ -916,8 +901,7 @@ int arm7_9_handle_target_request(void *priv)
int arm7_9_poll(target_t *target) int arm7_9_poll(target_t *target)
{ {
int retval; int retval;
armv4_5_common_t *armv4_5 = target->arch_info; struct arm7_9_common_s *arm7_9 = target_to_arm7_9(target);
arm7_9_common_t *arm7_9 = armv4_5->arch_info;
reg_t *dbg_stat = &arm7_9->eice_cache->reg_list[EICE_DBG_STAT]; reg_t *dbg_stat = &arm7_9->eice_cache->reg_list[EICE_DBG_STAT];
/* read debug status register */ /* read debug status register */
@ -1009,8 +993,8 @@ int arm7_9_poll(target_t *target)
*/ */
int arm7_9_assert_reset(target_t *target) int arm7_9_assert_reset(target_t *target)
{ {
armv4_5_common_t *armv4_5 = target->arch_info; struct arm7_9_common_s *arm7_9 = target_to_arm7_9(target);
arm7_9_common_t *arm7_9 = armv4_5->arch_info;
LOG_DEBUG("target->state: %s", LOG_DEBUG("target->state: %s",
target_state_name(target)); target_state_name(target));
@ -1141,8 +1125,7 @@ int arm7_9_deassert_reset(target_t *target)
*/ */
int arm7_9_clear_halt(target_t *target) int arm7_9_clear_halt(target_t *target)
{ {
armv4_5_common_t *armv4_5 = target->arch_info; struct arm7_9_common_s *arm7_9 = target_to_arm7_9(target);
arm7_9_common_t *arm7_9 = armv4_5->arch_info;
reg_t *dbg_ctrl = &arm7_9->eice_cache->reg_list[EICE_DBG_CTRL]; reg_t *dbg_ctrl = &arm7_9->eice_cache->reg_list[EICE_DBG_CTRL];
/* we used DBGRQ only if we didn't come out of reset */ /* we used DBGRQ only if we didn't come out of reset */
@ -1199,8 +1182,8 @@ int arm7_9_clear_halt(target_t *target)
*/ */
int arm7_9_soft_reset_halt(struct target_s *target) int arm7_9_soft_reset_halt(struct target_s *target)
{ {
armv4_5_common_t *armv4_5 = target->arch_info; struct arm7_9_common_s *arm7_9 = target_to_arm7_9(target);
arm7_9_common_t *arm7_9 = armv4_5->arch_info; struct armv4_5_common_s *armv4_5 = &arm7_9->armv4_5_common;
reg_t *dbg_stat = &arm7_9->eice_cache->reg_list[EICE_DBG_STAT]; reg_t *dbg_stat = &arm7_9->eice_cache->reg_list[EICE_DBG_STAT];
reg_t *dbg_ctrl = &arm7_9->eice_cache->reg_list[EICE_DBG_CTRL]; reg_t *dbg_ctrl = &arm7_9->eice_cache->reg_list[EICE_DBG_CTRL];
int i; int i;
@ -1318,8 +1301,7 @@ int arm7_9_halt(target_t *target)
return ERROR_OK; return ERROR_OK;
} }
armv4_5_common_t *armv4_5 = target->arch_info; struct arm7_9_common_s *arm7_9 = target_to_arm7_9(target);
arm7_9_common_t *arm7_9 = armv4_5->arch_info;
reg_t *dbg_ctrl = &arm7_9->eice_cache->reg_list[EICE_DBG_CTRL]; reg_t *dbg_ctrl = &arm7_9->eice_cache->reg_list[EICE_DBG_CTRL];
LOG_DEBUG("target->state: %s", LOG_DEBUG("target->state: %s",
@ -1381,9 +1363,8 @@ int arm7_9_debug_entry(target_t *target)
uint32_t r0_thumb, pc_thumb; uint32_t r0_thumb, pc_thumb;
uint32_t cpsr; uint32_t cpsr;
int retval; int retval;
/* get pointers to arch-specific information */ struct arm7_9_common_s *arm7_9 = target_to_arm7_9(target);
armv4_5_common_t *armv4_5 = target->arch_info; struct armv4_5_common_s *armv4_5 = &arm7_9->armv4_5_common;
arm7_9_common_t *arm7_9 = armv4_5->arch_info;
reg_t *dbg_stat = &arm7_9->eice_cache->reg_list[EICE_DBG_STAT]; reg_t *dbg_stat = &arm7_9->eice_cache->reg_list[EICE_DBG_STAT];
reg_t *dbg_ctrl = &arm7_9->eice_cache->reg_list[EICE_DBG_CTRL]; reg_t *dbg_ctrl = &arm7_9->eice_cache->reg_list[EICE_DBG_CTRL];
@ -1536,8 +1517,8 @@ int arm7_9_full_context(target_t *target)
{ {
int i; int i;
int retval; int retval;
armv4_5_common_t *armv4_5 = target->arch_info; struct arm7_9_common_s *arm7_9 = target_to_arm7_9(target);
arm7_9_common_t *arm7_9 = armv4_5->arch_info; struct armv4_5_common_s *armv4_5 = &arm7_9->armv4_5_common;
LOG_DEBUG("-"); LOG_DEBUG("-");
@ -1627,8 +1608,8 @@ int arm7_9_full_context(target_t *target)
*/ */
int arm7_9_restore_context(target_t *target) int arm7_9_restore_context(target_t *target)
{ {
armv4_5_common_t *armv4_5 = target->arch_info; struct arm7_9_common_s *arm7_9 = target_to_arm7_9(target);
arm7_9_common_t *arm7_9 = armv4_5->arch_info; struct armv4_5_common_s *armv4_5 = &arm7_9->armv4_5_common;
reg_t *reg; reg_t *reg;
armv4_5_core_reg_t *reg_arch_info; armv4_5_core_reg_t *reg_arch_info;
enum armv4_5_mode current_mode = armv4_5->core_mode; enum armv4_5_mode current_mode = armv4_5->core_mode;
@ -1777,8 +1758,7 @@ int arm7_9_restore_context(target_t *target)
*/ */
int arm7_9_restart_core(struct target_s *target) int arm7_9_restart_core(struct target_s *target)
{ {
armv4_5_common_t *armv4_5 = target->arch_info; struct arm7_9_common_s *arm7_9 = target_to_arm7_9(target);
arm7_9_common_t *arm7_9 = armv4_5->arch_info;
arm_jtag_t *jtag_info = &arm7_9->jtag_info; arm_jtag_t *jtag_info = &arm7_9->jtag_info;
/* set RESTART instruction */ /* set RESTART instruction */
@ -1831,8 +1811,8 @@ void arm7_9_enable_breakpoints(struct target_s *target)
int arm7_9_resume(struct target_s *target, int current, uint32_t address, int handle_breakpoints, int debug_execution) int arm7_9_resume(struct target_s *target, int current, uint32_t address, int handle_breakpoints, int debug_execution)
{ {
armv4_5_common_t *armv4_5 = target->arch_info; struct arm7_9_common_s *arm7_9 = target_to_arm7_9(target);
arm7_9_common_t *arm7_9 = armv4_5->arch_info; struct armv4_5_common_s *armv4_5 = &arm7_9->armv4_5_common;
breakpoint_t *breakpoint = target->breakpoints; breakpoint_t *breakpoint = target->breakpoints;
reg_t *dbg_ctrl = &arm7_9->eice_cache->reg_list[EICE_DBG_CTRL]; reg_t *dbg_ctrl = &arm7_9->eice_cache->reg_list[EICE_DBG_CTRL];
int err, retval = ERROR_OK; int err, retval = ERROR_OK;
@ -1991,9 +1971,8 @@ int arm7_9_resume(struct target_s *target, int current, uint32_t address, int ha
void arm7_9_enable_eice_step(target_t *target, uint32_t next_pc) void arm7_9_enable_eice_step(target_t *target, uint32_t next_pc)
{ {
armv4_5_common_t *armv4_5 = target->arch_info; struct arm7_9_common_s *arm7_9 = target_to_arm7_9(target);
arm7_9_common_t *arm7_9 = armv4_5->arch_info; struct armv4_5_common_s *armv4_5 = &arm7_9->armv4_5_common;
uint32_t current_pc; uint32_t current_pc;
current_pc = buf_get_u32(armv4_5->core_cache->reg_list[15].value, 0, 32); current_pc = buf_get_u32(armv4_5->core_cache->reg_list[15].value, 0, 32);
@ -2029,8 +2008,7 @@ void arm7_9_enable_eice_step(target_t *target, uint32_t next_pc)
void arm7_9_disable_eice_step(target_t *target) void arm7_9_disable_eice_step(target_t *target)
{ {
armv4_5_common_t *armv4_5 = target->arch_info; struct arm7_9_common_s *arm7_9 = target_to_arm7_9(target);
arm7_9_common_t *arm7_9 = armv4_5->arch_info;
embeddedice_store_reg(&arm7_9->eice_cache->reg_list[EICE_W0_ADDR_MASK]); embeddedice_store_reg(&arm7_9->eice_cache->reg_list[EICE_W0_ADDR_MASK]);
embeddedice_store_reg(&arm7_9->eice_cache->reg_list[EICE_W0_DATA_MASK]); embeddedice_store_reg(&arm7_9->eice_cache->reg_list[EICE_W0_DATA_MASK]);
@ -2045,8 +2023,8 @@ void arm7_9_disable_eice_step(target_t *target)
int arm7_9_step(struct target_s *target, int current, uint32_t address, int handle_breakpoints) int arm7_9_step(struct target_s *target, int current, uint32_t address, int handle_breakpoints)
{ {
armv4_5_common_t *armv4_5 = target->arch_info; struct arm7_9_common_s *arm7_9 = target_to_arm7_9(target);
arm7_9_common_t *arm7_9 = armv4_5->arch_info; struct armv4_5_common_s *armv4_5 = &arm7_9->armv4_5_common;
breakpoint_t *breakpoint = NULL; breakpoint_t *breakpoint = NULL;
int err, retval; int err, retval;
@ -2141,8 +2119,8 @@ int arm7_9_read_core_reg(struct target_s *target, int num, enum armv4_5_mode mod
uint32_t* reg_p[16]; uint32_t* reg_p[16];
uint32_t value; uint32_t value;
int retval; int retval;
armv4_5_common_t *armv4_5 = target->arch_info; struct arm7_9_common_s *arm7_9 = target_to_arm7_9(target);
arm7_9_common_t *arm7_9 = armv4_5->arch_info; struct armv4_5_common_s *armv4_5 = &arm7_9->armv4_5_common;
if (armv4_5_mode_to_number(armv4_5->core_mode)==-1) if (armv4_5_mode_to_number(armv4_5->core_mode)==-1)
return ERROR_FAIL; return ERROR_FAIL;
@ -2205,8 +2183,8 @@ int arm7_9_read_core_reg(struct target_s *target, int num, enum armv4_5_mode mod
int arm7_9_write_core_reg(struct target_s *target, int num, enum armv4_5_mode mode, uint32_t value) int arm7_9_write_core_reg(struct target_s *target, int num, enum armv4_5_mode mode, uint32_t value)
{ {
uint32_t reg[16]; uint32_t reg[16];
armv4_5_common_t *armv4_5 = target->arch_info; struct arm7_9_common_s *arm7_9 = target_to_arm7_9(target);
arm7_9_common_t *arm7_9 = armv4_5->arch_info; struct armv4_5_common_s *armv4_5 = &arm7_9->armv4_5_common;
if (armv4_5_mode_to_number(armv4_5->core_mode)==-1) if (armv4_5_mode_to_number(armv4_5->core_mode)==-1)
return ERROR_FAIL; return ERROR_FAIL;
@ -2265,9 +2243,8 @@ int arm7_9_write_core_reg(struct target_s *target, int num, enum armv4_5_mode mo
int arm7_9_read_memory(struct target_s *target, uint32_t address, uint32_t size, uint32_t count, uint8_t *buffer) int arm7_9_read_memory(struct target_s *target, uint32_t address, uint32_t size, uint32_t count, uint8_t *buffer)
{ {
armv4_5_common_t *armv4_5 = target->arch_info; struct arm7_9_common_s *arm7_9 = target_to_arm7_9(target);
arm7_9_common_t *arm7_9 = armv4_5->arch_info; struct armv4_5_common_s *armv4_5 = &arm7_9->armv4_5_common;
uint32_t reg[16]; uint32_t reg[16];
uint32_t num_accesses = 0; uint32_t num_accesses = 0;
int thisrun_accesses; int thisrun_accesses;
@ -2441,8 +2418,8 @@ int arm7_9_read_memory(struct target_s *target, uint32_t address, uint32_t size,
int arm7_9_write_memory(struct target_s *target, uint32_t address, uint32_t size, uint32_t count, uint8_t *buffer) int arm7_9_write_memory(struct target_s *target, uint32_t address, uint32_t size, uint32_t count, uint8_t *buffer)
{ {
armv4_5_common_t *armv4_5 = target->arch_info; struct arm7_9_common_s *arm7_9 = target_to_arm7_9(target);
arm7_9_common_t *arm7_9 = armv4_5->arch_info; struct armv4_5_common_s *armv4_5 = &arm7_9->armv4_5_common;
reg_t *dbg_ctrl = &arm7_9->eice_cache->reg_list[EICE_DBG_CTRL]; reg_t *dbg_ctrl = &arm7_9->eice_cache->reg_list[EICE_DBG_CTRL];
uint32_t reg[16]; uint32_t reg[16];
@ -2628,8 +2605,7 @@ static uint8_t *dcc_buffer;
static int arm7_9_dcc_completion(struct target_s *target, uint32_t exit_point, int timeout_ms, void *arch_info) static int arm7_9_dcc_completion(struct target_s *target, uint32_t exit_point, int timeout_ms, void *arch_info)
{ {
int retval = ERROR_OK; int retval = ERROR_OK;
armv4_5_common_t *armv4_5 = target->arch_info; struct arm7_9_common_s *arm7_9 = target_to_arm7_9(target);
arm7_9_common_t *arm7_9 = armv4_5->arch_info;
if ((retval = target_wait_state(target, TARGET_DEBUG_RUNNING, 500)) != ERROR_OK) if ((retval = target_wait_state(target, TARGET_DEBUG_RUNNING, 500)) != ERROR_OK)
return retval; return retval;
@ -2694,8 +2670,7 @@ int armv4_5_run_algorithm_inner(struct target_s *target, int num_mem_params, mem
int arm7_9_bulk_write_memory(target_t *target, uint32_t address, uint32_t count, uint8_t *buffer) int arm7_9_bulk_write_memory(target_t *target, uint32_t address, uint32_t count, uint8_t *buffer)
{ {
int retval; int retval;
armv4_5_common_t *armv4_5 = target->arch_info; struct arm7_9_common_s *arm7_9 = target_to_arm7_9(target);
arm7_9_common_t *arm7_9 = armv4_5->arch_info;
int i; int i;
if (!arm7_9->dcc_downloads) if (!arm7_9->dcc_downloads)

1
src/target/arm7_9_common.h
View File

@ -108,7 +108,6 @@ typedef struct arm7_9_common_s
void (*post_restore_context)(target_t *target); /**< Callback function called after restoring the processor context */ void (*post_restore_context)(target_t *target); /**< Callback function called after restoring the processor context */
armv4_5_common_t armv4_5_common; armv4_5_common_t armv4_5_common;
void *arch_info;
} arm7_9_common_t; } arm7_9_common_t;

4
src/target/arm_simulator.c
View File

@ -825,8 +825,7 @@ static enum armv4_5_mode armv4_5_get_mode(struct arm_sim_interface *sim)
int arm_simulate_step(target_t *target, uint32_t *dry_run_pc) int arm_simulate_step(target_t *target, uint32_t *dry_run_pc)
{ {
armv4_5_common_t *armv4_5 = target->arch_info; struct armv4_5_common_s *armv4_5 = target_to_armv4_5(target);
struct arm_sim_interface sim; struct arm_sim_interface sim;
sim.user_data = armv4_5; sim.user_data = armv4_5;
@ -840,6 +839,5 @@ int arm_simulate_step(target_t *target, uint32_t *dry_run_pc)
sim.set_state = &armv4_5_set_state; sim.set_state = &armv4_5_set_state;
return arm_simulate_step_core(target, dry_run_pc, &sim); return arm_simulate_step_core(target, dry_run_pc, &sim);
} }

18
src/target/armv4_5.c
View File

@ -189,7 +189,7 @@ int armv4_5_set_core_reg(reg_t *reg, uint8_t *buf)
{ {
armv4_5_core_reg_t *armv4_5 = reg->arch_info; armv4_5_core_reg_t *armv4_5 = reg->arch_info;
target_t *target = armv4_5->target; target_t *target = armv4_5->target;
armv4_5_common_t *armv4_5_target = target->arch_info; struct armv4_5_common_s *armv4_5_target = target_to_armv4_5(target);
uint32_t value = buf_get_u32(buf, 0, 32); uint32_t value = buf_get_u32(buf, 0, 32);
if (target->state != TARGET_HALTED) if (target->state != TARGET_HALTED)
@ -237,7 +237,7 @@ int armv4_5_set_core_reg(reg_t *reg, uint8_t *buf)
int armv4_5_invalidate_core_regs(target_t *target) int armv4_5_invalidate_core_regs(target_t *target)
{ {
armv4_5_common_t *armv4_5 = target->arch_info; struct armv4_5_common_s *armv4_5 = target_to_armv4_5(target);
int i; int i;
for (i = 0; i < 37; i++) for (i = 0; i < 37; i++)
@ -289,7 +289,7 @@ reg_cache_t* armv4_5_build_reg_cache(target_t *target, armv4_5_common_t *armv4_5
int armv4_5_arch_state(struct target_s *target) int armv4_5_arch_state(struct target_s *target)
{ {
armv4_5_common_t *armv4_5 = target->arch_info; struct armv4_5_common_s *armv4_5 = target_to_armv4_5(target);
if (armv4_5->common_magic != ARMV4_5_COMMON_MAGIC) if (armv4_5->common_magic != ARMV4_5_COMMON_MAGIC)
{ {
@ -313,7 +313,7 @@ int handle_armv4_5_reg_command(struct command_context_s *cmd_ctx, char *cmd, cha
int output_len; int output_len;
int mode, num; int mode, num;
target_t *target = get_current_target(cmd_ctx); target_t *target = get_current_target(cmd_ctx);
armv4_5_common_t *armv4_5 = target->arch_info; struct armv4_5_common_s *armv4_5 = target_to_armv4_5(target);
if (armv4_5->common_magic != ARMV4_5_COMMON_MAGIC) if (armv4_5->common_magic != ARMV4_5_COMMON_MAGIC)
{ {
@ -362,7 +362,7 @@ int handle_armv4_5_reg_command(struct command_context_s *cmd_ctx, char *cmd, cha
int handle_armv4_5_core_state_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) int handle_armv4_5_core_state_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
{ {
target_t *target = get_current_target(cmd_ctx); target_t *target = get_current_target(cmd_ctx);
armv4_5_common_t *armv4_5 = target->arch_info; struct armv4_5_common_s *armv4_5 = target_to_armv4_5(target);
if (armv4_5->common_magic != ARMV4_5_COMMON_MAGIC) if (armv4_5->common_magic != ARMV4_5_COMMON_MAGIC)
{ {
@ -393,7 +393,7 @@ handle_armv4_5_disassemble_command(struct command_context_s *cmd_ctx,
{ {
int retval = ERROR_OK; int retval = ERROR_OK;
target_t *target = get_current_target(cmd_ctx); target_t *target = get_current_target(cmd_ctx);
armv4_5_common_t *armv4_5 = target->arch_info; struct armv4_5_common_s *armv4_5 = target_to_armv4_5(target);
uint32_t address; uint32_t address;
int count = 1; int count = 1;
int i; int i;
@ -487,7 +487,7 @@ int armv4_5_register_commands(struct command_context_s *cmd_ctx)
int armv4_5_get_gdb_reg_list(target_t *target, reg_t **reg_list[], int *reg_list_size) int armv4_5_get_gdb_reg_list(target_t *target, reg_t **reg_list[], int *reg_list_size)
{ {
armv4_5_common_t *armv4_5 = target->arch_info; struct armv4_5_common_s *armv4_5 = target_to_armv4_5(target);
int i; int i;
if (armv4_5_mode_to_number(armv4_5->core_mode)==-1) if (armv4_5_mode_to_number(armv4_5->core_mode)==-1)
@ -516,7 +516,7 @@ int armv4_5_get_gdb_reg_list(target_t *target, reg_t **reg_list[], int *reg_list
static int armv4_5_run_algorithm_completion(struct target_s *target, uint32_t exit_point, int timeout_ms, void *arch_info) static int armv4_5_run_algorithm_completion(struct target_s *target, uint32_t exit_point, int timeout_ms, void *arch_info)
{ {
int retval; int retval;
armv4_5_common_t *armv4_5 = target->arch_info; struct armv4_5_common_s *armv4_5 = target_to_armv4_5(target);
if ((retval = target_wait_state(target, TARGET_HALTED, timeout_ms)) != ERROR_OK) if ((retval = target_wait_state(target, TARGET_HALTED, timeout_ms)) != ERROR_OK)
{ {
@ -547,7 +547,7 @@ static int armv4_5_run_algorithm_completion(struct target_s *target, uint32_t ex
int armv4_5_run_algorithm_inner(struct target_s *target, int num_mem_params, mem_param_t *mem_params, int num_reg_params, reg_param_t *reg_params, uint32_t entry_point, uint32_t exit_point, int timeout_ms, void *arch_info, int (*run_it)(struct target_s *target, uint32_t exit_point, int timeout_ms, void *arch_info)) int armv4_5_run_algorithm_inner(struct target_s *target, int num_mem_params, mem_param_t *mem_params, int num_reg_params, reg_param_t *reg_params, uint32_t entry_point, uint32_t exit_point, int timeout_ms, void *arch_info, int (*run_it)(struct target_s *target, uint32_t exit_point, int timeout_ms, void *arch_info))
{ {
armv4_5_common_t *armv4_5 = target->arch_info; struct armv4_5_common_s *armv4_5 = target_to_armv4_5(target);
armv4_5_algorithm_t *armv4_5_algorithm_info = arch_info; armv4_5_algorithm_t *armv4_5_algorithm_info = arch_info;
enum armv4_5_state core_state = armv4_5->core_state; enum armv4_5_state core_state = armv4_5->core_state;
enum armv4_5_mode core_mode = armv4_5->core_mode; enum armv4_5_mode core_mode = armv4_5->core_mode;

9
src/target/embeddedice.c
View File

@ -276,10 +276,13 @@ reg_cache_t* embeddedice_build_reg_cache(target_t *target, arm7_9_common_t *arm7
int embeddedice_setup(target_t *target) int embeddedice_setup(target_t *target)
{ {
int retval; int retval;
armv4_5_common_t *armv4_5 = target->arch_info; struct arm7_9_common_s *arm7_9 = target_to_arm7_9(target);
arm7_9_common_t *arm7_9 = armv4_5->arch_info;
/* explicitly disable monitor mode */ /* Explicitly disable monitor mode. For now we only support halting
* debug ... we don't know how to talk with a resident debug monitor
* that manages break requests. ARM's "Angel Debug Monitor" is one
* common example of such code.
*/
if (arm7_9->has_monitor_mode) if (arm7_9->has_monitor_mode)
{ {
reg_t *dbg_ctrl = &arm7_9->eice_cache->reg_list[EICE_DBG_CTRL]; reg_t *dbg_ctrl = &arm7_9->eice_cache->reg_list[EICE_DBG_CTRL];

3
src/target/etm.c
View File

@ -410,8 +410,7 @@ int etm_setup(target_t *target)
{ {
int retval; int retval;
uint32_t etm_ctrl_value; uint32_t etm_ctrl_value;
armv4_5_common_t *armv4_5 = target->arch_info; struct arm7_9_common_s *arm7_9 = target_to_arm7_9(target);
arm7_9_common_t *arm7_9 = armv4_5->arch_info;
etm_context_t *etm_ctx = arm7_9->etm_ctx; etm_context_t *etm_ctx = arm7_9->etm_ctx;
reg_t *etm_ctrl_reg; reg_t *etm_ctrl_reg;