interesting
/
riscv-openocd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ARM7TDMI: remove now-needless "struct arm7tdmi" 

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
This commit is contained in:
David Brownell 2009-11-17 01:09:06 -08:00
parent a2df544fd9
commit 812ab89f58
4 changed files with 21 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/target/arm720t.c
View File

@ -49,7 +49,7 @@ static int arm720t_scan_cp15(struct target *target,
uint8_t out_buf[4]; uint8_t out_buf[4];
uint8_t instruction_buf = instruction; uint8_t instruction_buf = instruction;
jtag_info = &arm720t->arm7tdmi_common.arm7_9_common.jtag_info; jtag_info = &arm720t->arm7_9_common.jtag_info;
buf_set_u32(out_buf, 0, 32, flip_u32(out, 32)); buf_set_u32(out_buf, 0, 32, flip_u32(out, 32));
@ -232,7 +232,7 @@ static int arm720t_arch_state(struct target *target)
"disabled", "enabled" "disabled", "enabled"
}; };
armv4_5 = &arm720t->arm7tdmi_common.arm7_9_common.armv4_5_common; armv4_5 = &arm720t->arm7_9_common.armv4_5_common;
LOG_USER("target halted in %s state due to %s, current mode: %s\n" LOG_USER("target halted in %s state due to %s, current mode: %s\n"
"cpsr: 0x%8.8" PRIx32 " pc: 0x%8.8" PRIx32 "\n" "cpsr: 0x%8.8" PRIx32 " pc: 0x%8.8" PRIx32 "\n"
@ -305,10 +305,10 @@ static int arm720t_soft_reset_halt(struct target *target)
{ {
int retval = ERROR_OK; int retval = ERROR_OK;
struct arm720t_common *arm720t = target_to_arm720(target); struct arm720t_common *arm720t = target_to_arm720(target);
struct reg *dbg_stat = &arm720t->arm7tdmi_common.arm7_9_common struct reg *dbg_stat = &arm720t->arm7_9_common
.eice_cache->reg_list[EICE_DBG_STAT]; .eice_cache->reg_list[EICE_DBG_STAT];
struct armv4_5_common_s *armv4_5 = &arm720t->arm7tdmi_common struct armv4_5_common_s *armv4_5 = &arm720t->arm7_9_common
.arm7_9_common.armv4_5_common; .armv4_5_common;
if ((retval = target_halt(target)) != ERROR_OK) if ((retval = target_halt(target)) != ERROR_OK)
{ {
@ -380,10 +380,9 @@ static int arm720t_init_target(struct command_context *cmd_ctx, struct target *t
static int arm720t_init_arch_info(struct target *target, static int arm720t_init_arch_info(struct target *target,
struct arm720t_common *arm720t, struct jtag_tap *tap) struct arm720t_common *arm720t, struct jtag_tap *tap)
{ {
struct arm7tdmi_common *arm7tdmi = &arm720t->arm7tdmi_common; struct arm7_9_common *arm7_9 = &arm720t->arm7_9_common;
struct arm7_9_common *arm7_9 = &arm7tdmi->arm7_9_common;
arm7tdmi_init_arch_info(target, arm7tdmi, tap); arm7tdmi_init_arch_info(target, arm7_9, tap);
arm720t->common_magic = ARM720T_COMMON_MAGIC; arm720t->common_magic = ARM720T_COMMON_MAGIC;
@ -406,7 +405,7 @@ static int arm720t_target_create(struct target *target, Jim_Interp *interp)
{ {
struct arm720t_common *arm720t = calloc(1, sizeof(*arm720t)); struct arm720t_common *arm720t = calloc(1, sizeof(*arm720t));
arm720t->arm7tdmi_common.arm7_9_common.armv4_5_common.is_armv4 = true; arm720t->arm7_9_common.armv4_5_common.is_armv4 = true;
return arm720t_init_arch_info(target, arm720t, target->tap); return arm720t_init_arch_info(target, arm720t, target->tap);
} }
@ -421,7 +420,7 @@ COMMAND_HANDLER(arm720t_handle_cp15_command)
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
jtag_info = &arm720t->arm7tdmi_common.arm7_9_common.jtag_info; jtag_info = &arm720t->arm7_9_common.jtag_info;
if (target->state != TARGET_HALTED) if (target->state != TARGET_HALTED)
{ {

4
src/target/arm720t.h
View File

@ -27,7 +27,7 @@
struct arm720t_common struct arm720t_common
{ {
struct arm7tdmi_common arm7tdmi_common; struct arm7_9_common arm7_9_common;
uint32_t common_magic; uint32_t common_magic;
struct armv4_5_mmu_common armv4_5_mmu; struct armv4_5_mmu_common armv4_5_mmu;
uint32_t cp15_control_reg; uint32_t cp15_control_reg;
@ -39,7 +39,7 @@ static inline struct arm720t_common *
target_to_arm720(struct target *target) target_to_arm720(struct target *target)
{ {
return container_of(target->arch_info, struct arm720t_common, return container_of(target->arch_info, struct arm720t_common,
arm7tdmi_common.arm7_9_common.armv4_5_common); arm7_9_common.armv4_5_common);
} }
#endif /* ARM720T_H */ #endif /* ARM720T_H */

13
src/target/arm7tdmi.c
View File

@ -654,10 +654,9 @@ int arm7tdmi_init_target(struct command_context *cmd_ctx, struct target *target)
return ERROR_OK; return ERROR_OK;
} }
int arm7tdmi_init_arch_info(struct target *target, struct arm7tdmi_common *arm7tdmi, struct jtag_tap *tap) int arm7tdmi_init_arch_info(struct target *target,
struct arm7_9_common *arm7_9, struct jtag_tap *tap)
{ {
struct arm7_9_common *arm7_9 = &arm7tdmi->arm7_9_common;
/* prepare JTAG information for the new target */ /* prepare JTAG information for the new target */
arm7_9->jtag_info.tap = tap; arm7_9->jtag_info.tap = tap;
arm7_9->jtag_info.scann_size = 4; arm7_9->jtag_info.scann_size = 4;
@ -706,11 +705,11 @@ int arm7tdmi_init_arch_info(struct target *target, struct arm7tdmi_common *arm7t
static int arm7tdmi_target_create(struct target *target, Jim_Interp *interp) static int arm7tdmi_target_create(struct target *target, Jim_Interp *interp)
{ {
struct arm7tdmi_common *arm7tdmi; struct arm7_9_common *arm7_9;
arm7tdmi = calloc(1,sizeof(struct arm7tdmi_common)); arm7_9 = calloc(1,sizeof(struct arm7_9_common));
arm7tdmi_init_arch_info(target, arm7tdmi, target->tap); arm7tdmi_init_arch_info(target, arm7_9, target->tap);
arm7tdmi->arm7_9_common.armv4_5_common.is_armv4 = true; arm7_9->armv4_5_common.is_armv4 = true;
return ERROR_OK; return ERROR_OK;
} }

14
src/target/arm7tdmi.h
View File

@ -25,15 +25,9 @@
#include "embeddedice.h" #include "embeddedice.h"
/* FIXME we don't really need a separate arm7tdmi struct any more... int arm7tdmi_init_arch_info(struct target *target,
* remove it, the arm7/arm9 common struct suffices. struct arm7_9_common *arm7_9, struct jtag_tap *tap);
*/ int arm7tdmi_init_target(struct command_context *cmd_ctx,
struct arm7tdmi_common struct target *target);
{
struct arm7_9_common arm7_9_common;
};
int arm7tdmi_init_arch_info(struct target *target, struct arm7tdmi_common *arm7tdmi, struct jtag_tap *tap);
int arm7tdmi_init_target(struct command_context *cmd_ctx, struct target *target);
#endif /* ARM7TDMI_H */ #endif /* ARM7TDMI_H */