diff options
Diffstat (limited to 'plugins/arm/v7/thumb_32.c')
| -rw-r--r-- | plugins/arm/v7/thumb_32.c | 528 |
1 files changed, 264 insertions, 264 deletions
diff --git a/plugins/arm/v7/thumb_32.c b/plugins/arm/v7/thumb_32.c index 41e5f46..fe06465 100644 --- a/plugins/arm/v7/thumb_32.c +++ b/plugins/arm/v7/thumb_32.c @@ -244,77 +244,77 @@ static GArchInstruction *process_armv7_thumb_32_data_processing_modified_immedia case b0000: if (rds == b11111) - result = armv7_read_thumb_32_instr_tst_immediate(raw); + result = armv7_read_thumb_32_instr_a8_tst_immediate(raw); else - result = armv7_read_thumb_32_instr_and_immediate(raw); + result = armv7_read_thumb_32_instr_a8_and_immediate(raw); break; case b0001: - result = armv7_read_thumb_32_instr_bic_immediate(raw); + result = armv7_read_thumb_32_instr_a8_bic_immediate(raw); break; case b0010: if (rn == b1111) - result = armv7_read_thumb_32_instr_mov_immediate(raw); + result = armv7_read_thumb_32_instr_a8_mov_immediate(raw); else - result = armv7_read_thumb_32_instr_orr_immediate(raw); + result = armv7_read_thumb_32_instr_a8_orr_immediate(raw); break; case b0011: if (rn == b1111) - result = armv7_read_thumb_32_instr_mvn_immediate(raw); + result = armv7_read_thumb_32_instr_a8_mvn_immediate(raw); else - result = armv7_read_thumb_32_instr_orn_immediate(raw); + result = armv7_read_thumb_32_instr_a8_orn_immediate(raw); break; case b0100: if (rds == b11111) - result = armv7_read_thumb_32_instr_teq_immediate(raw); + result = armv7_read_thumb_32_instr_a8_teq_immediate(raw); else - result = armv7_read_thumb_32_instr_eor_immediate(raw); + result = armv7_read_thumb_32_instr_a8_eor_immediate(raw); break; case b1000: if (rds == b11111) - result = armv7_read_thumb_32_instr_cmn_immediate(raw); + result = armv7_read_thumb_32_instr_a8_cmn_immediate(raw); else - result = armv7_read_thumb_32_instr_add_immediate_thumb(raw); + result = armv7_read_thumb_32_instr_a8_add_immediate_thumb(raw); break; case b1010: - result = armv7_read_thumb_32_instr_adc_immediate(raw); + result = armv7_read_thumb_32_instr_a8_adc_immediate(raw); break; case b1011: - result = armv7_read_thumb_32_instr_sbc_immediate(raw); + result = armv7_read_thumb_32_instr_a8_sbc_immediate(raw); break; case b1101: if (rds == b11111) - result = armv7_read_thumb_32_instr_cmp_immediate(raw); + result = armv7_read_thumb_32_instr_a8_cmp_immediate(raw); else - result = armv7_read_thumb_32_instr_sub_immediate_thumb(raw); + result = armv7_read_thumb_32_instr_a8_sub_immediate_thumb(raw); break; case b1110: - result = armv7_read_thumb_32_instr_rsb_immediate(raw); + result = armv7_read_thumb_32_instr_a8_rsb_immediate(raw); break; } @@ -359,75 +359,75 @@ static GArchInstruction *process_armv7_thumb_32_data_processing_plain_binary_imm case b00000: if (rn == b1111) - result = armv7_read_thumb_32_instr_adr(raw); + result = armv7_read_thumb_32_instr_a8_adr(raw); else - result = armv7_read_thumb_32_instr_add_immediate_thumb(raw); + result = armv7_read_thumb_32_instr_a8_add_immediate_thumb(raw); break; case b00100: - result = armv7_read_thumb_32_instr_mov_immediate(raw); + result = armv7_read_thumb_32_instr_a8_mov_immediate(raw); break; case b01010: if (rn == b11111) - result = armv7_read_thumb_32_instr_adr(raw); + result = armv7_read_thumb_32_instr_a8_adr(raw); else - result = armv7_read_thumb_32_instr_sub_immediate_thumb(raw); + result = armv7_read_thumb_32_instr_a8_sub_immediate_thumb(raw); break; case b01100: - result = armv7_read_thumb_32_instr_movt(raw); + result = armv7_read_thumb_32_instr_a8_movt(raw); break; case b10000: - result = armv7_read_thumb_32_instr_ssat(raw); + result = armv7_read_thumb_32_instr_a8_ssat(raw); break; case b10010: if ((raw & 0x000070c0) != 0) - result = armv7_read_thumb_32_instr_ssat(raw); + result = armv7_read_thumb_32_instr_a8_ssat(raw); else - result = armv7_read_thumb_32_instr_ssat16(raw); + result = armv7_read_thumb_32_instr_a8_ssat16(raw); break; case b10100: - result = armv7_read_thumb_32_instr_sbfx(raw); + result = armv7_read_thumb_32_instr_a8_sbfx(raw); break; case b10110: if (rn == b11111) - result = armv7_read_thumb_32_instr_bfc(raw); + result = armv7_read_thumb_32_instr_a8_bfc(raw); else - result = armv7_read_thumb_32_instr_bfi(raw); + result = armv7_read_thumb_32_instr_a8_bfi(raw); break; case b11000: - result = armv7_read_thumb_32_instr_usat(raw); + result = armv7_read_thumb_32_instr_a8_usat(raw); break; case b11010: if ((raw & 0x000070c0) != 0) - result = armv7_read_thumb_32_instr_usat(raw); + result = armv7_read_thumb_32_instr_a8_usat(raw); else - result = armv7_read_thumb_32_instr_usat16(raw); + result = armv7_read_thumb_32_instr_a8_usat16(raw); break; case b11100: - result = armv7_read_thumb_32_instr_ubfx(raw); + result = armv7_read_thumb_32_instr_a8_ubfx(raw); break; } @@ -472,30 +472,30 @@ static GArchInstruction *process_armv7_thumb_32_branches_and_miscellaneous_contr imm8 = (raw >> 0) & b11111111; if (op1 == b000 && op == b1111110) - result = armv7_read_thumb_32_instr_hvc(raw); + result = armv7_read_thumb_32_instr_b9_hvc(raw); else if (op1 == b000 && op == b1111111) - result = armv7_read_thumb_32_instr_smc_previously_smi(raw); + result = armv7_read_thumb_32_instr_b9_smc_previously_smi(raw); else if ((op1 & b101) == b000) { if ((op & b0111000) != b0111000) - result = armv7_read_thumb_32_instr_b(raw); + result = armv7_read_thumb_32_instr_a8_b(raw); else if ((imm8 & b00100000) == b00100000 && (op & b1111110) == b0111000) - result = armv7_read_thumb_32_instr_msr_banked_register(raw); + result = armv7_read_thumb_32_instr_b9_msr_banked_register(raw); else if ((imm8 & b00100000) == b00000000 && op == b0111000 && (op2 & b0011) == b0000) - result = armv7_read_thumb_32_instr_msr_register(raw); + result = armv7_read_thumb_32_instr_a8_msr_register(raw); else if ((imm8 & b00100000) == b00000000 && op == b0111000 && (op2 & b0011) == b0001) - result = armv7_read_thumb_32_instr_b_msr_register(raw); + result = armv7_read_thumb_32_instr_b9_msr_register(raw); else if ((imm8 & b00100000) == b00000000 && op == b0111000 && (op2 & b0010) == b0010) - result = armv7_read_thumb_32_instr_b_msr_register(raw); + result = armv7_read_thumb_32_instr_b9_msr_register(raw); else if ((imm8 & b00100000) == b00000000 && op == b0111001) - result = armv7_read_thumb_32_instr_b_msr_register(raw); + result = armv7_read_thumb_32_instr_b9_msr_register(raw); else if (op == b0111010) result = process_armv7_thumb_32_change_processor_state_and_hints(raw); @@ -504,36 +504,36 @@ static GArchInstruction *process_armv7_thumb_32_branches_and_miscellaneous_contr result = process_armv7_thumb_32_miscellaneous_control_instructions(raw); else if (op == b0111100) - result = armv7_read_thumb_32_instr_bxj(raw); + result = armv7_read_thumb_32_instr_a8_bxj(raw); else if (imm8 == b00000000 && op == b0111101) - result = armv7_read_thumb_32_instr_eret(raw); + result = armv7_read_thumb_32_instr_b9_eret(raw); else if (imm8 != b00000000 && op == b0111101) - result = armv7_read_thumb_32_instr_subs_pc_lr_thumb(raw); + result = armv7_read_thumb_32_instr_b9_subs_pc_lr_thumb(raw); else if ((imm8 & b00100000) == b00100000 && (op & b1111110) == b0111110) - result = armv7_read_thumb_32_instr_mrs_banked_register(raw); + result = armv7_read_thumb_32_instr_b9_mrs_banked_register(raw); else if ((imm8 & b00100000) == b00000000 && op == b0111110) - result = armv7_read_thumb_32_instr_mrs(raw); + result = armv7_read_thumb_32_instr_a8_mrs(raw); else if ((imm8 & b00100000) == b00000000 && op == b0111111) - result = armv7_read_thumb_32_instr_b_mrs(raw); + result = armv7_read_thumb_32_instr_b9_mrs(raw); } else if ((op1 & b101) == b001) - result = armv7_read_thumb_32_instr_b(raw); + result = armv7_read_thumb_32_instr_a8_b(raw); else if (op1 == b010 && op == b1111111) - result = armv7_read_thumb_32_instr_udf(raw); + result = armv7_read_thumb_32_instr_a8_udf(raw); else if ((op1 & b101) == b100) - result = armv7_read_thumb_32_instr_bl_blx_immediate(raw); + result = armv7_read_thumb_32_instr_a8_bl_blx_immediate(raw); else if ((op1 & b101) == b101) - result = armv7_read_thumb_32_instr_bl_blx_immediate(raw); + result = armv7_read_thumb_32_instr_a8_bl_blx_immediate(raw); return result; @@ -572,27 +572,27 @@ static GArchInstruction *process_armv7_thumb_32_change_processor_state_and_hints op2 = (raw >> 0) & b11111111; if (op1 != b000) - result = armv7_read_thumb_32_instr_cps_thumb(raw); + result = armv7_read_thumb_32_instr_b9_cps_thumb(raw); else { if (op2 == b00000000) - result = armv7_read_thumb_32_instr_nop(raw); + result = armv7_read_thumb_32_instr_a8_nop(raw); else if (op2 == b00000001) - result = armv7_read_thumb_32_instr_yield(raw); + result = armv7_read_thumb_32_instr_a8_yield(raw); else if (op2 == b00000010) - result = armv7_read_thumb_32_instr_wfe(raw); + result = armv7_read_thumb_32_instr_a8_wfe(raw); else if (op2 == b00000011) - result = armv7_read_thumb_32_instr_wfi(raw); + result = armv7_read_thumb_32_instr_a8_wfi(raw); else if (op2 == b00000100) - result = armv7_read_thumb_32_instr_sev(raw); + result = armv7_read_thumb_32_instr_a8_sev(raw); else if ((op2 & b11110000) == b11110000) - result = armv7_read_thumb_32_instr_dbg(raw); + result = armv7_read_thumb_32_instr_a8_dbg(raw); } @@ -633,27 +633,27 @@ static GArchInstruction *process_armv7_thumb_32_miscellaneous_control_instructio switch (op) { case b0000: - result = armv7_read_thumb_32_instr_enterx_leavex(raw); + result = armv7_read_thumb_32_instr_a9_enterx_leavex(raw); break; case b0001: - result = armv7_read_thumb_32_instr_enterx_leavex(raw); + result = armv7_read_thumb_32_instr_a9_enterx_leavex(raw); break; case b0010: - result = armv7_read_thumb_32_instr_clrex(raw); + result = armv7_read_thumb_32_instr_a8_clrex(raw); break; case b0100: - result = armv7_read_thumb_32_instr_dsb(raw); + result = armv7_read_thumb_32_instr_a8_dsb(raw); break; case b0101: - result = armv7_read_thumb_32_instr_dmb(raw); + result = armv7_read_thumb_32_instr_a8_dmb(raw); break; case b0110: - result = armv7_read_thumb_32_instr_isb(raw); + result = armv7_read_thumb_32_instr_a8_isb(raw); break; } @@ -700,25 +700,25 @@ static GArchInstruction *process_armv7_thumb_32_load_store_multiple(uint32_t raw case b00: if (l == b0) - result = armv7_read_thumb_32_instr_srs_thumb(raw); + result = armv7_read_thumb_32_instr_b9_srs_thumb(raw); else - result = armv7_read_thumb_32_instr_rfe(raw); + result = armv7_read_thumb_32_instr_b9_rfe(raw); break; case b01: if (l == b0) - result = armv7_read_thumb_32_instr_stm_stmia_stmea(raw); + result = armv7_read_thumb_32_instr_a8_stm_stmia_stmea(raw); else { if (wrn == b11101) - result = armv7_read_thumb_32_instr_pop_thumb(raw); + result = armv7_read_thumb_32_instr_a8_pop_thumb(raw); else - result = armv7_read_thumb_32_instr_ldm_ldmia_ldmfd_thumb(raw); + result = armv7_read_thumb_32_instr_a8_ldm_ldmia_ldmfd_thumb(raw); } @@ -729,25 +729,25 @@ static GArchInstruction *process_armv7_thumb_32_load_store_multiple(uint32_t raw if (l == b0) { if (wrn == b11101) - result = armv7_read_thumb_32_instr_push(raw); + result = armv7_read_thumb_32_instr_a8_push(raw); else - result = armv7_read_thumb_32_instr_stmdb_stmfd(raw); + result = armv7_read_thumb_32_instr_a8_stmdb_stmfd(raw); } else - result = armv7_read_thumb_32_instr_ldmdb_ldmea(raw); + result = armv7_read_thumb_32_instr_a8_ldmdb_ldmea(raw); break; case b11: if (l == b0) - result = armv7_read_thumb_32_instr_srs_thumb(raw); + result = armv7_read_thumb_32_instr_b9_srs_thumb(raw); else - result = armv7_read_thumb_32_instr_rfe(raw); + result = armv7_read_thumb_32_instr_b9_rfe(raw); break; @@ -793,34 +793,34 @@ static GArchInstruction *process_armv7_thumb_32_load_store_dual_load_store_exclu op3 = (raw >> 4) & 0xf; if (op1 == b00 && op2 == b00) - result = armv7_read_thumb_32_instr_strex(raw); + result = armv7_read_thumb_32_instr_a8_strex(raw); else if (op1 == b00 && op2 == b01) - result = armv7_read_thumb_32_instr_ldrex(raw); + result = armv7_read_thumb_32_instr_a8_ldrex(raw); else if ((op1 & b10) == b00 && op2 == b10) - result = armv7_read_thumb_32_instr_strd_immediate(raw); + result = armv7_read_thumb_32_instr_a8_strd_immediate(raw); else if ((op1 & b10) == b10 && (op2 & b01) == b00) - result = armv7_read_thumb_32_instr_strd_immediate(raw); + result = armv7_read_thumb_32_instr_a8_strd_immediate(raw); else if ((op1 & b10) == b00 && op2 == b11) { if (rn != b1111) - result = armv7_read_thumb_32_instr_ldrd_immediate(raw); + result = armv7_read_thumb_32_instr_a8_ldrd_immediate(raw); else/* if (rn == b1111)*/ - result = armv7_read_thumb_32_instr_ldrd_literal(raw); + result = armv7_read_thumb_32_instr_a8_ldrd_literal(raw); } else if ((op1 & b10) == b10 && (op2 & b01) == b01) { if (rn != b1111) - result = armv7_read_thumb_32_instr_ldrd_immediate(raw); + result = armv7_read_thumb_32_instr_a8_ldrd_immediate(raw); else/* if (rn == b1111)*/ - result = armv7_read_thumb_32_instr_ldrd_literal(raw); + result = armv7_read_thumb_32_instr_a8_ldrd_literal(raw); } @@ -828,15 +828,15 @@ static GArchInstruction *process_armv7_thumb_32_load_store_dual_load_store_exclu switch (op3) { case b0100: - result = armv7_read_thumb_32_instr_strexb(raw); + result = armv7_read_thumb_32_instr_a8_strexb(raw); break; case b0101: - result = armv7_read_thumb_32_instr_strexh(raw); + result = armv7_read_thumb_32_instr_a8_strexh(raw); break; case b0111: - result = armv7_read_thumb_32_instr_strexd(raw); + result = armv7_read_thumb_32_instr_a8_strexd(raw); break; } @@ -845,23 +845,23 @@ static GArchInstruction *process_armv7_thumb_32_load_store_dual_load_store_exclu switch (op3) { case b0000: - result = armv7_read_thumb_32_instr_tbb_tbh(raw); + result = armv7_read_thumb_32_instr_a8_tbb_tbh(raw); break; case b0001: - result = armv7_read_thumb_32_instr_tbb_tbh(raw); + result = armv7_read_thumb_32_instr_a8_tbb_tbh(raw); break; case b0100: - result = armv7_read_thumb_32_instr_ldrexb(raw); + result = armv7_read_thumb_32_instr_a8_ldrexb(raw); break; case b0101: - result = armv7_read_thumb_32_instr_ldrexh(raw); + result = armv7_read_thumb_32_instr_a8_ldrexh(raw); break; case b0111: - result = armv7_read_thumb_32_instr_ldrexd(raw); + result = armv7_read_thumb_32_instr_a8_ldrexd(raw); break; } @@ -908,28 +908,28 @@ static GArchInstruction *process_armv7_thumb_32_load_word(uint32_t raw) case b00: if (op2 == b000000 && rn != b1111) - result = armv7_read_thumb_32_instr_ldr_register_thumb(raw); + result = armv7_read_thumb_32_instr_a8_ldr_register_thumb(raw); else if ((op2 & b100100) == b100100 && rn != b1111) - result = armv7_read_thumb_32_instr_ldr_immediate_thumb(raw); + result = armv7_read_thumb_32_instr_a8_ldr_immediate_thumb(raw); else if ((op2 & b111100) == b110000 && rn != b1111) - result = armv7_read_thumb_32_instr_ldr_immediate_thumb(raw); + result = armv7_read_thumb_32_instr_a8_ldr_immediate_thumb(raw); else if ((op2 & b111100) == b111000 && rn != b1111) - result = armv7_read_thumb_32_instr_ldrt(raw); + result = armv7_read_thumb_32_instr_a8_ldrt(raw); break; case b01: if (rn != b1111) - result = armv7_read_thumb_32_instr_ldr_immediate_thumb(raw); + result = armv7_read_thumb_32_instr_a8_ldr_immediate_thumb(raw); break; } if (result == NULL && (op1 & b10) == b00 && rn == b1111) - result = armv7_read_thumb_32_instr_ldr_literal(raw); + result = armv7_read_thumb_32_instr_a8_ldr_literal(raw); return result; @@ -975,17 +975,17 @@ static GArchInstruction *process_armv7_thumb_32_load_halfword_memory_hints(uint3 if ((op1 & b10) == b00) { if (rt != b1111) - result = armv7_read_thumb_32_instr_ldrh_literal(raw); + result = armv7_read_thumb_32_instr_a8_ldrh_literal(raw); else/* if (rt == b1111)*/ - result = armv7_read_thumb_32_instr_pld_literal(raw); + result = armv7_read_thumb_32_instr_a8_pld_literal(raw); } else/* if ((op1 & b10) == b10)*/ { if (rt != b1111) - result = armv7_read_thumb_32_instr_ldrsh_literal(raw); + result = armv7_read_thumb_32_instr_a8_ldrsh_literal(raw); else/* if (rt == b1111)*/ result = g_undef_instruction_new(IBS_NOP); @@ -999,48 +999,48 @@ static GArchInstruction *process_armv7_thumb_32_load_halfword_memory_hints(uint3 if (op1 == b00) { if ((op2 & b100100) == b100100) - result = armv7_read_thumb_32_instr_ldrh_immediate_thumb(raw); + result = armv7_read_thumb_32_instr_a8_ldrh_immediate_thumb(raw); else if ((op2 & b111100) == b110000 && rt != b1111) - result = armv7_read_thumb_32_instr_ldrh_immediate_thumb(raw); + result = armv7_read_thumb_32_instr_a8_ldrh_immediate_thumb(raw); else if (op2 == b000000 && rt != b1111) - result = armv7_read_thumb_32_instr_ldrh_register(raw); + result = armv7_read_thumb_32_instr_a8_ldrh_register(raw); else if ((op2 & b111100) == b111000) - result = armv7_read_thumb_32_instr_ldrht(raw); + result = armv7_read_thumb_32_instr_a8_ldrht(raw); else if (op2 == b000000 && rt == b1111) - result = armv7_read_thumb_32_instr_pld_pldw_register(raw); + result = armv7_read_thumb_32_instr_a8_pld_pldw_register(raw); else if ((op2 & b111100) == b110000 && rt == b1111) - result = armv7_read_thumb_32_instr_pld_pldw_immediate(raw); + result = armv7_read_thumb_32_instr_a8_pld_pldw_immediate(raw); } else if (op1 == b01) { if (rt != b1111) - result = armv7_read_thumb_32_instr_ldrh_immediate_thumb(raw); + result = armv7_read_thumb_32_instr_a8_ldrh_immediate_thumb(raw); else/* if (rt == b1111)*/ - result = armv7_read_thumb_32_instr_pld_pldw_immediate(raw); + result = armv7_read_thumb_32_instr_a8_pld_pldw_immediate(raw); } else if (op1 == b10) { if ((op2 & b100100) == b100100) - result = armv7_read_thumb_32_instr_ldrsh_immediate(raw); + result = armv7_read_thumb_32_instr_a8_ldrsh_immediate(raw); else if ((op2 & b111100) == b110000 && rt != b1111) - result = armv7_read_thumb_32_instr_ldrsh_immediate(raw); + result = armv7_read_thumb_32_instr_a8_ldrsh_immediate(raw); else if (op2 == b000000 && rt != b1111) - result = armv7_read_thumb_32_instr_ldrsh_register(raw); + result = armv7_read_thumb_32_instr_a8_ldrsh_register(raw); else if ((op2 & b111100) == b111000) - result = armv7_read_thumb_32_instr_ldrsht(raw); + result = armv7_read_thumb_32_instr_a8_ldrsht(raw); else if (op2 == b000000 && rt == b1111) result = g_undef_instruction_new(IBS_NOP); @@ -1053,7 +1053,7 @@ static GArchInstruction *process_armv7_thumb_32_load_halfword_memory_hints(uint3 else if (op1 == b11) { if (rt != b1111) - result = armv7_read_thumb_32_instr_ldrsh_immediate(raw); + result = armv7_read_thumb_32_instr_a8_ldrsh_immediate(raw); else/* if (rt == b1111)*/ result = g_undef_instruction_new(IBS_NOP); @@ -1104,90 +1104,90 @@ static GArchInstruction *process_armv7_thumb_32_load_byte_memory_hints(uint32_t if (op1 == b00 && op2 == b000000 && rn != b1111) { if (rt != b1111) - result = armv7_read_thumb_32_instr_ldrb_register(raw); + result = armv7_read_thumb_32_instr_a8_ldrb_register(raw); else /*if (rt == b1111) */ - result = armv7_read_thumb_32_instr_pld_register(raw); + result = armv7_read_thumb_32_instr_a8_pld_register(raw); } else if ((op1 & b10) == b00 && rn == b1111) { if (rt != b1111) - result = armv7_read_thumb_32_instr_ldrb_literal(raw); + result = armv7_read_thumb_32_instr_a8_ldrb_literal(raw); else /*if (rt == b1111) */ - result = armv7_read_thumb_32_instr_pld_literal(raw); + result = armv7_read_thumb_32_instr_a8_pld_literal(raw); } else if (op1 == b00 && (op2 & b100100) == b100100 && rn != b1111) - result = armv7_read_thumb_32_instr_ldrb_immediate_thumb(raw); + result = armv7_read_thumb_32_instr_a8_ldrb_immediate_thumb(raw); else if (op1 == b00 && (op2 & b111100) == b110000 && rn != b1111) { if (rt != b1111) - result = armv7_read_thumb_32_instr_ldrb_immediate_thumb(raw); + result = armv7_read_thumb_32_instr_a8_ldrb_immediate_thumb(raw); else /*if (rt == b1111) */ - result = armv7_read_thumb_32_instr_pld_immediate(raw); + result = armv7_read_thumb_32_instr_a8_pld_immediate(raw); } else if (op1 == b00 && (op2 & b111100) == b111000 && rn != b1111) - result = armv7_read_thumb_32_instr_ldrbt(raw); + result = armv7_read_thumb_32_instr_a8_ldrbt(raw); else if (op1 == b01 && rn != b1111) { if (rt != b1111) - result = armv7_read_thumb_32_instr_ldrb_immediate_thumb(raw); + result = armv7_read_thumb_32_instr_a8_ldrb_immediate_thumb(raw); else /*if (rt == b1111) */ - result = armv7_read_thumb_32_instr_pld_immediate(raw); + result = armv7_read_thumb_32_instr_a8_pld_immediate(raw); } if (op1 == b10 && op2 == b000000 && rn != b1111) { if (rt != b1111) - result = armv7_read_thumb_32_instr_ldrsb_register(raw); + result = armv7_read_thumb_32_instr_a8_ldrsb_register(raw); else /*if (rt == b1111) */ - result = armv7_read_thumb_32_instr_pli_register(raw); + result = armv7_read_thumb_32_instr_a8_pli_register(raw); } else if ((op1 & b10) == b10 && rn == b1111) { if (rt != b1111) - result = armv7_read_thumb_32_instr_ldrsb_literal(raw); + result = armv7_read_thumb_32_instr_a8_ldrsb_literal(raw); else /*if (rt == b1111) */ - result = armv7_read_thumb_32_instr_pli_immediate_literal(raw); + result = armv7_read_thumb_32_instr_a8_pli_immediate_literal(raw); } else if (op1 == b10 && (op2 & b100100) == b100100 && rn != b1111) - result = armv7_read_thumb_32_instr_ldrsb_immediate(raw); + result = armv7_read_thumb_32_instr_a8_ldrsb_immediate(raw); else if (op1 == b10 && (op2 & b111100) == b110000 && rn != b1111) { if (rt != b1111) - result = armv7_read_thumb_32_instr_ldrsb_immediate(raw); + result = armv7_read_thumb_32_instr_a8_ldrsb_immediate(raw); else /*if (rt == b1111) */ - result = armv7_read_thumb_32_instr_pli_immediate_literal(raw); + result = armv7_read_thumb_32_instr_a8_pli_immediate_literal(raw); } else if (op1 == b10 && (op2 & b111100) == b111000 && rn != b1111) - result = armv7_read_thumb_32_instr_ldrsbt(raw); + result = armv7_read_thumb_32_instr_a8_ldrsbt(raw); else if (op1 == b11 && rn != b1111) { if (rt != b1111) - result = armv7_read_thumb_32_instr_ldrsb_immediate(raw); + result = armv7_read_thumb_32_instr_a8_ldrsb_immediate(raw); else /*if (rt == b1111) */ - result = armv7_read_thumb_32_instr_pli_immediate_literal(raw); + result = armv7_read_thumb_32_instr_a8_pli_immediate_literal(raw); } @@ -1231,61 +1231,61 @@ static GArchInstruction *process_armv7_thumb_32_store_single_data_item(uint32_t case b000: if (op2 == b000000) - result = armv7_read_thumb_32_instr_strb_register(raw); + result = armv7_read_thumb_32_instr_a8_strb_register(raw); else if ((op2 & b100100) == b100100) - result = armv7_read_thumb_32_instr_strb_immediate_thumb(raw); + result = armv7_read_thumb_32_instr_a8_strb_immediate_thumb(raw); else if ((op2 & b111100) == b110000) - result = armv7_read_thumb_32_instr_strb_immediate_thumb(raw); + result = armv7_read_thumb_32_instr_a8_strb_immediate_thumb(raw); else if ((op2 & b111100) == b111000) - result = armv7_read_thumb_32_instr_strbt(raw); + result = armv7_read_thumb_32_instr_a8_strbt(raw); break; case b001: if (op2 == b000000) - result = armv7_read_thumb_32_instr_strh_register(raw); + result = armv7_read_thumb_32_instr_a8_strh_register(raw); else if ((op2 & b100100) == b100100) - result = armv7_read_thumb_32_instr_strh_immediate_thumb(raw); + result = armv7_read_thumb_32_instr_a8_strh_immediate_thumb(raw); else if ((op2 & b111100) == b110000) - result = armv7_read_thumb_32_instr_strh_immediate_thumb(raw); + result = armv7_read_thumb_32_instr_a8_strh_immediate_thumb(raw); else if ((op2 & b111100) == b111000) - result = armv7_read_thumb_32_instr_strht(raw); + result = armv7_read_thumb_32_instr_a8_strht(raw); break; case b010: if (op2 == b000000) - result = armv7_read_thumb_32_instr_str_register(raw); + result = armv7_read_thumb_32_instr_a8_str_register(raw); else if ((op2 & b100100) == b100100) - result = armv7_read_thumb_32_instr_str_immediate_thumb(raw); + result = armv7_read_thumb_32_instr_a8_str_immediate_thumb(raw); else if ((op2 & b111100) == b110000) - result = armv7_read_thumb_32_instr_str_immediate_thumb(raw); + result = armv7_read_thumb_32_instr_a8_str_immediate_thumb(raw); else if ((op2 & b111100) == b111000) - result = armv7_read_thumb_32_instr_strt(raw); + result = armv7_read_thumb_32_instr_a8_strt(raw); break; case b100: - result = armv7_read_thumb_32_instr_strb_immediate_thumb(raw); + result = armv7_read_thumb_32_instr_a8_strb_immediate_thumb(raw); break; case b101: - result = armv7_read_thumb_32_instr_strh_immediate_thumb(raw); + result = armv7_read_thumb_32_instr_a8_strh_immediate_thumb(raw); break; case b110: - result = armv7_read_thumb_32_instr_str_immediate_thumb(raw); + result = armv7_read_thumb_32_instr_a8_str_immediate_thumb(raw); break; } @@ -1332,15 +1332,15 @@ static GArchInstruction *process_armv7_thumb_32_data_processing_shifted_register case b0000: if (rds == b11111) - result = armv7_read_thumb_32_instr_tst_register(raw); + result = armv7_read_thumb_32_instr_a8_tst_register(raw); else - result = armv7_read_thumb_32_instr_and_register(raw); + result = armv7_read_thumb_32_instr_a8_and_register(raw); break; case b0001: - result = armv7_read_thumb_32_instr_bic_register(raw); + result = armv7_read_thumb_32_instr_a8_bic_register(raw); break; case b0010: @@ -1349,64 +1349,64 @@ static GArchInstruction *process_armv7_thumb_32_data_processing_shifted_register result = process_armv7_thumb_32_move_register_and_immediate_shifts(raw); else - result = armv7_read_thumb_32_instr_orr_register(raw); + result = armv7_read_thumb_32_instr_a8_orr_register(raw); break; case b0011: if (rn == b11111) - result = armv7_read_thumb_32_instr_mvn_register(raw); + result = armv7_read_thumb_32_instr_a8_mvn_register(raw); else - result = armv7_read_thumb_32_instr_orn_register(raw); + result = armv7_read_thumb_32_instr_a8_orn_register(raw); break; case b0100: if (rds == b11111) - result = armv7_read_thumb_32_instr_teq_register(raw); + result = armv7_read_thumb_32_instr_a8_teq_register(raw); else - result = armv7_read_thumb_32_instr_eor_register(raw); + result = armv7_read_thumb_32_instr_a8_eor_register(raw); break; case b0110: - result = armv7_read_thumb_32_instr_pkh(raw); + result = armv7_read_thumb_32_instr_a8_pkh(raw); break; case b1000: if (rds == b11111) - result = armv7_read_thumb_32_instr_cmn_register(raw); + result = armv7_read_thumb_32_instr_a8_cmn_register(raw); else - result = armv7_read_thumb_32_instr_add_register_thumb(raw); + result = armv7_read_thumb_32_instr_a8_add_register_thumb(raw); break; case b1010: - result = armv7_read_thumb_32_instr_adc_register(raw); + result = armv7_read_thumb_32_instr_a8_adc_register(raw); break; case b1011: - result = armv7_read_thumb_32_instr_sbc_register(raw); + result = armv7_read_thumb_32_instr_a8_sbc_register(raw); break; case b1101: if (rds == b11111) - result = armv7_read_thumb_32_instr_cmp_register(raw); + result = armv7_read_thumb_32_instr_a8_cmp_register(raw); else - result = armv7_read_thumb_32_instr_sub_register_thumb(raw); + result = armv7_read_thumb_32_instr_a8_sub_register_thumb(raw); break; case b1110: - result = armv7_read_thumb_32_instr_rsb_register(raw); + result = armv7_read_thumb_32_instr_a8_rsb_register(raw); break; } @@ -1452,28 +1452,28 @@ static GArchInstruction *process_armv7_thumb_32_move_register_and_immediate_shif case b00: if (imm5 == b00000) - result = armv7_read_thumb_32_instr_mov_register_thumb(raw); + result = armv7_read_thumb_32_instr_a8_mov_register_thumb(raw); else/* if (imm5 != b00000)*/ - result = armv7_read_thumb_32_instr_lsl_immediate(raw); + result = armv7_read_thumb_32_instr_a8_lsl_immediate(raw); break; case b01: - result = armv7_read_thumb_32_instr_lsr_immediate(raw); + result = armv7_read_thumb_32_instr_a8_lsr_immediate(raw); break; case b10: - result = armv7_read_thumb_32_instr_asr_immediate(raw); + result = armv7_read_thumb_32_instr_a8_asr_immediate(raw); break; case b11: if (imm5 == b00000) - result = armv7_read_thumb_32_instr_rrx(raw); + result = armv7_read_thumb_32_instr_a8_rrx(raw); else/* if (imm5 != b00000)*/ - result = armv7_read_thumb_32_instr_ror_immediate(raw); + result = armv7_read_thumb_32_instr_a8_ror_immediate(raw); break; @@ -1517,74 +1517,74 @@ static GArchInstruction *process_armv7_thumb_32_data_processing_register(uint32_ op2 = (raw >> 4) & b1111; if ((op1 & b1110) == b0000 && op2 == b0000) - result = armv7_read_thumb_32_instr_lsl_register(raw); + result = armv7_read_thumb_32_instr_a8_lsl_register(raw); else if ((op1 & b1110) == b0010 && op2 == b0000) - result = armv7_read_thumb_32_instr_lsr_register(raw); + result = armv7_read_thumb_32_instr_a8_lsr_register(raw); else if ((op1 & b1110) == b0100 && op2 == b0000) - result = armv7_read_thumb_32_instr_asr_register(raw); + result = armv7_read_thumb_32_instr_a8_asr_register(raw); else if ((op1 & b1110) == b0110 && op2 == b0000) - result = armv7_read_thumb_32_instr_ror_register(raw); + result = armv7_read_thumb_32_instr_a8_ror_register(raw); else if (op1 == b0000 && (op2 & b1000) == b1000) { if (rn == b1111) - result = armv7_read_thumb_32_instr_sxth(raw); + result = armv7_read_thumb_32_instr_a8_sxth(raw); else - result = armv7_read_thumb_32_instr_sxtah(raw); + result = armv7_read_thumb_32_instr_a8_sxtah(raw); } else if (op1 == b0001 && (op2 & b1000) == b1000) { if (rn == b1111) - result = armv7_read_thumb_32_instr_uxth(raw); + result = armv7_read_thumb_32_instr_a8_uxth(raw); else - result = armv7_read_thumb_32_instr_uxtah(raw); + result = armv7_read_thumb_32_instr_a8_uxtah(raw); } else if (op1 == b0010 && (op2 & b1000) == b1000) { if (rn == b1111) - result = armv7_read_thumb_32_instr_sxtb16(raw); + result = armv7_read_thumb_32_instr_a8_sxtb16(raw); else - result = armv7_read_thumb_32_instr_sxtab16(raw); + result = armv7_read_thumb_32_instr_a8_sxtab16(raw); } else if (op1 == b0011 && (op2 & b1000) == b1000) { if (rn == b1111) - result = armv7_read_thumb_32_instr_uxtb16(raw); + result = armv7_read_thumb_32_instr_a8_uxtb16(raw); else - result = armv7_read_thumb_32_instr_uxtab16(raw); + result = armv7_read_thumb_32_instr_a8_uxtab16(raw); } else if (op1 == b0100 && (op2 & b1000) == b1000) { if (rn == b1111) - result = armv7_read_thumb_32_instr_sxtb(raw); + result = armv7_read_thumb_32_instr_a8_sxtb(raw); else - result = armv7_read_thumb_32_instr_sxtab(raw); + result = armv7_read_thumb_32_instr_a8_sxtab(raw); } else if (op1 == b0101 && (op2 & b1000) == b1000) { if (rn == b1111) - result = armv7_read_thumb_32_instr_uxtb(raw); + result = armv7_read_thumb_32_instr_a8_uxtb(raw); else - result = armv7_read_thumb_32_instr_uxtab(raw); + result = armv7_read_thumb_32_instr_a8_uxtab(raw); } @@ -1638,27 +1638,27 @@ static GArchInstruction *process_armv7_thumb_32_parallel_addition_and_subtractio switch (op1) { case b001: - result = armv7_read_thumb_32_instr_sadd16(raw); + result = armv7_read_thumb_32_instr_a8_sadd16(raw); break; case b010: - result = armv7_read_thumb_32_instr_sasx(raw); + result = armv7_read_thumb_32_instr_a8_sasx(raw); break; case b110: - result = armv7_read_thumb_32_instr_ssax(raw); + result = armv7_read_thumb_32_instr_a8_ssax(raw); break; case b101: - result = armv7_read_thumb_32_instr_ssub16(raw); + result = armv7_read_thumb_32_instr_a8_ssub16(raw); break; case b000: - result = armv7_read_thumb_32_instr_sadd8(raw); + result = armv7_read_thumb_32_instr_a8_sadd8(raw); break; case b100: - result = armv7_read_thumb_32_instr_ssub8(raw); + result = armv7_read_thumb_32_instr_a8_ssub8(raw); break; } @@ -1668,27 +1668,27 @@ static GArchInstruction *process_armv7_thumb_32_parallel_addition_and_subtractio switch (op1) { case b001: - result = armv7_read_thumb_32_instr_sqadd16(raw); + result = armv7_read_thumb_32_instr_a8_sqadd16(raw); break; case b010: - result = armv7_read_thumb_32_instr_sqasx(raw); + result = armv7_read_thumb_32_instr_a8_sqasx(raw); break; case b110: - result = armv7_read_thumb_32_instr_sqsax(raw); + result = armv7_read_thumb_32_instr_a8_sqsax(raw); break; case b101: - result = armv7_read_thumb_32_instr_sqsub16(raw); + result = armv7_read_thumb_32_instr_a8_sqsub16(raw); break; case b000: - result = armv7_read_thumb_32_instr_sqadd8(raw); + result = armv7_read_thumb_32_instr_a8_sqadd8(raw); break; case b100: - result = armv7_read_thumb_32_instr_sqsub8(raw); + result = armv7_read_thumb_32_instr_a8_sqsub8(raw); break; } @@ -1698,27 +1698,27 @@ static GArchInstruction *process_armv7_thumb_32_parallel_addition_and_subtractio switch (op1) { case b001: - result = armv7_read_thumb_32_instr_shadd16(raw); + result = armv7_read_thumb_32_instr_a8_shadd16(raw); break; case b010: - result = armv7_read_thumb_32_instr_shasx(raw); + result = armv7_read_thumb_32_instr_a8_shasx(raw); break; case b110: - result = armv7_read_thumb_32_instr_shsax(raw); + result = armv7_read_thumb_32_instr_a8_shsax(raw); break; case b101: - result = armv7_read_thumb_32_instr_shsub16(raw); + result = armv7_read_thumb_32_instr_a8_shsub16(raw); break; case b000: - result = armv7_read_thumb_32_instr_shadd8(raw); + result = armv7_read_thumb_32_instr_a8_shadd8(raw); break; case b100: - result = armv7_read_thumb_32_instr_shsub8(raw); + result = armv7_read_thumb_32_instr_a8_shsub8(raw); break; } @@ -1767,27 +1767,27 @@ static GArchInstruction *process_armv7_thumb_32_parallel_addition_and_subtractio switch (op1) { case b001: - result = armv7_read_thumb_32_instr_uadd16(raw); + result = armv7_read_thumb_32_instr_a8_uadd16(raw); break; case b010: - result = armv7_read_thumb_32_instr_uasx(raw); + result = armv7_read_thumb_32_instr_a8_uasx(raw); break; case b110: - result = armv7_read_thumb_32_instr_usax(raw); + result = armv7_read_thumb_32_instr_a8_usax(raw); break; case b101: - result = armv7_read_thumb_32_instr_usub16(raw); + result = armv7_read_thumb_32_instr_a8_usub16(raw); break; case b000: - result = armv7_read_thumb_32_instr_uadd8(raw); + result = armv7_read_thumb_32_instr_a8_uadd8(raw); break; case b100: - result = armv7_read_thumb_32_instr_usub8(raw); + result = armv7_read_thumb_32_instr_a8_usub8(raw); break; } @@ -1797,27 +1797,27 @@ static GArchInstruction *process_armv7_thumb_32_parallel_addition_and_subtractio switch (op1) { case b001: - result = armv7_read_thumb_32_instr_uqadd16(raw); + result = armv7_read_thumb_32_instr_a8_uqadd16(raw); break; case b010: - result = armv7_read_thumb_32_instr_uqasx(raw); + result = armv7_read_thumb_32_instr_a8_uqasx(raw); break; case b110: - result = armv7_read_thumb_32_instr_uqsax(raw); + result = armv7_read_thumb_32_instr_a8_uqsax(raw); break; case b101: - result = armv7_read_thumb_32_instr_uqsub16(raw); + result = armv7_read_thumb_32_instr_a8_uqsub16(raw); break; case b000: - result = armv7_read_thumb_32_instr_uqadd8(raw); + result = armv7_read_thumb_32_instr_a8_uqadd8(raw); break; case b100: - result = armv7_read_thumb_32_instr_uqsub8(raw); + result = armv7_read_thumb_32_instr_a8_uqsub8(raw); break; } @@ -1827,27 +1827,27 @@ static GArchInstruction *process_armv7_thumb_32_parallel_addition_and_subtractio switch (op1) { case b001: - result = armv7_read_thumb_32_instr_uhadd16(raw); + result = armv7_read_thumb_32_instr_a8_uhadd16(raw); break; case b010: - result = armv7_read_thumb_32_instr_uhasx(raw); + result = armv7_read_thumb_32_instr_a8_uhasx(raw); break; case b110: - result = armv7_read_thumb_32_instr_uhsax(raw); + result = armv7_read_thumb_32_instr_a8_uhsax(raw); break; case b101: - result = armv7_read_thumb_32_instr_uhsub16(raw); + result = armv7_read_thumb_32_instr_a8_uhsub16(raw); break; case b000: - result = armv7_read_thumb_32_instr_uhadd8(raw); + result = armv7_read_thumb_32_instr_a8_uhadd8(raw); break; case b100: - result = armv7_read_thumb_32_instr_uhsub8(raw); + result = armv7_read_thumb_32_instr_a8_uhsub8(raw); break; } @@ -1896,19 +1896,19 @@ static GArchInstruction *process_armv7_thumb_32_miscellaneous_operations(uint32_ switch (op2) { case b00: - result = armv7_read_thumb_32_instr_qadd(raw); + result = armv7_read_thumb_32_instr_a8_qadd(raw); break; case b01: - result = armv7_read_thumb_32_instr_qdadd(raw); + result = armv7_read_thumb_32_instr_a8_qdadd(raw); break; case b10: - result = armv7_read_thumb_32_instr_qsub(raw); + result = armv7_read_thumb_32_instr_a8_qsub(raw); break; case b11: - result = armv7_read_thumb_32_instr_qdsub(raw); + result = armv7_read_thumb_32_instr_a8_qdsub(raw); break; } @@ -1918,19 +1918,19 @@ static GArchInstruction *process_armv7_thumb_32_miscellaneous_operations(uint32_ switch (op2) { case b00: - result = armv7_read_thumb_32_instr_rev(raw); + result = armv7_read_thumb_32_instr_a8_rev(raw); break; case b01: - result = armv7_read_thumb_32_instr_rev16(raw); + result = armv7_read_thumb_32_instr_a8_rev16(raw); break; case b10: - result = armv7_read_thumb_32_instr_rbit(raw); + result = armv7_read_thumb_32_instr_a8_rbit(raw); break; case b11: - result = armv7_read_thumb_32_instr_revsh(raw); + result = armv7_read_thumb_32_instr_a8_revsh(raw); break; } @@ -1938,12 +1938,12 @@ static GArchInstruction *process_armv7_thumb_32_miscellaneous_operations(uint32_ case b10: if (op2 == b00) - result = armv7_read_thumb_32_instr_sel(raw); + result = armv7_read_thumb_32_instr_a8_sel(raw); break; case b11: if (op2 == b00) - result = armv7_read_thumb_32_instr_clz(raw); + result = armv7_read_thumb_32_instr_a8_clz(raw); break; } @@ -1992,25 +1992,25 @@ static GArchInstruction *process_armv7_thumb_32_multiply_multiply_accumulate_and if (op2 == b00) { if (ra == b1111) - result = armv7_read_thumb_32_instr_mul(raw); + result = armv7_read_thumb_32_instr_a8_mul(raw); else - result = armv7_read_thumb_32_instr_mla(raw); + result = armv7_read_thumb_32_instr_a8_mla(raw); } else if (op2 == b01) - result = armv7_read_thumb_32_instr_mls(raw); + result = armv7_read_thumb_32_instr_a8_mls(raw); break; case b001: if (ra == b1111) - result = armv7_read_thumb_32_instr_smulbb_smulbt_smultb_smultt(raw); + result = armv7_read_thumb_32_instr_a8_smulbb_smulbt_smultb_smultt(raw); else - result = armv7_read_thumb_32_instr_smlabb_smlabt_smlatb_smlatt(raw); + result = armv7_read_thumb_32_instr_a8_smlabb_smlabt_smlatb_smlatt(raw); break; @@ -2018,10 +2018,10 @@ static GArchInstruction *process_armv7_thumb_32_multiply_multiply_accumulate_and if ((op2 & b10) == b00) { if (ra == b1111) - result = armv7_read_thumb_32_instr_smuad(raw); + result = armv7_read_thumb_32_instr_a8_smuad(raw); else - result = armv7_read_thumb_32_instr_smlad(raw); + result = armv7_read_thumb_32_instr_a8_smlad(raw); } break; @@ -2030,10 +2030,10 @@ static GArchInstruction *process_armv7_thumb_32_multiply_multiply_accumulate_and if ((op2 & b10) == b00) { if (ra == b1111) - result = armv7_read_thumb_32_instr_smulwb_smulwt(raw); + result = armv7_read_thumb_32_instr_a8_smulwb_smulwt(raw); else - result = armv7_read_thumb_32_instr_smlawb_smlawt(raw); + result = armv7_read_thumb_32_instr_a8_smlawb_smlawt(raw); } break; @@ -2042,10 +2042,10 @@ static GArchInstruction *process_armv7_thumb_32_multiply_multiply_accumulate_and if ((op2 & b10) == b00) { if (ra == b1111) - result = armv7_read_thumb_32_instr_smusd(raw); + result = armv7_read_thumb_32_instr_a8_smusd(raw); else - result = armv7_read_thumb_32_instr_smlsd(raw); + result = armv7_read_thumb_32_instr_a8_smlsd(raw); } break; @@ -2054,27 +2054,27 @@ static GArchInstruction *process_armv7_thumb_32_multiply_multiply_accumulate_and if ((op2 & b10) == b00) { if (ra == b1111) - result = armv7_read_thumb_32_instr_smmul(raw); + result = armv7_read_thumb_32_instr_a8_smmul(raw); else - result = armv7_read_thumb_32_instr_smmla(raw); + result = armv7_read_thumb_32_instr_a8_smmla(raw); } break; case b110: if ((op2 & b10) == b00) - result = armv7_read_thumb_32_instr_smmls(raw); + result = armv7_read_thumb_32_instr_a8_smmls(raw); break; case b111: if (op2 == b00) { if (ra == b1111) - result = armv7_read_thumb_32_instr_usad8(raw); + result = armv7_read_thumb_32_instr_a8_usad8(raw); else - result = armv7_read_thumb_32_instr_usada8(raw); + result = armv7_read_thumb_32_instr_a8_usada8(raw); } break; @@ -2120,49 +2120,49 @@ static GArchInstruction *process_armv7_thumb_32_long_multiply_long_multiply_accu { case b000: if (op2 == b0000) - result = armv7_read_thumb_32_instr_smull(raw); + result = armv7_read_thumb_32_instr_a8_smull(raw); break; case b001: if (op2 == b1111) - result = armv7_read_thumb_32_instr_sdiv(raw); + result = armv7_read_thumb_32_instr_a8_sdiv(raw); break; case b010: if (op2 == b0000) - result = armv7_read_thumb_32_instr_umull(raw); + result = armv7_read_thumb_32_instr_a8_umull(raw); break; case b011: if (op2 == b1111) - result = armv7_read_thumb_32_instr_udiv(raw); + result = armv7_read_thumb_32_instr_a8_udiv(raw); break; case b100: if (op2 == b0000) - result = armv7_read_thumb_32_instr_smlal(raw); + result = armv7_read_thumb_32_instr_a8_smlal(raw); else if ((op2 & b1100) == b1000) - result = armv7_read_thumb_32_instr_smlalbb_smlalbt_smlaltb_smlaltt(raw); + result = armv7_read_thumb_32_instr_a8_smlalbb_smlalbt_smlaltb_smlaltt(raw); else if ((op2 & b1110) == b1100) - result = armv7_read_thumb_32_instr_smlald(raw); + result = armv7_read_thumb_32_instr_a8_smlald(raw); break; case b101: if ((op2 & b1110) == b1100) - result = armv7_read_thumb_32_instr_smlsld(raw); + result = armv7_read_thumb_32_instr_a8_smlsld(raw); break; case b110: if (op2 == b0000) - result = armv7_read_thumb_32_instr_umlal(raw); + result = armv7_read_thumb_32_instr_a8_umlal(raw); else if (op2 == b0110) - result = armv7_read_thumb_32_instr_umaal(raw); + result = armv7_read_thumb_32_instr_a8_umaal(raw); break; @@ -2216,32 +2216,32 @@ static GArchInstruction *process_armv7_thumb_32_coprocessor_advanced_simd_and_fl else if ((coproc & b1110) != b1010) { if ((op1 & b100001) == b000000 && (op1 & b111010) != b000000) - result = armv7_read_thumb_32_instr_stc_stc2(raw); + result = armv7_read_thumb_32_instr_a8_stc_stc2(raw); else if ((op1 & b100001) == b000001 && (op1 & b111010) != b000000) { if (rn != b1111) - result = armv7_read_thumb_32_instr_ldc_ldc2_immediate(raw); + result = armv7_read_thumb_32_instr_a8_ldc_ldc2_immediate(raw); else/* if (rn == b1111)*/ - result = armv7_read_thumb_32_instr_ldc_ldc2_literal(raw); + result = armv7_read_thumb_32_instr_a8_ldc_ldc2_literal(raw); } else if (op1 == b000100) - result = armv7_read_thumb_32_instr_mcrr_mcrr2(raw); + result = armv7_read_thumb_32_instr_a8_mcrr_mcrr2(raw); else if (op1 == b000101) - result = armv7_read_thumb_32_instr_mrrc_mrrc2(raw); + result = armv7_read_thumb_32_instr_a8_mrrc_mrrc2(raw); else if ((op1 & b110000) == b100000 && op == b0) - result = armv7_read_thumb_32_instr_cdp_cdp2(raw); + result = armv7_read_thumb_32_instr_a8_cdp_cdp2(raw); else if ((op1 & b110001) == b100000 && op == b1) - result = armv7_read_thumb_32_instr_mcr_mcr2(raw); + result = armv7_read_thumb_32_instr_a8_mcr_mcr2(raw); else if ((op1 & b110001) == b100001 && op == b1) - result = armv7_read_thumb_32_instr_mrc_mrc2(raw); + result = armv7_read_thumb_32_instr_a8_mrc_mrc2(raw); } |