diff options
author | Zachary T Welch <zw@superlucidity.net> | 2009-11-13 09:06:49 -0800 |
---|---|---|
committer | Zachary T Welch <zw@superlucidity.net> | 2009-11-13 11:58:12 -0800 |
commit | 55edfdf2ab6c5d1d6cd4c1c97a79cbb1d39b1f22 (patch) | |
tree | 433f8e72791e1b4537eb710f52f7ca07ae6c6b24 /src | |
parent | 22f6a4cef5b4bf6696a7ea0fa41fafc3da06c9fa (diff) | |
download | openocd+libswd-55edfdf2ab6c5d1d6cd4c1c97a79cbb1d39b1f22.tar.gz openocd+libswd-55edfdf2ab6c5d1d6cd4c1c97a79cbb1d39b1f22.tar.bz2 openocd+libswd-55edfdf2ab6c5d1d6cd4c1c97a79cbb1d39b1f22.tar.xz openocd+libswd-55edfdf2ab6c5d1d6cd4c1c97a79cbb1d39b1f22.zip |
arm_instruction_t -> struct arm_instruction
Remove misleading typedef and redundant suffix from struct arm_instruction.
Diffstat (limited to 'src')
-rw-r--r-- | src/target/arm_disassembler.c | 116 | ||||
-rw-r--r-- | src/target/arm_disassembler.h | 12 | ||||
-rw-r--r-- | src/target/arm_simulator.c | 2 | ||||
-rw-r--r-- | src/target/armv4_5.c | 2 | ||||
-rw-r--r-- | src/target/armv7a.c | 2 | ||||
-rw-r--r-- | src/target/cortex_m3.c | 2 | ||||
-rw-r--r-- | src/target/etm.c | 4 | ||||
-rw-r--r-- | src/target/xscale.c | 6 |
8 files changed, 73 insertions, 73 deletions
diff --git a/src/target/arm_disassembler.c b/src/target/arm_disassembler.c index ee087b12..ce338859 100644 --- a/src/target/arm_disassembler.c +++ b/src/target/arm_disassembler.c @@ -107,7 +107,7 @@ static uint32_t ror(uint32_t value, int places) } static int evaluate_pld(uint32_t opcode, - uint32_t address, arm_instruction_t *instruction) + uint32_t address, struct arm_instruction *instruction) { /* PLD */ if ((opcode & 0x0d70f000) == 0x0550f000) @@ -129,7 +129,7 @@ static int evaluate_pld(uint32_t opcode, } static int evaluate_swi(uint32_t opcode, - uint32_t address, arm_instruction_t *instruction) + uint32_t address, struct arm_instruction *instruction) { instruction->type = ARM_SWI; @@ -141,7 +141,7 @@ static int evaluate_swi(uint32_t opcode, } static int evaluate_blx_imm(uint32_t opcode, - uint32_t address, arm_instruction_t *instruction) + uint32_t address, struct arm_instruction *instruction) { int offset; uint32_t immediate; @@ -174,7 +174,7 @@ static int evaluate_blx_imm(uint32_t opcode, } static int evaluate_b_bl(uint32_t opcode, - uint32_t address, arm_instruction_t *instruction) + uint32_t address, struct arm_instruction *instruction) { uint8_t L; uint32_t immediate; @@ -212,7 +212,7 @@ static int evaluate_b_bl(uint32_t opcode, /* Coprocessor load/store and double register transfers */ /* both normal and extended instruction space (condition field b1111) */ static int evaluate_ldc_stc_mcrr_mrrc(uint32_t opcode, - uint32_t address, arm_instruction_t *instruction) + uint32_t address, struct arm_instruction *instruction) { uint8_t cp_num = (opcode & 0xf00) >> 8; @@ -293,7 +293,7 @@ static int evaluate_ldc_stc_mcrr_mrrc(uint32_t opcode, /* Coprocessor register transfer instructions */ /* both normal and extended instruction space (condition field b1111) */ static int evaluate_cdp_mcr_mrc(uint32_t opcode, - uint32_t address, arm_instruction_t *instruction) + uint32_t address, struct arm_instruction *instruction) { const char *cond; char* mnemonic; @@ -343,7 +343,7 @@ static int evaluate_cdp_mcr_mrc(uint32_t opcode, /* Load/store instructions */ static int evaluate_load_store(uint32_t opcode, - uint32_t address, arm_instruction_t *instruction) + uint32_t address, struct arm_instruction *instruction) { uint8_t I, P, U, B, W, L; uint8_t Rn, Rd; @@ -634,7 +634,7 @@ undef: /* ARMv6 and later support "media" instructions (includes SIMD) */ static int evaluate_media(uint32_t opcode, uint32_t address, - arm_instruction_t *instruction) + struct arm_instruction *instruction) { char *cp = instruction->text; char *mnemonic = NULL; @@ -829,7 +829,7 @@ undef: /* Miscellaneous load/store instructions */ static int evaluate_misc_load_store(uint32_t opcode, - uint32_t address, arm_instruction_t *instruction) + uint32_t address, struct arm_instruction *instruction) { uint8_t P, U, I, W, L, S, H; uint8_t Rn, Rd; @@ -957,7 +957,7 @@ static int evaluate_misc_load_store(uint32_t opcode, /* Load/store multiples instructions */ static int evaluate_ldm_stm(uint32_t opcode, - uint32_t address, arm_instruction_t *instruction) + uint32_t address, struct arm_instruction *instruction) { uint8_t P, U, S, W, L, Rn; uint32_t register_list; @@ -1046,7 +1046,7 @@ static int evaluate_ldm_stm(uint32_t opcode, /* Multiplies, extra load/stores */ static int evaluate_mul_and_extra_ld_st(uint32_t opcode, - uint32_t address, arm_instruction_t *instruction) + uint32_t address, struct arm_instruction *instruction) { /* Multiply (accumulate) (long) and Swap/swap byte */ if ((opcode & 0x000000f0) == 0x00000090) @@ -1138,7 +1138,7 @@ static int evaluate_mul_and_extra_ld_st(uint32_t opcode, } static int evaluate_mrs_msr(uint32_t opcode, - uint32_t address, arm_instruction_t *instruction) + uint32_t address, struct arm_instruction *instruction) { int R = (opcode & 0x00400000) >> 22; char *PSR = (R) ? "SPSR" : "CPSR"; @@ -1193,7 +1193,7 @@ static int evaluate_mrs_msr(uint32_t opcode, /* Miscellaneous instructions */ static int evaluate_misc_instr(uint32_t opcode, - uint32_t address, arm_instruction_t *instruction) + uint32_t address, struct arm_instruction *instruction) { /* MRS/MSR */ if ((opcode & 0x000000f0) == 0x00000000) @@ -1384,7 +1384,7 @@ static int evaluate_misc_instr(uint32_t opcode, } static int evaluate_data_proc(uint32_t opcode, - uint32_t address, arm_instruction_t *instruction) + uint32_t address, struct arm_instruction *instruction) { uint8_t I, op, S, Rn, Rd; char *mnemonic = NULL; @@ -1591,10 +1591,10 @@ static int evaluate_data_proc(uint32_t opcode, return ERROR_OK; } -int arm_evaluate_opcode(uint32_t opcode, uint32_t address, arm_instruction_t *instruction) +int arm_evaluate_opcode(uint32_t opcode, uint32_t address, struct arm_instruction *instruction) { /* clear fields, to avoid confusion */ - memset(instruction, 0, sizeof(arm_instruction_t)); + memset(instruction, 0, sizeof(struct arm_instruction)); instruction->opcode = opcode; instruction->instruction_size = 4; @@ -1744,7 +1744,7 @@ int arm_evaluate_opcode(uint32_t opcode, uint32_t address, arm_instruction_t *in } static int evaluate_b_bl_blx_thumb(uint16_t opcode, - uint32_t address, arm_instruction_t *instruction) + uint32_t address, struct arm_instruction *instruction) { uint32_t offset = opcode & 0x7ff; uint32_t opc = (opcode >> 11) & 0x3; @@ -1799,7 +1799,7 @@ static int evaluate_b_bl_blx_thumb(uint16_t opcode, } static int evaluate_add_sub_thumb(uint16_t opcode, - uint32_t address, arm_instruction_t *instruction) + uint32_t address, struct arm_instruction *instruction) { uint8_t Rd = (opcode >> 0) & 0x7; uint8_t Rn = (opcode >> 3) & 0x7; @@ -1845,7 +1845,7 @@ static int evaluate_add_sub_thumb(uint16_t opcode, } static int evaluate_shift_imm_thumb(uint16_t opcode, - uint32_t address, arm_instruction_t *instruction) + uint32_t address, struct arm_instruction *instruction) { uint8_t Rd = (opcode >> 0) & 0x7; uint8_t Rm = (opcode >> 3) & 0x7; @@ -1891,7 +1891,7 @@ static int evaluate_shift_imm_thumb(uint16_t opcode, } static int evaluate_data_proc_imm_thumb(uint16_t opcode, - uint32_t address, arm_instruction_t *instruction) + uint32_t address, struct arm_instruction *instruction) { uint8_t imm = opcode & 0xff; uint8_t Rd = (opcode >> 8) & 0x7; @@ -1934,7 +1934,7 @@ static int evaluate_data_proc_imm_thumb(uint16_t opcode, } static int evaluate_data_proc_thumb(uint16_t opcode, - uint32_t address, arm_instruction_t *instruction) + uint32_t address, struct arm_instruction *instruction) { uint8_t high_reg, op, Rm, Rd,H1,H2; char *mnemonic = NULL; @@ -2120,7 +2120,7 @@ static inline uint32_t thumb_alignpc4(uint32_t addr) } static int evaluate_load_literal_thumb(uint16_t opcode, - uint32_t address, arm_instruction_t *instruction) + uint32_t address, struct arm_instruction *instruction) { uint32_t immediate; uint8_t Rd = (opcode >> 8) & 0x7; @@ -2145,7 +2145,7 @@ static int evaluate_load_literal_thumb(uint16_t opcode, } static int evaluate_load_store_reg_thumb(uint16_t opcode, - uint32_t address, arm_instruction_t *instruction) + uint32_t address, struct arm_instruction *instruction) { uint8_t Rd = (opcode >> 0) & 0x7; uint8_t Rn = (opcode >> 3) & 0x7; @@ -2203,7 +2203,7 @@ static int evaluate_load_store_reg_thumb(uint16_t opcode, } static int evaluate_load_store_imm_thumb(uint16_t opcode, - uint32_t address, arm_instruction_t *instruction) + uint32_t address, struct arm_instruction *instruction) { uint32_t offset = (opcode >> 6) & 0x1f; uint8_t Rd = (opcode >> 0) & 0x7; @@ -2250,7 +2250,7 @@ static int evaluate_load_store_imm_thumb(uint16_t opcode, } static int evaluate_load_store_stack_thumb(uint16_t opcode, - uint32_t address, arm_instruction_t *instruction) + uint32_t address, struct arm_instruction *instruction) { uint32_t offset = opcode & 0xff; uint8_t Rd = (opcode >> 8) & 0x7; @@ -2282,7 +2282,7 @@ static int evaluate_load_store_stack_thumb(uint16_t opcode, } static int evaluate_add_sp_pc_thumb(uint16_t opcode, - uint32_t address, arm_instruction_t *instruction) + uint32_t address, struct arm_instruction *instruction) { uint32_t imm = opcode & 0xff; uint8_t Rd = (opcode >> 8) & 0x7; @@ -2316,7 +2316,7 @@ static int evaluate_add_sp_pc_thumb(uint16_t opcode, } static int evaluate_adjust_stack_thumb(uint16_t opcode, - uint32_t address, arm_instruction_t *instruction) + uint32_t address, struct arm_instruction *instruction) { uint32_t imm = opcode & 0x7f; uint8_t opc = opcode & (1 << 7); @@ -2347,7 +2347,7 @@ static int evaluate_adjust_stack_thumb(uint16_t opcode, } static int evaluate_breakpoint_thumb(uint16_t opcode, - uint32_t address, arm_instruction_t *instruction) + uint32_t address, struct arm_instruction *instruction) { uint32_t imm = opcode & 0xff; @@ -2361,7 +2361,7 @@ static int evaluate_breakpoint_thumb(uint16_t opcode, } static int evaluate_load_store_multiple_thumb(uint16_t opcode, - uint32_t address, arm_instruction_t *instruction) + uint32_t address, struct arm_instruction *instruction) { uint32_t reg_list = opcode & 0xff; uint32_t L = opcode & (1 << 11); @@ -2439,7 +2439,7 @@ static int evaluate_load_store_multiple_thumb(uint16_t opcode, } static int evaluate_cond_branch_thumb(uint16_t opcode, - uint32_t address, arm_instruction_t *instruction) + uint32_t address, struct arm_instruction *instruction) { uint32_t offset = opcode & 0xff; uint8_t cond = (opcode >> 8) & 0xf; @@ -2481,7 +2481,7 @@ static int evaluate_cond_branch_thumb(uint16_t opcode, } static int evaluate_cb_thumb(uint16_t opcode, uint32_t address, - arm_instruction_t *instruction) + struct arm_instruction *instruction) { unsigned offset; @@ -2499,7 +2499,7 @@ static int evaluate_cb_thumb(uint16_t opcode, uint32_t address, } static int evaluate_extend_thumb(uint16_t opcode, uint32_t address, - arm_instruction_t *instruction) + struct arm_instruction *instruction) { /* added in ARMv6 */ snprintf(instruction->text, 128, @@ -2513,7 +2513,7 @@ static int evaluate_extend_thumb(uint16_t opcode, uint32_t address, } static int evaluate_cps_thumb(uint16_t opcode, uint32_t address, - arm_instruction_t *instruction) + struct arm_instruction *instruction) { /* added in ARMv6 */ if ((opcode & 0x0ff0) == 0x0650) @@ -2534,7 +2534,7 @@ static int evaluate_cps_thumb(uint16_t opcode, uint32_t address, } static int evaluate_byterev_thumb(uint16_t opcode, uint32_t address, - arm_instruction_t *instruction) + struct arm_instruction *instruction) { char *suffix; @@ -2559,7 +2559,7 @@ static int evaluate_byterev_thumb(uint16_t opcode, uint32_t address, } static int evaluate_hint_thumb(uint16_t opcode, uint32_t address, - arm_instruction_t *instruction) + struct arm_instruction *instruction) { char *hint; @@ -2592,7 +2592,7 @@ static int evaluate_hint_thumb(uint16_t opcode, uint32_t address, } static int evaluate_ifthen_thumb(uint16_t opcode, uint32_t address, - arm_instruction_t *instruction) + struct arm_instruction *instruction) { unsigned cond = (opcode >> 4) & 0x0f; char *x = "", *y = "", *z = ""; @@ -2616,10 +2616,10 @@ static int evaluate_ifthen_thumb(uint16_t opcode, uint32_t address, return ERROR_OK; } -int thumb_evaluate_opcode(uint16_t opcode, uint32_t address, arm_instruction_t *instruction) +int thumb_evaluate_opcode(uint16_t opcode, uint32_t address, struct arm_instruction *instruction) { /* clear fields, to avoid confusion */ - memset(instruction, 0, sizeof(arm_instruction_t)); + memset(instruction, 0, sizeof(struct arm_instruction)); instruction->opcode = opcode; instruction->instruction_size = 2; @@ -2754,7 +2754,7 @@ int thumb_evaluate_opcode(uint16_t opcode, uint32_t address, arm_instruction_t * } static int t2ev_b_bl(uint32_t opcode, uint32_t address, - arm_instruction_t *instruction, char *cp) + struct arm_instruction *instruction, char *cp) { unsigned offset; unsigned b21 = 1 << 21; @@ -2795,7 +2795,7 @@ static int t2ev_b_bl(uint32_t opcode, uint32_t address, } static int t2ev_cond_b(uint32_t opcode, uint32_t address, - arm_instruction_t *instruction, char *cp) + struct arm_instruction *instruction, char *cp) { unsigned offset; unsigned b17 = 1 << 17; @@ -2884,7 +2884,7 @@ static const char *special_name(int number) } static int t2ev_hint(uint32_t opcode, uint32_t address, - arm_instruction_t *instruction, char *cp) + struct arm_instruction *instruction, char *cp) { const char *mnemonic; @@ -2924,7 +2924,7 @@ static int t2ev_hint(uint32_t opcode, uint32_t address, } static int t2ev_misc(uint32_t opcode, uint32_t address, - arm_instruction_t *instruction, char *cp) + struct arm_instruction *instruction, char *cp) { const char *mnemonic; @@ -2955,7 +2955,7 @@ static int t2ev_misc(uint32_t opcode, uint32_t address, } static int t2ev_b_misc(uint32_t opcode, uint32_t address, - arm_instruction_t *instruction, char *cp) + struct arm_instruction *instruction, char *cp) { /* permanently undefined */ if ((opcode & 0x07f07000) == 0x07f02000) { @@ -3003,7 +3003,7 @@ undef: } static int t2ev_data_mod_immed(uint32_t opcode, uint32_t address, - arm_instruction_t *instruction, char *cp) + struct arm_instruction *instruction, char *cp) { char *mnemonic = NULL; int rn = (opcode >> 16) & 0xf; @@ -3149,7 +3149,7 @@ static int t2ev_data_mod_immed(uint32_t opcode, uint32_t address, } static int t2ev_data_immed(uint32_t opcode, uint32_t address, - arm_instruction_t *instruction, char *cp) + struct arm_instruction *instruction, char *cp) { char *mnemonic = NULL; int rn = (opcode >> 16) & 0xf; @@ -3244,7 +3244,7 @@ do_adr: } static int t2ev_store_single(uint32_t opcode, uint32_t address, - arm_instruction_t *instruction, char *cp) + struct arm_instruction *instruction, char *cp) { unsigned op = (opcode >> 20) & 0xf; char *size = ""; @@ -3337,7 +3337,7 @@ imm8: } static int t2ev_mul32(uint32_t opcode, uint32_t address, - arm_instruction_t *instruction, char *cp) + struct arm_instruction *instruction, char *cp) { int ra = (opcode >> 12) & 0xf; @@ -3367,7 +3367,7 @@ static int t2ev_mul32(uint32_t opcode, uint32_t address, } static int t2ev_mul64_div(uint32_t opcode, uint32_t address, - arm_instruction_t *instruction, char *cp) + struct arm_instruction *instruction, char *cp) { int op = (opcode >> 4) & 0xf; char *infix = "MUL"; @@ -3404,7 +3404,7 @@ static int t2ev_mul64_div(uint32_t opcode, uint32_t address, } static int t2ev_ldm_stm(uint32_t opcode, uint32_t address, - arm_instruction_t *instruction, char *cp) + struct arm_instruction *instruction, char *cp) { int rn = (opcode >> 16) & 0xf; int op = (opcode >> 22) & 0x6; @@ -3454,7 +3454,7 @@ static int t2ev_ldm_stm(uint32_t opcode, uint32_t address, /* load/store dual or exclusive, table branch */ static int t2ev_ldrex_strex(uint32_t opcode, uint32_t address, - arm_instruction_t *instruction, char *cp) + struct arm_instruction *instruction, char *cp) { unsigned op1op2 = (opcode >> 20) & 0x3; unsigned op3 = (opcode >> 4) & 0xf; @@ -3580,7 +3580,7 @@ literal: } static int t2ev_data_shift(uint32_t opcode, uint32_t address, - arm_instruction_t *instruction, char *cp) + struct arm_instruction *instruction, char *cp) { int op = (opcode >> 21) & 0xf; int rd = (opcode >> 8) & 0xf; @@ -3755,7 +3755,7 @@ immediate: } static int t2ev_data_reg(uint32_t opcode, uint32_t address, - arm_instruction_t *instruction, char *cp) + struct arm_instruction *instruction, char *cp) { char *mnemonic; char * suffix = ""; @@ -3856,7 +3856,7 @@ static int t2ev_data_reg(uint32_t opcode, uint32_t address, } static int t2ev_load_word(uint32_t opcode, uint32_t address, - arm_instruction_t *instruction, char *cp) + struct arm_instruction *instruction, char *cp) { int rn = (opcode >> 16) & 0xf; int immed; @@ -3930,7 +3930,7 @@ static int t2ev_load_word(uint32_t opcode, uint32_t address, } static int t2ev_load_byte_hints(uint32_t opcode, uint32_t address, - arm_instruction_t *instruction, char *cp) + struct arm_instruction *instruction, char *cp) { int rn = (opcode >> 16) & 0xf; int rt = (opcode >> 12) & 0xf; @@ -4109,7 +4109,7 @@ ldrsb_literal: } static int t2ev_load_halfword(uint32_t opcode, uint32_t address, - arm_instruction_t *instruction, char *cp) + struct arm_instruction *instruction, char *cp) { int rn = (opcode >> 16) & 0xf; int rt = (opcode >> 12) & 0xf; @@ -4191,7 +4191,7 @@ ldrh_literal: * always set. That means eventual arm_simulate_step() support for Thumb2 * will need work in this area. */ -int thumb2_opcode(target_t *target, uint32_t address, arm_instruction_t *instruction) +int thumb2_opcode(target_t *target, uint32_t address, struct arm_instruction *instruction) { int retval; uint16_t op; @@ -4202,7 +4202,7 @@ int thumb2_opcode(target_t *target, uint32_t address, arm_instruction_t *instruc address &= ~1; /* clear fields, to avoid confusion */ - memset(instruction, 0, sizeof(arm_instruction_t)); + memset(instruction, 0, sizeof(struct arm_instruction)); /* read first halfword, see if this is the only one */ retval = target_read_u16(target, address, &op); @@ -4308,7 +4308,7 @@ int thumb2_opcode(target_t *target, uint32_t address, arm_instruction_t *instruc return ERROR_OK; } -int arm_access_size(arm_instruction_t *instruction) +int arm_access_size(struct arm_instruction *instruction) { if ((instruction->type == ARM_LDRB) || (instruction->type == ARM_LDRBT) diff --git a/src/target/arm_disassembler.h b/src/target/arm_disassembler.h index 77230e0b..a3d16f5f 100644 --- a/src/target/arm_disassembler.h +++ b/src/target/arm_disassembler.h @@ -179,7 +179,7 @@ struct arm_load_store_multiple_instr uint8_t W; }; -typedef struct arm_instruction_s +struct arm_instruction { enum arm_instruction_type type; char text[128]; @@ -195,15 +195,15 @@ typedef struct arm_instruction_s struct arm_load_store_multiple_instr load_store_multiple; } info; -} arm_instruction_t; +}; int arm_evaluate_opcode(uint32_t opcode, uint32_t address, - arm_instruction_t *instruction); + struct arm_instruction *instruction); int thumb_evaluate_opcode(uint16_t opcode, uint32_t address, - arm_instruction_t *instruction); + struct arm_instruction *instruction); int thumb2_opcode(target_t *target, uint32_t address, - arm_instruction_t *instruction); -int arm_access_size(arm_instruction_t *instruction); + struct arm_instruction *instruction); +int arm_access_size(struct arm_instruction *instruction); #define COND(opcode) (arm_condition_strings[(opcode & 0xf0000000) >> 28]) diff --git a/src/target/arm_simulator.c b/src/target/arm_simulator.c index bef1405d..941e41ce 100644 --- a/src/target/arm_simulator.c +++ b/src/target/arm_simulator.c @@ -281,7 +281,7 @@ int arm_simulate_step_core(target_t *target, uint32_t *dry_run_pc, struct arm_sim_interface *sim) { uint32_t current_pc = sim->get_reg(sim, 15); - arm_instruction_t instruction; + struct arm_instruction instruction; int instruction_size; int retval = ERROR_OK; diff --git a/src/target/armv4_5.c b/src/target/armv4_5.c index e7c405c9..fb6c93b8 100644 --- a/src/target/armv4_5.c +++ b/src/target/armv4_5.c @@ -395,7 +395,7 @@ COMMAND_HANDLER(handle_armv4_5_disassemble_command) uint32_t address; int count = 1; int i; - arm_instruction_t cur_instruction; + struct arm_instruction cur_instruction; uint32_t opcode; uint16_t thumb_opcode; int thumb = 0; diff --git a/src/target/armv7a.c b/src/target/armv7a.c index c4b4c985..efe3d36d 100644 --- a/src/target/armv7a.c +++ b/src/target/armv7a.c @@ -332,7 +332,7 @@ usage: } for (i = 0; i < count; i++) { - arm_instruction_t cur_instruction; + struct arm_instruction cur_instruction; int retval; if (thumb) { diff --git a/src/target/cortex_m3.c b/src/target/cortex_m3.c index 01fe7c10..d304ca36 100644 --- a/src/target/cortex_m3.c +++ b/src/target/cortex_m3.c @@ -1788,7 +1788,7 @@ COMMAND_HANDLER(handle_cortex_m3_disassemble_command) struct cortex_m3_common *cortex_m3 = target_to_cm3(target); uint32_t address; unsigned long count = 1; - arm_instruction_t cur_instruction; + struct arm_instruction cur_instruction; retval = cortex_m3_verify_pointer(cmd_ctx, cortex_m3); if (retval != ERROR_OK) diff --git a/src/target/etm.c b/src/target/etm.c index 118fe12d..a5fe2826 100644 --- a/src/target/etm.c +++ b/src/target/etm.c @@ -636,7 +636,7 @@ static struct etm_capture_driver *etm_capture_drivers[] = NULL }; -static int etm_read_instruction(etm_context_t *ctx, arm_instruction_t *instruction) +static int etm_read_instruction(etm_context_t *ctx, struct arm_instruction *instruction) { int i; int section = -1; @@ -887,7 +887,7 @@ static int etmv1_data(etm_context_t *ctx, int size, uint32_t *data) static int etmv1_analyze_trace(etm_context_t *ctx, struct command_context_s *cmd_ctx) { int retval; - arm_instruction_t instruction; + struct arm_instruction instruction; /* read the trace data if it wasn't read already */ if (ctx->trace_depth == 0) diff --git a/src/target/xscale.c b/src/target/xscale.c index 552b2ff1..424259bd 100644 --- a/src/target/xscale.c +++ b/src/target/xscale.c @@ -2550,7 +2550,7 @@ static int xscale_read_trace(target_t *target) } static int xscale_read_instruction(target_t *target, - arm_instruction_t *instruction) + struct arm_instruction *instruction) { struct xscale_common *xscale = target_to_xscale(target); int i; @@ -2723,7 +2723,7 @@ static int xscale_analyze_trace(target_t *target, command_context_t *cmd_ctx) if (xscale->trace.pc_ok) { int executed = (trace_data->entries[i].data & 0xf) + rollover * 16; - arm_instruction_t instruction; + struct arm_instruction instruction; if ((exception == 6) || (exception == 7)) { @@ -2795,7 +2795,7 @@ static int xscale_analyze_trace(target_t *target, command_context_t *cmd_ctx) for (; xscale->trace.current_pc < trace_data->last_instruction; xscale->trace.current_pc += (xscale->trace.core_state == ARMV4_5_STATE_ARM) ? 4 : 2) { - arm_instruction_t instruction; + struct arm_instruction instruction; if ((retval = xscale_read_instruction(target, &instruction)) != ERROR_OK) { /* can't continue tracing with no image available */ |