diff options
Diffstat (limited to 'plugins/arm/v7/arm.c')
| -rw-r--r-- | plugins/arm/v7/arm.c | 544 |
1 files changed, 272 insertions, 272 deletions
diff --git a/plugins/arm/v7/arm.c b/plugins/arm/v7/arm.c index 8fdeb8e..fac29a2 100644 --- a/plugins/arm/v7/arm.c +++ b/plugins/arm/v7/arm.c @@ -275,10 +275,10 @@ static GArchInstruction *process_armv7_arm_data_processing_and_miscellaneous_ins result = process_armv7_arm_data_processing_immediate(raw); else if (op1 == b10000) - result = armv7_read_arm_instr_mov_immediate(raw); + result = armv7_read_arm_instr_a8_mov_immediate(raw); else if (op1 == b10100) - result = armv7_read_arm_instr_movt(raw); + result = armv7_read_arm_instr_a8_movt(raw); else if ((op1 & b11011) == b10010) result = process_armv7_arm_msr_immediate_and_hints(raw); @@ -325,28 +325,28 @@ static GArchInstruction *process_armv7_arm_data_processing_register(uint32_t raw op2 = (raw >> 5) & 0x3; if ((op & b11110) == b00000) - result = armv7_read_arm_instr_and_register(raw); + result = armv7_read_arm_instr_a8_and_register(raw); else if ((op & b11110) == b00010) - result = armv7_read_arm_instr_eor_register(raw); + result = armv7_read_arm_instr_a8_eor_register(raw); else if ((op & b11110) == b00100) - result = armv7_read_arm_instr_sub_register(raw); + result = armv7_read_arm_instr_a8_sub_register(raw); else if ((op & b11110) == b00110) - result = armv7_read_arm_instr_rsb_register(raw); + result = armv7_read_arm_instr_a8_rsb_register(raw); else if ((op & b11110) == b01000) - result = armv7_read_arm_instr_add_register_arm(raw); + result = armv7_read_arm_instr_a8_add_register_arm(raw); else if ((op & b11110) == b01010) - result = armv7_read_arm_instr_adc_register(raw); + result = armv7_read_arm_instr_a8_adc_register(raw); else if ((op & b11110) == b01100) - result = armv7_read_arm_instr_sbc_register(raw); + result = armv7_read_arm_instr_a8_sbc_register(raw); else if ((op & b11110) == b01110) - result = armv7_read_arm_instr_rsc_register(raw); + result = armv7_read_arm_instr_a8_rsc_register(raw); /* else if ((op & b11001) == b10000) @@ -354,55 +354,55 @@ static GArchInstruction *process_armv7_arm_data_processing_register(uint32_t raw */ else if (op == b10001) - result = armv7_read_arm_instr_tst_register(raw); + result = armv7_read_arm_instr_a8_tst_register(raw); else if (op == b10011) - result = armv7_read_arm_instr_teq_register(raw); + result = armv7_read_arm_instr_a8_teq_register(raw); else if (op == b10101) - result = armv7_read_arm_instr_cmp_register(raw); + result = armv7_read_arm_instr_a8_cmp_register(raw); else if (op == b10111) - result = armv7_read_arm_instr_cmn_register(raw); + result = armv7_read_arm_instr_a8_cmn_register(raw); else if ((op & b11110) == b11000) - result = armv7_read_arm_instr_orr_register(raw); + result = armv7_read_arm_instr_a8_orr_register(raw); else if ((op & b11110) == b11010) { if (op2 == b00) { if (imm5 == b00000) - result = armv7_read_arm_instr_mov_register_arm(raw); + result = armv7_read_arm_instr_a8_mov_register_arm(raw); else - result = armv7_read_arm_instr_lsl_immediate(raw); + result = armv7_read_arm_instr_a8_lsl_immediate(raw); } else if (op2 == b01) - result = armv7_read_arm_instr_lsr_immediate(raw); + result = armv7_read_arm_instr_a8_lsr_immediate(raw); else if (op2 == b10) - result = armv7_read_arm_instr_asr_immediate(raw); + result = armv7_read_arm_instr_a8_asr_immediate(raw); else if (op2 == b11) { if (imm5 == b00000) - result = armv7_read_arm_instr_rrx(raw); + result = armv7_read_arm_instr_a8_rrx(raw); else - result = armv7_read_arm_instr_ror_immediate(raw); + result = armv7_read_arm_instr_a8_ror_immediate(raw); } } else if ((op & b11110) == b11100) - result = armv7_read_arm_instr_bic_register(raw); + result = armv7_read_arm_instr_a8_bic_register(raw); else if ((op & b11110) == b11110) - result = armv7_read_arm_instr_mvn_register(raw); + result = armv7_read_arm_instr_a8_mvn_register(raw); return result; @@ -440,28 +440,28 @@ static GArchInstruction *process_armv7_arm_data_processing_register_shifted_regi op2 = (raw >> 5) & 0x3; if ((op1 & b11110) == b00000) - result = armv7_read_arm_instr_and_register_shifted_register(raw); + result = armv7_read_arm_instr_a8_and_register_shifted_register(raw); else if ((op1 & b11110) == b00010) - result = armv7_read_arm_instr_eor_register_shifted_register(raw); + result = armv7_read_arm_instr_a8_eor_register_shifted_register(raw); else if ((op1 & b11110) == b00100) - result = armv7_read_arm_instr_sub_register_shifted_register(raw); + result = armv7_read_arm_instr_a8_sub_register_shifted_register(raw); else if ((op1 & b11110) == b00110) - result = armv7_read_arm_instr_rsb_register_shifted_register(raw); + result = armv7_read_arm_instr_a8_rsb_register_shifted_register(raw); else if ((op1 & b11110) == b01000) - result = armv7_read_arm_instr_add_register_shifted_register(raw); + result = armv7_read_arm_instr_a8_add_register_shifted_register(raw); else if ((op1 & b11110) == b01010) - result = armv7_read_arm_instr_adc_register_shifted_register(raw); + result = armv7_read_arm_instr_a8_adc_register_shifted_register(raw); else if ((op1 & b11110) == b01100) - result = armv7_read_arm_instr_sbc_register_shifted_register(raw); + result = armv7_read_arm_instr_a8_sbc_register_shifted_register(raw); else if ((op1 & b11110) == b01110) - result = armv7_read_arm_instr_rsc_register_shifted_register(raw); + result = armv7_read_arm_instr_a8_rsc_register_shifted_register(raw); #if 0 else if ((op1 & b11001) == b10000) @@ -469,41 +469,41 @@ static GArchInstruction *process_armv7_arm_data_processing_register_shifted_regi #endif else if (op1 == b10001) - result = armv7_read_arm_instr_tst_register_shifted_register(raw); + result = armv7_read_arm_instr_a8_tst_register_shifted_register(raw); else if (op1 == b10011) - result = armv7_read_arm_instr_teq_register_shifted_register(raw); + result = armv7_read_arm_instr_a8_teq_register_shifted_register(raw); else if (op1 == b10101) - result = armv7_read_arm_instr_cmp_register_shifted_register(raw); + result = armv7_read_arm_instr_a8_cmp_register_shifted_register(raw); else if (op1 == b10111) - result = armv7_read_arm_instr_cmn_register_shifted_register(raw); + result = armv7_read_arm_instr_a8_cmn_register_shifted_register(raw); else if ((op1 & b11110) == b11000) - result = armv7_read_arm_instr_orr_register_shifted_register(raw); + result = armv7_read_arm_instr_a8_orr_register_shifted_register(raw); else if ((op1 & b11110) == b11010) { if (op2 == b00) - result = armv7_read_arm_instr_lsl_register(raw); + result = armv7_read_arm_instr_a8_lsl_register(raw); else if (op2 == b01) - result = armv7_read_arm_instr_lsr_register(raw); + result = armv7_read_arm_instr_a8_lsr_register(raw); else if (op2 == b10) - result = armv7_read_arm_instr_asr_register(raw); + result = armv7_read_arm_instr_a8_asr_register(raw); else if (op2 == b11) - result = armv7_read_arm_instr_ror_register(raw); + result = armv7_read_arm_instr_a8_ror_register(raw); } else if ((op1 & b11110) == b11100) - result = armv7_read_arm_instr_bic_register_shifted_register(raw); + result = armv7_read_arm_instr_a8_bic_register_shifted_register(raw); else if ((op1 & b11110) == b11110) - result = armv7_read_arm_instr_mvn_register_shifted_register(raw); + result = armv7_read_arm_instr_a8_mvn_register_shifted_register(raw); return result; @@ -541,42 +541,42 @@ static GArchInstruction *process_armv7_arm_data_processing_immediate(uint32_t ra rn = (raw >> 16) & 0xf; if ((op & b11110) == b00000) - result = armv7_read_arm_instr_and_immediate(raw); + result = armv7_read_arm_instr_a8_and_immediate(raw); else if ((op & b11110) == b00010) - result = armv7_read_arm_instr_eor_immediate(raw); + result = armv7_read_arm_instr_a8_eor_immediate(raw); else if ((op & b11110) == b00100) { if (rn == b1111) - result = armv7_read_arm_instr_adr(raw); + result = armv7_read_arm_instr_a8_adr(raw); else - result = armv7_read_arm_instr_sub_immediate_arm(raw); + result = armv7_read_arm_instr_a8_sub_immediate_arm(raw); } else if ((op & b11110) == b00110) - result = armv7_read_arm_instr_rsb_immediate(raw); + result = armv7_read_arm_instr_a8_rsb_immediate(raw); else if ((op & b11110) == b01000) { if (rn == b1111) - result = armv7_read_arm_instr_adr(raw); + result = armv7_read_arm_instr_a8_adr(raw); else - result = armv7_read_arm_instr_add_immediate_arm(raw); + result = armv7_read_arm_instr_a8_add_immediate_arm(raw); } else if ((op & b11110) == b01010) - result = armv7_read_arm_instr_adc_immediate(raw); + result = armv7_read_arm_instr_a8_adc_immediate(raw); else if ((op & b11110) == b01100) - result = armv7_read_arm_instr_sbc_immediate(raw); + result = armv7_read_arm_instr_a8_sbc_immediate(raw); else if ((op & b11110) == b01110) - result = armv7_read_arm_instr_rsc_immediate(raw); + result = armv7_read_arm_instr_a8_rsc_immediate(raw); /* else if ((op & b11110) == b10000) @@ -584,28 +584,28 @@ static GArchInstruction *process_armv7_arm_data_processing_immediate(uint32_t ra */ else if (op == b10001) - result = armv7_read_arm_instr_tst_immediate(raw); + result = armv7_read_arm_instr_a8_tst_immediate(raw); else if (op == b10011) - result = armv7_read_arm_instr_teq_immediate(raw); + result = armv7_read_arm_instr_a8_teq_immediate(raw); else if (op == b10101) - result = armv7_read_arm_instr_cmp_immediate(raw); + result = armv7_read_arm_instr_a8_cmp_immediate(raw); else if (op == b10111) - result = armv7_read_arm_instr_cmn_immediate(raw); + result = armv7_read_arm_instr_a8_cmn_immediate(raw); else if ((op & b11110) == b11000) - result = armv7_read_arm_instr_orr_immediate(raw); + result = armv7_read_arm_instr_a8_orr_immediate(raw); else if ((op & b11110) == b11010) - result = armv7_read_arm_instr_mov_immediate(raw); + result = armv7_read_arm_instr_a8_mov_immediate(raw); else if ((op & b11110) == b11100) - result = armv7_read_arm_instr_bic_immediate(raw); + result = armv7_read_arm_instr_a8_bic_immediate(raw); else if ((op & b11110) == b11110) - result = armv7_read_arm_instr_mvn_immediate(raw); + result = armv7_read_arm_instr_a8_mvn_immediate(raw); return result; @@ -641,34 +641,34 @@ static GArchInstruction *process_armv7_arm_multiply_and_multiply_accumulate(uint op = (raw >> 20) & 0xf; if ((op & b1110) == b0000) - result = armv7_read_arm_instr_mul(raw); + result = armv7_read_arm_instr_a8_mul(raw); else if ((op & b1110) == b0010) - result = armv7_read_arm_instr_mla(raw); + result = armv7_read_arm_instr_a8_mla(raw); else if (op == b0100) - result = armv7_read_arm_instr_umaal(raw); + result = armv7_read_arm_instr_a8_umaal(raw); else if (op == b0101) result = NULL; /* Non défini */ else if (op == b0110) - result = armv7_read_arm_instr_mls(raw); + result = armv7_read_arm_instr_a8_mls(raw); else if (op == b0111) result = NULL; /* Non défini */ else if ((op & b1110) == b1000) - result = armv7_read_arm_instr_umull(raw); + result = armv7_read_arm_instr_a8_umull(raw); else if ((op & b1110) == b1010) - result = armv7_read_arm_instr_umlal(raw); + result = armv7_read_arm_instr_a8_umlal(raw); else if ((op & b1110) == b1100) - result = armv7_read_arm_instr_smull(raw); + result = armv7_read_arm_instr_a8_smull(raw); else if ((op & b1110) == b1110) - result = armv7_read_arm_instr_smlal(raw); + result = armv7_read_arm_instr_a8_smlal(raw); return result; @@ -704,16 +704,16 @@ static GArchInstruction *process_armv7_arm_saturating_addition_and_subtraction(u op = (raw >> 21) & 0x3; if (op == b00) - result = armv7_read_arm_instr_qadd(raw); + result = armv7_read_arm_instr_a8_qadd(raw); else if (op == b01) - result = armv7_read_arm_instr_qsub(raw); + result = armv7_read_arm_instr_a8_qsub(raw); else if (op == b10) - result = armv7_read_arm_instr_qdadd(raw); + result = armv7_read_arm_instr_a8_qdadd(raw); else if (op == b11) - result = armv7_read_arm_instr_qdsub(raw); + result = armv7_read_arm_instr_a8_qdsub(raw); return result; @@ -751,23 +751,23 @@ static GArchInstruction *process_armv7_arm_halfword_multiply_and_multiply_accumu op = (raw >> 5) & 0x1; if (op1 == b00) - result = armv7_read_arm_instr_smlabb_smlabt_smlatb_smlatt(raw); + result = armv7_read_arm_instr_a8_smlabb_smlabt_smlatb_smlatt(raw); else if (op1 == b01) { if (op == b0) - result = armv7_read_arm_instr_smlawb_smlawt(raw); + result = armv7_read_arm_instr_a8_smlawb_smlawt(raw); else/* if (op == b1)*/ - result = armv7_read_arm_instr_smulwb_smulwt(raw); + result = armv7_read_arm_instr_a8_smulwb_smulwt(raw); } else if (op1 == b10) - result = armv7_read_arm_instr_smlalbb_smlalbt_smlaltb_smlaltt(raw); + result = armv7_read_arm_instr_a8_smlalbb_smlalbt_smlaltb_smlaltt(raw); else if (op1 == b11) - result = armv7_read_arm_instr_smulbb_smulbt_smultb_smultt(raw); + result = armv7_read_arm_instr_a8_smulbb_smulbt_smultb_smultt(raw); return result; @@ -809,21 +809,21 @@ static GArchInstruction *process_armv7_arm_extra_load_store_instructions(uint32_ if (op2 == b01) { if ((op1 & b00101) == b00000) - result = armv7_read_arm_instr_strh_register(raw); + result = armv7_read_arm_instr_a8_strh_register(raw); else if ((op1 & b00101) == b00001) - result = armv7_read_arm_instr_ldrh_register(raw); + result = armv7_read_arm_instr_a8_ldrh_register(raw); else if ((op1 & b00101) == b00100) - result = armv7_read_arm_instr_strh_immediate_arm(raw); + result = armv7_read_arm_instr_a8_strh_immediate_arm(raw); else/* if ((op1 & b00101) == b00101)*/ { if (rn == b1111) - result = armv7_read_arm_instr_ldrh_literal(raw); + result = armv7_read_arm_instr_a8_ldrh_literal(raw); else - result = armv7_read_arm_instr_ldrh_immediate_arm(raw); + result = armv7_read_arm_instr_a8_ldrh_immediate_arm(raw); } @@ -832,28 +832,28 @@ static GArchInstruction *process_armv7_arm_extra_load_store_instructions(uint32_ else if (op2 == b10) { if ((op1 & b00101) == b00000) - result = armv7_read_arm_instr_ldrd_register(raw); + result = armv7_read_arm_instr_a8_ldrd_register(raw); else if ((op1 & b00101) == b00001) - result = armv7_read_arm_instr_ldrsb_register(raw); + result = armv7_read_arm_instr_a8_ldrsb_register(raw); else if ((op1 & b00101) == b00100) { if (rn == b1111) - result = armv7_read_arm_instr_ldrd_literal(raw); + result = armv7_read_arm_instr_a8_ldrd_literal(raw); else - result = armv7_read_arm_instr_ldrd_immediate(raw); + result = armv7_read_arm_instr_a8_ldrd_immediate(raw); } else/* if ((op1 & b00101) == b00101)*/ { if (rn == b1111) - result = armv7_read_arm_instr_ldrsb_literal(raw); + result = armv7_read_arm_instr_a8_ldrsb_literal(raw); else - result = armv7_read_arm_instr_ldrsb_immediate(raw); + result = armv7_read_arm_instr_a8_ldrsb_immediate(raw); } @@ -862,21 +862,21 @@ static GArchInstruction *process_armv7_arm_extra_load_store_instructions(uint32_ else if (op2 == b11) { if ((op1 & b00101) == b00000) - result = armv7_read_arm_instr_strd_register(raw); + result = armv7_read_arm_instr_a8_strd_register(raw); else if ((op1 & b00101) == b00001) - result = armv7_read_arm_instr_ldrsh_register(raw); + result = armv7_read_arm_instr_a8_ldrsh_register(raw); else if ((op1 & b00101) == b00100) - result = armv7_read_arm_instr_strd_immediate(raw); + result = armv7_read_arm_instr_a8_strd_immediate(raw); else/* if ((op1 & b00101) == b00101)*/ { if (rn == b1111) - result = armv7_read_arm_instr_ldrsh_literal(raw); + result = armv7_read_arm_instr_a8_ldrsh_literal(raw); else - result = armv7_read_arm_instr_ldrsh_immediate(raw); + result = armv7_read_arm_instr_a8_ldrsh_immediate(raw); } @@ -920,24 +920,24 @@ static GArchInstruction *process_armv7_arm_extra_load_store_instructions_unprivi if (op2 == b01) { if (op == b0) - result = armv7_read_arm_instr_strht(raw); + result = armv7_read_arm_instr_a8_strht(raw); else/* if (op == b1)*/ - result = armv7_read_arm_instr_ldrht(raw); + result = armv7_read_arm_instr_a8_ldrht(raw); } else if (op2 == b10) { if (op == b1) - result = armv7_read_arm_instr_ldrsbt(raw); + result = armv7_read_arm_instr_a8_ldrsbt(raw); } else if (op2 == b11) { if (op == b1) - result = armv7_read_arm_instr_ldrsht(raw); + result = armv7_read_arm_instr_a8_ldrsht(raw); } @@ -975,31 +975,31 @@ static GArchInstruction *process_armv7_arm_synchronization_primitives(uint32_t r op = (raw >> 20) & 0xf; if ((op & b1011) == b0000) - result = armv7_read_arm_instr_swp_swpb(raw); + result = armv7_read_arm_instr_a8_swp_swpb(raw); else if (op == b1000) - result = armv7_read_arm_instr_strex(raw); + result = armv7_read_arm_instr_a8_strex(raw); else if (op == b1001) - result = armv7_read_arm_instr_ldrex(raw); + result = armv7_read_arm_instr_a8_ldrex(raw); else if (op == b1010) - result = armv7_read_arm_instr_strexd(raw); + result = armv7_read_arm_instr_a8_strexd(raw); else if (op == b1011) - result = armv7_read_arm_instr_ldrexd(raw); + result = armv7_read_arm_instr_a8_ldrexd(raw); else if (op == b1100) - result = armv7_read_arm_instr_strexb(raw); + result = armv7_read_arm_instr_a8_strexb(raw); else if (op == b1101) - result = armv7_read_arm_instr_ldrexb(raw); + result = armv7_read_arm_instr_a8_ldrexb(raw); else if (op == b1110) - result = armv7_read_arm_instr_strexh(raw); + result = armv7_read_arm_instr_a8_strexh(raw); else if (op == b1111) - result = armv7_read_arm_instr_ldrexh(raw); + result = armv7_read_arm_instr_a8_ldrexh(raw); return result; @@ -1043,35 +1043,35 @@ static GArchInstruction *process_armv7_arm_msr_immediate_and_hints(uint32_t raw) if (op1 == b0000) { if (op2 == b00000000) - result = armv7_read_arm_instr_nop(raw); + result = armv7_read_arm_instr_a8_nop(raw); else if (op2 == b00000001) - result = armv7_read_arm_instr_yield(raw); + result = armv7_read_arm_instr_a8_yield(raw); else if (op2 == b00000010) - result = armv7_read_arm_instr_wfe(raw); + result = armv7_read_arm_instr_a8_wfe(raw); else if (op2 == b00000011) - result = armv7_read_arm_instr_wfi(raw); + result = armv7_read_arm_instr_a8_wfi(raw); else if (op2 == b00000100) - result = armv7_read_arm_instr_sev(raw); + result = armv7_read_arm_instr_a8_sev(raw); else if ((op2 & b11110000) == b11110000) - result = armv7_read_arm_instr_dbg(raw); + result = armv7_read_arm_instr_a8_dbg(raw); } else if (op1 == b0100 || (op1 & b1011) == b1000) - result = armv7_read_arm_instr_msr_immediate_a8(raw); + result = armv7_read_arm_instr_a8_msr_immediate(raw); else if ((op1 & b0011) == b0001 || (op1 & b0010) == b0010) - result = armv7_read_arm_instr_msr_immediate_b9(raw); + result = armv7_read_arm_instr_b9_msr_immediate(raw); } else/* if (op == b1)*/ - result = armv7_read_arm_instr_msr_immediate_b9(raw); + result = armv7_read_arm_instr_b9_msr_immediate(raw); return result; @@ -1117,29 +1117,29 @@ static GArchInstruction *process_armv7_arm_miscellaneous_instructions(uint32_t r if (b == b1) { if ((op & b01) == b00) - result = armv7_read_arm_instr_mrs_banked_register(raw); + result = armv7_read_arm_instr_b9_mrs_banked_register(raw); else/* if ((op & b01) == b01)*/ - result = armv7_read_arm_instr_msr_banked_register(raw); + result = armv7_read_arm_instr_b9_msr_banked_register(raw); } else/* if (b == b0)*/ { if ((op & b01) == b00) - result = armv7_read_arm_instr_mrs(raw); + result = armv7_read_arm_instr_a8_mrs(raw); /* B9 ? */ else if (op == b01) { if ((op1 & b0011) == b0000) - result = armv7_read_arm_instr_msr_register_a8(raw); + result = armv7_read_arm_instr_a8_msr_register(raw); else if ((op1 & b0011) == b0001 || (op1 & b0010) == b0010) - result = armv7_read_arm_instr_msr_register_b9(raw); + result = armv7_read_arm_instr_b9_msr_register(raw); } else if (op == b11) - result = armv7_read_arm_instr_msr_register_b9(raw); + result = armv7_read_arm_instr_b9_msr_register(raw); } @@ -1148,24 +1148,24 @@ static GArchInstruction *process_armv7_arm_miscellaneous_instructions(uint32_t r else if (op2 == b001) { if (op == b01) - result = armv7_read_arm_instr_bx(raw); + result = armv7_read_arm_instr_a8_bx(raw); else if (op == b11) - result = armv7_read_arm_instr_clz(raw); + result = armv7_read_arm_instr_a8_clz(raw); } else if (op2 == b010) { if (op == b01) - result = armv7_read_arm_instr_bxj(raw); + result = armv7_read_arm_instr_a8_bxj(raw); } else if (op2 == b011) { if (op == b01) - result = armv7_read_arm_instr_blx_register(raw); + result = armv7_read_arm_instr_a8_blx_register(raw); } @@ -1175,20 +1175,20 @@ static GArchInstruction *process_armv7_arm_miscellaneous_instructions(uint32_t r else if (op2 == b110) { if (op == b11) - result = armv7_read_arm_instr_eret(raw); + result = armv7_read_arm_instr_b9_eret(raw); } else if (op2 == b111) { if (op == b) - result = armv7_read_arm_instr_bkpt(raw); + result = armv7_read_arm_instr_a8_bkpt(raw); else if (op == b) - result = armv7_read_arm_instr_hvc(raw); + result = armv7_read_arm_instr_b9_hvc(raw); else if (op == b) - result = armv7_read_arm_instr_smc_previously_smi(raw); + result = armv7_read_arm_instr_b9_smc_previously_smi(raw); } @@ -1234,65 +1234,65 @@ static GArchInstruction *process_armv7_arm_load_store_word_and_unsigned_byte(uin if (a == b0) { if ((op1 & b00101) == b00000 && (op1 & b10111) != b00010) - result = armv7_read_arm_instr_str_immediate_arm(raw); + result = armv7_read_arm_instr_a8_str_immediate_arm(raw); else if ((op1 & b10111) == b00010) - result = armv7_read_arm_instr_strt(raw); + result = armv7_read_arm_instr_a8_strt(raw); else if ((op1 & b00101) == b00001 && (op1 & b10111) != b00011) { if (rn != b1111) - result = armv7_read_arm_instr_ldr_immediate_arm(raw); + result = armv7_read_arm_instr_a8_ldr_immediate_arm(raw); else - result = armv7_read_arm_instr_ldr_literal(raw); + result = armv7_read_arm_instr_a8_ldr_literal(raw); } else if ((op1 & b10111) == b00011) - result = armv7_read_arm_instr_ldrt(raw); + result = armv7_read_arm_instr_a8_ldrt(raw); else if ((op1 & b00101) == b00100 && (op1 & b10110) != b00110) - result = armv7_read_arm_instr_strb_immediate_arm(raw); + result = armv7_read_arm_instr_a8_strb_immediate_arm(raw); else if ((op1 & b10110) == b00110) - result = armv7_read_arm_instr_strbt(raw); + result = armv7_read_arm_instr_a8_strbt(raw); else if ((op1 & b00101) == b00101 && (op1 & b10111) != b00111) { if (rn != b1111) - result = armv7_read_arm_instr_ldrb_immediate_arm(raw); + result = armv7_read_arm_instr_a8_ldrb_immediate_arm(raw); else - result = armv7_read_arm_instr_ldrb_literal(raw); + result = armv7_read_arm_instr_a8_ldrb_literal(raw); } else if ((op1 & b10111) == b00111) - result = armv7_read_arm_instr_ldrbt(raw); + result = armv7_read_arm_instr_a8_ldrbt(raw); } else /*if (a == b1)*/ { if ((op1 & b00101) == b00000 && (op1 & b10111) != b00010 && b == b0) - result = armv7_read_arm_instr_str_register(raw); + result = armv7_read_arm_instr_a8_str_register(raw); else if ((op1 & b10111) == b00010 && b == b0) - result = armv7_read_arm_instr_strt(raw); + result = armv7_read_arm_instr_a8_strt(raw); else if ((op1 & b00101) == b00001 && (op1 & b10111) != b00011 && b == b0) - result = armv7_read_arm_instr_ldr_register_arm(raw); + result = armv7_read_arm_instr_a8_ldr_register_arm(raw); else if ((op1 & b10111) == b00011 && b == b0) - result = armv7_read_arm_instr_ldrt(raw); + result = armv7_read_arm_instr_a8_ldrt(raw); else if ((op1 & b00101) == b00100 && (op1 & b10110) != b00110 && b == b0) - result = armv7_read_arm_instr_strb_register(raw); + result = armv7_read_arm_instr_a8_strb_register(raw); else if ((op1 & b10110) == b00110 && b == b0) - result = armv7_read_arm_instr_strbt(raw); + result = armv7_read_arm_instr_a8_strbt(raw); else if ((op1 & b00101) == b00101 && (op1 & b10111) != b00111 && b == b0) - result = armv7_read_arm_instr_ldrb_register(raw); + result = armv7_read_arm_instr_a8_ldrb_register(raw); else if ((op1 & b10111) == b00111 && b == b0) - result = armv7_read_arm_instr_ldrbt(raw); + result = armv7_read_arm_instr_a8_ldrbt(raw); } @@ -1354,9 +1354,9 @@ static GArchInstruction *process_armv7_arm_media_instructions(uint32_t raw) if (op2 == b000) { if (rd == b1111) - result = armv7_read_arm_instr_usad8(raw); + result = armv7_read_arm_instr_a8_usad8(raw); else - result = armv7_read_arm_instr_usada8(raw); + result = armv7_read_arm_instr_a8_usada8(raw); } goto a54_done; @@ -1366,7 +1366,7 @@ static GArchInstruction *process_armv7_arm_media_instructions(uint32_t raw) else if ((op1 & b11110) == b11010) { if ((op2 & b011) == b010) - result = armv7_read_arm_instr_sbfx(raw); + result = armv7_read_arm_instr_a8_sbfx(raw); goto a54_done; @@ -1377,9 +1377,9 @@ static GArchInstruction *process_armv7_arm_media_instructions(uint32_t raw) if ((op2 & b011) == b000) { if (rn == b1111) - result = armv7_read_arm_instr_bfc(raw); + result = armv7_read_arm_instr_a8_bfc(raw); else - result = armv7_read_arm_instr_bfi(raw); + result = armv7_read_arm_instr_a8_bfi(raw); } goto a54_done; @@ -1389,14 +1389,14 @@ static GArchInstruction *process_armv7_arm_media_instructions(uint32_t raw) else if ((op1 & b11110) == b11110) { if ((op2 & b011) == b010) - result = armv7_read_arm_instr_ubfx(raw); + result = armv7_read_arm_instr_a8_ubfx(raw); goto a54_done; } else if (op1 == b11111 && op2 == b111 && cond == b1110) - result = armv7_read_arm_instr_ubfx(raw); + result = armv7_read_arm_instr_a8_udf(raw); a54_done: @@ -1438,66 +1438,66 @@ static GArchInstruction *process_armv7_arm_parallel_addition_and_subtraction_sig if (op1 == b01) { if (op2 == b000) - result = armv7_read_arm_instr_sadd16(raw); + result = armv7_read_arm_instr_a8_sadd16(raw); else if (op2 == b001) - result = armv7_read_arm_instr_sasx(raw); + result = armv7_read_arm_instr_a8_sasx(raw); else if (op2 == b010) - result = armv7_read_arm_instr_ssax(raw); + result = armv7_read_arm_instr_a8_ssax(raw); else if (op2 == b011) - result = armv7_read_arm_instr_ssub16(raw); + result = armv7_read_arm_instr_a8_ssub16(raw); else if (op2 == b100) - result = armv7_read_arm_instr_sadd8(raw); + result = armv7_read_arm_instr_a8_sadd8(raw); else if (op2 == b111) - result = armv7_read_arm_instr_ssub8(raw); + result = armv7_read_arm_instr_a8_ssub8(raw); } else if (op1 == b10) { if (op2 == b000) - result = armv7_read_arm_instr_qadd16(raw); + result = armv7_read_arm_instr_a8_qadd16(raw); else if (op2 == b001) - result = armv7_read_arm_instr_qasx(raw); + result = armv7_read_arm_instr_a8_qasx(raw); else if (op2 == b010) - result = armv7_read_arm_instr_qsax(raw); + result = armv7_read_arm_instr_a8_qsax(raw); else if (op2 == b011) - result = armv7_read_arm_instr_qsub16(raw); + result = armv7_read_arm_instr_a8_qsub16(raw); else if (op2 == b100) - result = armv7_read_arm_instr_qadd8(raw); + result = armv7_read_arm_instr_a8_qadd8(raw); else if (op2 == b111) - result = armv7_read_arm_instr_qsub8(raw); + result = armv7_read_arm_instr_a8_qsub8(raw); } else if (op1 == b11) { if (op2 == b000) - result = armv7_read_arm_instr_shadd16(raw); + result = armv7_read_arm_instr_a8_shadd16(raw); else if (op2 == b001) - result = armv7_read_arm_instr_shasx(raw); + result = armv7_read_arm_instr_a8_shasx(raw); else if (op2 == b010) - result = armv7_read_arm_instr_shsax(raw); + result = armv7_read_arm_instr_a8_shsax(raw); else if (op2 == b011) - result = armv7_read_arm_instr_shsub16(raw); + result = armv7_read_arm_instr_a8_shsub16(raw); else if (op2 == b100) - result = armv7_read_arm_instr_shadd8(raw); + result = armv7_read_arm_instr_a8_shadd8(raw); else if (op2 == b111) - result = armv7_read_arm_instr_shsub8(raw); + result = armv7_read_arm_instr_a8_shsub8(raw); } @@ -1539,66 +1539,66 @@ static GArchInstruction *process_armv7_arm_parallel_addition_and_subtraction_uns if (op1 == b01) { if (op2 == b000) - result = armv7_read_arm_instr_uadd16(raw); + result = armv7_read_arm_instr_a8_uadd16(raw); else if (op2 == b001) - result = armv7_read_arm_instr_uasx(raw); + result = armv7_read_arm_instr_a8_uasx(raw); else if (op2 == b010) - result = armv7_read_arm_instr_usax(raw); + result = armv7_read_arm_instr_a8_usax(raw); else if (op2 == b011) - result = armv7_read_arm_instr_usub16(raw); + result = armv7_read_arm_instr_a8_usub16(raw); else if (op2 == b100) - result = armv7_read_arm_instr_uadd8(raw); + result = armv7_read_arm_instr_a8_uadd8(raw); else if (op2 == b111) - result = armv7_read_arm_instr_usub8(raw); + result = armv7_read_arm_instr_a8_usub8(raw); } else if (op1 == b10) { if (op2 == b000) - result = armv7_read_arm_instr_uqadd16(raw); + result = armv7_read_arm_instr_a8_uqadd16(raw); else if (op2 == b001) - result = armv7_read_arm_instr_uqasx(raw); + result = armv7_read_arm_instr_a8_uqasx(raw); else if (op2 == b010) - result = armv7_read_arm_instr_uqsax(raw); + result = armv7_read_arm_instr_a8_uqsax(raw); else if (op2 == b011) - result = armv7_read_arm_instr_uqsub16(raw); + result = armv7_read_arm_instr_a8_uqsub16(raw); else if (op2 == b100) - result = armv7_read_arm_instr_uqadd8(raw); + result = armv7_read_arm_instr_a8_uqadd8(raw); else if (op2 == b111) - result = armv7_read_arm_instr_uqsub8(raw); + result = armv7_read_arm_instr_a8_uqsub8(raw); } else if (op1 == b11) { if (op2 == b000) - result = armv7_read_arm_instr_uhadd16(raw); + result = armv7_read_arm_instr_a8_uhadd16(raw); else if (op2 == b001) - result = armv7_read_arm_instr_uhasx(raw); + result = armv7_read_arm_instr_a8_uhasx(raw); else if (op2 == b010) - result = armv7_read_arm_instr_uhsax(raw); + result = armv7_read_arm_instr_a8_uhsax(raw); else if (op2 == b011) - result = armv7_read_arm_instr_uhsub16(raw); + result = armv7_read_arm_instr_a8_uhsub16(raw); else if (op2 == b100) - result = armv7_read_arm_instr_uhadd8(raw); + result = armv7_read_arm_instr_a8_uhadd8(raw); else if (op2 == b111) - result = armv7_read_arm_instr_uhsub8(raw); + result = armv7_read_arm_instr_a8_uhsub8(raw); } @@ -1643,32 +1643,32 @@ static GArchInstruction *process_armv7_arm_packing_unpacking_saturation_and_reve { if ((op2 & b001) == b000) { - result = armv7_read_arm_instr_pkh(raw); + result = armv7_read_arm_instr_a8_pkh(raw); goto a543_done; } else if (op2 == b011) { if (a == b1111) { - result = armv7_read_arm_instr_sxtb16(raw); + result = armv7_read_arm_instr_a8_sxtb16(raw); goto a543_done; } else { - result = armv7_read_arm_instr_sxtab16(raw); + result = armv7_read_arm_instr_a8_sxtab16(raw); goto a543_done; } } else if (op2 == b101) { - result = armv7_read_arm_instr_sel(raw); + result = armv7_read_arm_instr_a8_sel(raw); goto a543_done; } } else if ((op1 & b110) == b010 && (op2 & b001) == b000) { - result = armv7_read_arm_instr_ssat(raw); + result = armv7_read_arm_instr_a8_ssat(raw); goto a543_done; } @@ -1676,19 +1676,19 @@ static GArchInstruction *process_armv7_arm_packing_unpacking_saturation_and_reve { if (op2 == b001) { - result = armv7_read_arm_instr_ssat16(raw); + result = armv7_read_arm_instr_a8_ssat16(raw); goto a543_done; } else if (op2 == b011) { if (a == b1111) { - result = armv7_read_arm_instr_sxtb(raw); + result = armv7_read_arm_instr_a8_sxtb(raw); goto a543_done; } else { - result = armv7_read_arm_instr_sxtab(raw); + result = armv7_read_arm_instr_a8_sxtab(raw); goto a543_done; } } @@ -1698,25 +1698,25 @@ static GArchInstruction *process_armv7_arm_packing_unpacking_saturation_and_reve { if (op2 == b001) { - result = armv7_read_arm_instr_rev(raw); + result = armv7_read_arm_instr_a8_rev(raw); goto a543_done; } else if (op2 == b011) { if (a == b1111) { - result = armv7_read_arm_instr_sxth(raw); + result = armv7_read_arm_instr_a8_sxth(raw); goto a543_done; } else { - result = armv7_read_arm_instr_sxtah(raw); + result = armv7_read_arm_instr_a8_sxtah(raw); goto a543_done; } } else if (op2 == b101) { - result = armv7_read_arm_instr_rev16(raw); + result = armv7_read_arm_instr_a8_rev16(raw); goto a543_done; } } @@ -1725,19 +1725,19 @@ static GArchInstruction *process_armv7_arm_packing_unpacking_saturation_and_reve { if (a == b1111) { - result = armv7_read_arm_instr_uxtb16(raw); + result = armv7_read_arm_instr_a8_uxtb16(raw); goto a543_done; } else { - result = armv7_read_arm_instr_uxtab16(raw); + result = armv7_read_arm_instr_a8_uxtab16(raw); goto a543_done; } } else if ((op1 & b110) == b110 && (op2 & b001) == b000) { - result = armv7_read_arm_instr_usat(raw); + result = armv7_read_arm_instr_a8_usat(raw); goto a543_done; } @@ -1745,19 +1745,19 @@ static GArchInstruction *process_armv7_arm_packing_unpacking_saturation_and_reve { if (op2 == b001) { - result = armv7_read_arm_instr_usat16(raw); + result = armv7_read_arm_instr_a8_usat16(raw); goto a543_done; } else if (op2 == b011) { if (a == b1111) { - result = armv7_read_arm_instr_uxtb(raw); + result = armv7_read_arm_instr_a8_uxtb(raw); goto a543_done; } else { - result = armv7_read_arm_instr_uxtab(raw); + result = armv7_read_arm_instr_a8_uxtab(raw); goto a543_done; } } @@ -1767,25 +1767,25 @@ static GArchInstruction *process_armv7_arm_packing_unpacking_saturation_and_reve { if (op2 == b001) { - result = armv7_read_arm_instr_rbit(raw); + result = armv7_read_arm_instr_a8_rbit(raw); goto a543_done; } else if (op2 == b011) { if (a == b1111) { - result = armv7_read_arm_instr_uxth(raw); + result = armv7_read_arm_instr_a8_uxth(raw); goto a543_done; } else { - result = armv7_read_arm_instr_uxtah(raw); + result = armv7_read_arm_instr_a8_uxtah(raw); goto a543_done; } } else if (op2 == b101) { - result = armv7_read_arm_instr_revsh(raw); + result = armv7_read_arm_instr_a8_revsh(raw); goto a543_done; } } @@ -1834,18 +1834,18 @@ static GArchInstruction *process_armv7_arm_signed_multiply_signed_and_unsigned_d if ((op2 & b110) == b000) { if (a != b1111) - result = armv7_read_arm_instr_smlad(raw); + result = armv7_read_arm_instr_a8_smlad(raw); else/* if (a == b1111)*/ - result = armv7_read_arm_instr_smuad(raw); + result = armv7_read_arm_instr_a8_smuad(raw); } else if ((op2 & b110) == b010) { if (a != b1111) - result = armv7_read_arm_instr_smlsd(raw); + result = armv7_read_arm_instr_a8_smlsd(raw); else/* if (a == b1111)*/ - result = armv7_read_arm_instr_smusd(raw); + result = armv7_read_arm_instr_a8_smusd(raw); } @@ -1854,24 +1854,24 @@ static GArchInstruction *process_armv7_arm_signed_multiply_signed_and_unsigned_d else if (op1 == b001) { if (op2 == b000) - result = armv7_read_arm_instr_sdiv(raw); + result = armv7_read_arm_instr_a8_sdiv(raw); } else if (op1 == b011) { if (op2 == b000) - result = armv7_read_arm_instr_udiv(raw); + result = armv7_read_arm_instr_a8_udiv(raw); } else if (op1 == b100) { if ((op2 & b110) == b000) - result = armv7_read_arm_instr_smlald(raw); + result = armv7_read_arm_instr_a8_smlald(raw); else if ((op2 & b110) == b010) - result = armv7_read_arm_instr_smlsld(raw); + result = armv7_read_arm_instr_a8_smlsld(raw); } @@ -1880,14 +1880,14 @@ static GArchInstruction *process_armv7_arm_signed_multiply_signed_and_unsigned_d if ((op2 & b110) == b000) { if (a != b1111) - result = armv7_read_arm_instr_smmla(raw); + result = armv7_read_arm_instr_a8_smmla(raw); else/* if (a == b1111)*/ - result = armv7_read_arm_instr_smmul(raw); + result = armv7_read_arm_instr_a8_smmul(raw); } else if ((op2 & b110) == b110) - result = armv7_read_arm_instr_smmls(raw); + result = armv7_read_arm_instr_a8_smmls(raw); } @@ -1929,61 +1929,61 @@ static GArchInstruction *process_armv7_arm_branch_branch_with_link_and_block_dat r = (raw >> 15) & 0x1; if ((op & b111101) == b000000) - result = armv7_read_arm_instr_stmda_stmed(raw); + result = armv7_read_arm_instr_a8_stmda_stmed(raw); else if ((op & b111101) == b000001) - result = armv7_read_arm_instr_ldmda_ldmfa(raw); + result = armv7_read_arm_instr_a8_ldmda_ldmfa(raw); else if ((op & b111101) == b001000) - result = armv7_read_arm_instr_stm_stmia_stmea(raw); + result = armv7_read_arm_instr_a8_stm_stmia_stmea(raw); else if (op == b001001) - result = armv7_read_arm_instr_ldm_ldmia_ldmfd_arm(raw); + result = armv7_read_arm_instr_a8_ldm_ldmia_ldmfd_arm(raw); else if (op == b001011) { if (rn != b1101) - result = armv7_read_arm_instr_ldm_ldmia_ldmfd_arm(raw); + result = armv7_read_arm_instr_a8_ldm_ldmia_ldmfd_arm(raw); else /* if (rn == b1101) */ - result = armv7_read_arm_instr_pop_arm(raw); + result = armv7_read_arm_instr_a8_pop_arm(raw); } else if (op == b010000) - result = armv7_read_arm_instr_stmdb_stmfd(raw); + result = armv7_read_arm_instr_a8_stmdb_stmfd(raw); else if (op == b010010) { if (rn != b1101) - result = armv7_read_arm_instr_stmdb_stmfd(raw); + result = armv7_read_arm_instr_a8_stmdb_stmfd(raw); else /* if (rn == b1101) */ - result = armv7_read_arm_instr_push(raw); + result = armv7_read_arm_instr_a8_push(raw); } else if ((op & b111101) == b010001) - result = armv7_read_arm_instr_ldmdb_ldmea(raw); + result = armv7_read_arm_instr_a8_ldmdb_ldmea(raw); else if ((op & b111101) == b011000) - result = armv7_read_arm_instr_stmib_stmfa(raw); + result = armv7_read_arm_instr_a8_stmib_stmfa(raw); else if ((op & b111101) == b011001) - result = armv7_read_arm_instr_ldmib_ldmed(raw); + result = armv7_read_arm_instr_a8_ldmib_ldmed(raw); else if ((op & b100101) == b000100) - result = armv7_read_arm_instr_stm_user_registers(raw); + result = armv7_read_arm_instr_b9_stm_user_registers(raw); else if ((op & b100101) == b000101) { if (r == b0) - result = armv7_read_arm_instr_ldm_user_registers(raw); + result = armv7_read_arm_instr_b9_ldm_user_registers(raw); else /* if (r == b1) */ - result = armv7_read_arm_instr_ldm_exception_return(raw); + result = armv7_read_arm_instr_b9_ldm_exception_return(raw); } else if ((op & b110000) == b100000) - result = armv7_read_arm_instr_b(raw); + result = armv7_read_arm_instr_a8_b(raw); else if ((op & b110000) == b110000) - result = armv7_read_arm_instr_bl_blx_immediate(raw); + result = armv7_read_arm_instr_a8_bl_blx_immediate(raw); return result; @@ -2028,37 +2028,37 @@ static GArchInstruction *process_armv7_arm_coprocessor_instructions_and_supervis result = g_undef_instruction_new(IBS_UNDEFINED); else if ((op1 & b110000) == b110000) - result = armv7_read_arm_instr_svc_previously_swi(raw); + result = armv7_read_arm_instr_a8_svc_previously_swi(raw); else if ((coproc & b1110) != b1010) { if ((op1 & b100001) == b000000 && (op1 & b111011) != b000000) - result = armv7_read_arm_instr_stc_stc2(raw); + result = armv7_read_arm_instr_a8_stc_stc2(raw); else if ((op1 & b100001) == b000001 && (op1 & b111011) != b000001) { if (rn != b1111) - result = armv7_read_arm_instr_ldc_ldc2_immediate(raw); + result = armv7_read_arm_instr_a8_ldc_ldc2_immediate(raw); else - result = armv7_read_arm_instr_ldc_ldc2_literal(raw); + result = armv7_read_arm_instr_a8_ldc_ldc2_literal(raw); } else if (op1 == b000100) - result = armv7_read_arm_instr_mcrr_mcrr2(raw); + result = armv7_read_arm_instr_a8_mcrr_mcrr2(raw); else if (op1 == b000101) - result = armv7_read_arm_instr_mrrc_mrrc2(raw); + result = armv7_read_arm_instr_a8_mrrc_mrrc2(raw); else if ((op1 & b110000) == b100000 && op == b0) - result = armv7_read_arm_instr_cdp_cdp2(raw); + result = armv7_read_arm_instr_a8_cdp_cdp2(raw); else if ((op1 & b110001) == b100000 && op == b1) - result = armv7_read_arm_instr_mcr_mcr2(raw); + result = armv7_read_arm_instr_a8_mcr_mcr2(raw); else if ((op1 & b110001) == b100001 && op == b1) - result = armv7_read_arm_instr_mrc_mrc2(raw); + result = armv7_read_arm_instr_a8_mrc_mrc2(raw); } @@ -2109,39 +2109,39 @@ static GArchInstruction *process_armv7_arm_unconditional_instructions(uint32_t r result = process_armv7_arm_memory_hints_advanced_simd_instructions_and_miscellaneous_instructions(raw); else if ((op1 & b11100101) == b10000100) - result = armv7_read_arm_instr_srs_arm(raw); + result = armv7_read_arm_instr_b9_srs_arm(raw); else if ((op1 & b11100101) == b10000001) - result = armv7_read_arm_instr_rfe(raw); + result = armv7_read_arm_instr_b9_rfe(raw); else if ((op1 & b11100000) == b10100000) - result = armv7_read_arm_instr_bl_blx_immediate(raw); + result = armv7_read_arm_instr_a8_bl_blx_immediate(raw); else if ((op1 & b11100001) == b11000000 && (op1 & b11111011) != b11000000) - result = armv7_read_arm_instr_stc_stc2(raw); + result = armv7_read_arm_instr_a8_stc_stc2(raw); else if ((op1 & b11100001) == b11000001 && (op1 & b11111011) != b11000001) { if (rn != b1111) - result = armv7_read_arm_instr_ldc_ldc2_immediate(raw); + result = armv7_read_arm_instr_a8_ldc_ldc2_immediate(raw); else/* if (rn == b1111)*/ - result = armv7_read_arm_instr_ldc_ldc2_literal(raw); + result = armv7_read_arm_instr_a8_ldc_ldc2_literal(raw); } else if (op1 == b11000100) - result = armv7_read_arm_instr_mcrr_mcrr2(raw); + result = armv7_read_arm_instr_a8_mcrr_mcrr2(raw); else if (op1 == b11000101) - result = armv7_read_arm_instr_mrrc_mrrc2(raw); + result = armv7_read_arm_instr_a8_mrrc_mrrc2(raw); else if ((op1 & b11110000) == b11100000 && op == b0) - result = armv7_read_arm_instr_cdp_cdp2(raw); + result = armv7_read_arm_instr_a8_cdp_cdp2(raw); else if ((op1 & b11110001) == b11100000 && op == b1) - result = armv7_read_arm_instr_mcr_mcr2(raw); + result = armv7_read_arm_instr_a8_mcr_mcr2(raw); else if ((op1 & b11110001) == b11100001 && op == b1) - result = armv7_read_arm_instr_mrc_mrc2(raw); + result = armv7_read_arm_instr_a8_mrc_mrc2(raw); return result; @@ -2183,10 +2183,10 @@ static GArchInstruction *process_armv7_arm_memory_hints_advanced_simd_instructio if (op1 == b0010000) { if ((op2 & b0010) == b0000 && (rn & b0001) == b0000) - result = armv7_read_arm_instr_cps_arm(raw); + result = armv7_read_arm_instr_b9_cps_arm(raw); else if (op2 == b0000 && (rn & b0001) == b0001) - result = armv7_read_arm_instr_cps_arm(raw); + result = armv7_read_arm_instr_a8_setend(raw); } @@ -2200,7 +2200,7 @@ static GArchInstruction *process_armv7_arm_memory_hints_advanced_simd_instructio result = g_undef_instruction_new(IBS_NOP); else if ((op1 & b1110111) == b1000101) - result = armv7_read_arm_instr_pli_immediate_literal(raw); + result = armv7_read_arm_instr_a8_pli_immediate_literal(raw); else if ((op1 & b1110011) == b1000011) result = g_undef_instruction_new(IBS_UNPREDICTABLE); @@ -2208,7 +2208,7 @@ static GArchInstruction *process_armv7_arm_memory_hints_advanced_simd_instructio else if ((op1 & b1110111) == b1010101) { if (rn != b1111) - result = armv7_read_arm_instr_pld_pldw_immediate(raw); + result = armv7_read_arm_instr_a8_pld_pldw_immediate(raw); else result = g_undef_instruction_new(IBS_UNPREDICTABLE); @@ -2217,9 +2217,9 @@ static GArchInstruction *process_armv7_arm_memory_hints_advanced_simd_instructio else if ((op1 & b1110111) == b1010101) { if (rn != b1111) - result = armv7_read_arm_instr_pld_pldw_immediate(raw); + result = armv7_read_arm_instr_a8_pld_pldw_immediate(raw); else - result = armv7_read_arm_instr_pld_literal(raw); + result = armv7_read_arm_instr_a8_pld_literal(raw); } @@ -2232,19 +2232,19 @@ static GArchInstruction *process_armv7_arm_memory_hints_advanced_simd_instructio result = g_undef_instruction_new(IBS_UNPREDICTABLE); else if (op2 == b0001) - result = armv7_read_arm_instr_clrex(raw); + result = armv7_read_arm_instr_a8_clrex(raw); else if ((op2 & b1110) == b0010) result = g_undef_instruction_new(IBS_UNPREDICTABLE); else if (op2 == b0100) - result = armv7_read_arm_instr_dsb(raw); + result = armv7_read_arm_instr_a8_dsb(raw); else if (op2 == b0101) - result = armv7_read_arm_instr_dmb(raw); + result = armv7_read_arm_instr_a8_dmb(raw); else if (op2 == b0110) - result = armv7_read_arm_instr_isb(raw); + result = armv7_read_arm_instr_a8_isb(raw); else if (op2 == b0111) result = g_undef_instruction_new(IBS_UNPREDICTABLE); @@ -2261,10 +2261,10 @@ static GArchInstruction *process_armv7_arm_memory_hints_advanced_simd_instructio result = g_undef_instruction_new(IBS_NOP); else if ((op1 & b1110111) == b1100101 && (op2 & b0001) == b0000) - result = armv7_read_arm_instr_pli_register(raw); + result = armv7_read_arm_instr_a8_pli_register(raw); else if ((op1 & b1110111) == b1110001 && (op2 & b0001) == b0000) - result = armv7_read_arm_instr_pld_pldw_register(raw); + result = armv7_read_arm_instr_a8_pld_pldw_register(raw); return result; |