From 0181296f61f11e4390e5a381906021db4ddd4bcd Mon Sep 17 00:00:00 2001 From: David Brownell Date: Tue, 17 Nov 2009 01:09:50 -0800 Subject: [PATCH 1/1] ARM9TDMI: remove now-needless "struct arm9tdmi" And move the rest of the vector_catch stuff into the C file; it's not part of the module interface. Signed-off-by: David Brownell --- src/target/arm920t.c | 16 +++++++--------- src/target/arm920t.h | 4 ++-- src/target/arm926ejs.c | 10 ++++------ src/target/arm926ejs.h | 4 ++-- src/target/arm966e.c | 6 +++--- src/target/arm966e.h | 4 ++-- src/target/arm9tdmi.c | 31 ++++++++++++++++++++----------- src/target/arm9tdmi.h | 28 +--------------------------- src/target/fa526.c | 14 ++++---------- 9 files changed, 45 insertions(+), 72 deletions(-) diff --git a/src/target/arm920t.c b/src/target/arm920t.c index fca3743d18..62dd3a147e 100644 --- a/src/target/arm920t.c +++ b/src/target/arm920t.c @@ -62,7 +62,7 @@ static int arm920t_read_cp15_physical(struct target *target, uint8_t reg_addr_buf = reg_addr & 0x3f; uint8_t nr_w_buf = 0; - jtag_info = &arm920t->arm9tdmi_common.arm7_9_common.jtag_info; + jtag_info = &arm920t->arm7_9_common.jtag_info; jtag_set_end_state(TAP_IDLE); arm_jtag_scann(jtag_info, 0xf); @@ -115,7 +115,7 @@ static int arm920t_write_cp15_physical(struct target *target, uint8_t nr_w_buf = 1; uint8_t value_buf[4]; - jtag_info = &arm920t->arm9tdmi_common.arm7_9_common.jtag_info; + jtag_info = &arm920t->arm7_9_common.jtag_info; buf_set_u32(value_buf, 0, 32, value); @@ -164,7 +164,7 @@ static int arm920t_execute_cp15(struct target *target, uint32_t cp15_opcode, uint8_t nr_w_buf = 0; uint8_t cp15_opcode_buf[4]; - jtag_info = &arm920t->arm9tdmi_common.arm7_9_common.jtag_info; + jtag_info = &arm920t->arm7_9_common.jtag_info; jtag_set_end_state(TAP_IDLE); arm_jtag_scann(jtag_info, 0xf); @@ -444,7 +444,7 @@ int arm920t_arch_state(struct target *target) return ERROR_TARGET_INVALID; } - armv4_5 = &arm920t->arm9tdmi_common.arm7_9_common.armv4_5_common; + armv4_5 = &arm920t->arm7_9_common.armv4_5_common; 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" @@ -623,12 +623,10 @@ int arm920t_soft_reset_halt(struct target *target) int arm920t_init_arch_info(struct target *target, struct arm920t_common *arm920t, struct jtag_tap *tap) { - struct arm9tdmi_common *arm9tdmi = &arm920t->arm9tdmi_common; - struct arm7_9_common *arm7_9 = &arm9tdmi->arm7_9_common; + struct arm7_9_common *arm7_9 = &arm920t->arm7_9_common; - /* initialize arm9tdmi specific info (including arm7_9 and armv4_5) - */ - arm9tdmi_init_arch_info(target, arm9tdmi, tap); + /* initialize arm7/arm9 specific info (including armv4_5) */ + arm9tdmi_init_arch_info(target, arm7_9, tap); arm920t->common_magic = ARM920T_COMMON_MAGIC; diff --git a/src/target/arm920t.h b/src/target/arm920t.h index 567c8def67..ca6be7ea96 100644 --- a/src/target/arm920t.h +++ b/src/target/arm920t.h @@ -27,7 +27,7 @@ struct arm920t_common { - struct arm9tdmi_common arm9tdmi_common; + struct arm7_9_common arm7_9_common; uint32_t common_magic; struct armv4_5_mmu_common armv4_5_mmu; uint32_t cp15_control_reg; @@ -42,7 +42,7 @@ static inline struct arm920t_common * target_to_arm920(struct target *target) { return container_of(target->arch_info, struct arm920t_common, - arm9tdmi_common.arm7_9_common.armv4_5_common); + arm7_9_common.armv4_5_common); } struct arm920t_cache_line diff --git a/src/target/arm926ejs.c b/src/target/arm926ejs.c index f305390b28..e38e7df40e 100644 --- a/src/target/arm926ejs.c +++ b/src/target/arm926ejs.c @@ -502,7 +502,7 @@ int arm926ejs_arch_state(struct target *target) return ERROR_TARGET_INVALID; } - armv4_5 = &arm926ejs->arm9tdmi_common.arm7_9_common.armv4_5_common; + armv4_5 = &arm926ejs->arm7_9_common.armv4_5_common; 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" @@ -670,12 +670,10 @@ static int arm926ejs_read_phys_memory(struct target *target, int arm926ejs_init_arch_info(struct target *target, struct arm926ejs_common *arm926ejs, struct jtag_tap *tap) { - struct arm9tdmi_common *arm9tdmi = &arm926ejs->arm9tdmi_common; - struct arm7_9_common *arm7_9 = &arm9tdmi->arm7_9_common; + struct arm7_9_common *arm7_9 = &arm926ejs->arm7_9_common; - /* initialize arm9tdmi specific info (including arm7_9 and armv4_5) - */ - arm9tdmi_init_arch_info(target, arm9tdmi, tap); + /* initialize arm7/arm9 specific info (including armv4_5) */ + arm9tdmi_init_arch_info(target, arm7_9, tap); arm926ejs->common_magic = ARM926EJS_COMMON_MAGIC; diff --git a/src/target/arm926ejs.h b/src/target/arm926ejs.h index 22081f4e63..514f054376 100644 --- a/src/target/arm926ejs.h +++ b/src/target/arm926ejs.h @@ -27,7 +27,7 @@ struct arm926ejs_common { - struct arm9tdmi_common arm9tdmi_common; + struct arm7_9_common arm7_9_common; uint32_t common_magic; struct armv4_5_mmu_common armv4_5_mmu; int (*read_cp15)(struct target *target, uint32_t op1, uint32_t op2, uint32_t CRn, uint32_t CRm, uint32_t *value); @@ -42,7 +42,7 @@ static inline struct arm926ejs_common * target_to_arm926(struct target *target) { return container_of(target->arch_info, struct arm926ejs_common, - arm9tdmi_common.arm7_9_common.armv4_5_common); + arm7_9_common.armv4_5_common); } diff --git a/src/target/arm966e.c b/src/target/arm966e.c index 3b85a5cd86..fc50acb665 100644 --- a/src/target/arm966e.c +++ b/src/target/arm966e.c @@ -34,10 +34,10 @@ int arm966e_init_arch_info(struct target *target, struct arm966e_common *arm966e, struct jtag_tap *tap) { - struct arm9tdmi_common *arm9tdmi = &arm966e->arm9tdmi_common; - struct arm7_9_common *arm7_9 = &arm9tdmi->arm7_9_common; + struct arm7_9_common *arm7_9 = &arm966e->arm7_9_common; - arm9tdmi_init_arch_info(target, arm9tdmi, tap); + /* initialize arm7/arm9 specific info (including armv4_5) */ + arm9tdmi_init_arch_info(target, arm7_9, tap); arm966e->common_magic = ARM966E_COMMON_MAGIC; diff --git a/src/target/arm966e.h b/src/target/arm966e.h index b58f3a2413..45aeb4ef1e 100644 --- a/src/target/arm966e.h +++ b/src/target/arm966e.h @@ -29,7 +29,7 @@ struct arm966e_common { - struct arm9tdmi_common arm9tdmi_common; + struct arm7_9_common arm7_9_common; int common_magic; uint32_t cp15_control_reg; }; @@ -38,7 +38,7 @@ static inline struct arm966e_common * target_to_arm966(struct target *target) { return container_of(target->arch_info, struct arm966e_common, - arm9tdmi_common.arm7_9_common.armv4_5_common); + arm7_9_common.armv4_5_common); } int arm966e_init_arch_info(struct target *target, diff --git a/src/target/arm9tdmi.c b/src/target/arm9tdmi.c index 8e8f4d63db..3492c2a942 100644 --- a/src/target/arm9tdmi.c +++ b/src/target/arm9tdmi.c @@ -46,8 +46,22 @@ #define _DEBUG_INSTRUCTION_EXECUTION_ #endif -static const struct arm9tdmi_vector arm9tdmi_vectors[] = +enum arm9tdmi_vector_bit { + ARM9TDMI_RESET_VECTOR = 0x01, + ARM9TDMI_UNDEF_VECTOR = 0x02, + ARM9TDMI_SWI_VECTOR = 0x04, + ARM9TDMI_PABT_VECTOR = 0x08, + ARM9TDMI_DABT_VECTOR = 0x10, + /* BIT(5) reserved -- must be zero */ + ARM9TDMI_IRQ_VECTOR = 0x40, + ARM9TDMI_FIQ_VECTOR = 0x80, +}; + +static const struct arm9tdmi_vector { + char *name; + uint32_t value; +} arm9tdmi_vectors[] = { {"reset", ARM9TDMI_RESET_VECTOR}, {"undef", ARM9TDMI_UNDEF_VECTOR}, {"swi", ARM9TDMI_SWI_VECTOR}, @@ -750,14 +764,9 @@ int arm9tdmi_init_target(struct command_context *cmd_ctx, return ERROR_OK; } -int arm9tdmi_init_arch_info(struct target *target, struct arm9tdmi_common *arm9tdmi, struct jtag_tap *tap) +int arm9tdmi_init_arch_info(struct target *target, + struct arm7_9_common *arm7_9, struct jtag_tap *tap) { - struct arm *armv4_5; - struct arm7_9_common *arm7_9; - - arm7_9 = &arm9tdmi->arm7_9_common; - armv4_5 = &arm7_9->armv4_5_common; - /* prepare JTAG information for the new target */ arm7_9->jtag_info.tap = tap; arm7_9->jtag_info.scann_size = 5; @@ -812,10 +821,10 @@ int arm9tdmi_init_arch_info(struct target *target, struct arm9tdmi_common *arm9t static int arm9tdmi_target_create(struct target *target, Jim_Interp *interp) { - struct arm9tdmi_common *arm9tdmi = calloc(1,sizeof(struct arm9tdmi_common)); + struct arm7_9_common *arm7_9 = calloc(1,sizeof(struct arm7_9_common)); - arm9tdmi_init_arch_info(target, arm9tdmi, target->tap); - arm9tdmi->arm7_9_common.armv4_5_common.is_armv4 = true; + arm9tdmi_init_arch_info(target, arm7_9, target->tap); + arm7_9->armv4_5_common.is_armv4 = true; return ERROR_OK; } diff --git a/src/target/arm9tdmi.h b/src/target/arm9tdmi.h index 496e4c52d2..351b00adfc 100644 --- a/src/target/arm9tdmi.h +++ b/src/target/arm9tdmi.h @@ -25,36 +25,10 @@ #include "embeddedice.h" -/* FIXME we don't really need a separate arm9tdmi struct any more... - * remove it, the arm7/arm9 common struct suffices. - */ -struct arm9tdmi_common -{ - struct arm7_9_common arm7_9_common; -}; - -struct arm9tdmi_vector -{ - char *name; - uint32_t value; -}; - -enum arm9tdmi_vector_bit -{ - ARM9TDMI_RESET_VECTOR = 0x01, - ARM9TDMI_UNDEF_VECTOR = 0x02, - ARM9TDMI_SWI_VECTOR = 0x04, - ARM9TDMI_PABT_VECTOR = 0x08, - ARM9TDMI_DABT_VECTOR = 0x10, - /* BIT(5) reserved -- must be zero */ - ARM9TDMI_IRQ_VECTOR = 0x40, - ARM9TDMI_FIQ_VECTOR = 0x80, -}; - int arm9tdmi_init_target(struct command_context *cmd_ctx, struct target *target); int arm9tdmi_init_arch_info(struct target *target, - struct arm9tdmi_common *arm9tdmi, struct jtag_tap *tap); + struct arm7_9_common *arm7_9, struct jtag_tap *tap); int arm9tdmi_register_commands(struct command_context *cmd_ctx); int arm9tdmi_clock_out(struct arm_jtag *jtag_info, diff --git a/src/target/fa526.c b/src/target/fa526.c index e7c1a2e64e..9c22a750b6 100644 --- a/src/target/fa526.c +++ b/src/target/fa526.c @@ -256,12 +256,8 @@ static void fa526_branch_resume_thumb(struct target *target) } static int fa526_init_arch_info_2(struct target *target, - struct arm9tdmi_common *arm9tdmi, struct jtag_tap *tap) + struct arm7_9_common *arm7_9, struct jtag_tap *tap) { - struct arm7_9_common *arm7_9; - - arm7_9 = &arm9tdmi->arm7_9_common; - /* prepare JTAG information for the new target */ arm7_9->jtag_info.tap = tap; arm7_9->jtag_info.scann_size = 5; @@ -317,12 +313,10 @@ static int fa526_init_arch_info_2(struct target *target, static int fa526_init_arch_info(struct target *target, struct arm920t_common *arm920t, struct jtag_tap *tap) { - struct arm9tdmi_common *arm9tdmi = &arm920t->arm9tdmi_common; - struct arm7_9_common *arm7_9 = &arm9tdmi->arm7_9_common; + struct arm7_9_common *arm7_9 = &arm920t->arm7_9_common; - /* initialize arm9tdmi specific info (including arm7_9 and armv4_5) - */ - fa526_init_arch_info_2(target, arm9tdmi, tap); + /* initialize arm7/arm9 specific info (including armv4_5) */ + fa526_init_arch_info_2(target, arm7_9, tap); arm920t->common_magic = ARM920T_COMMON_MAGIC; -- 2.30.2