Got prepared for more ARMv7 opcodes.

2 files changed, 174 insertions, 0 deletions

diff --git a/src/arch/arm/v7/opcodes/opcodes_tmp_arm.h b/src/arch/arm/v7/opcodes/opcodes_tmp_arm.h
index 719d3c3..c4cf3b2 100644
--- a/src/arch/arm/v7/opcodes/opcodes_tmp_arm.h
+++ b/src/arch/arm/v7/opcodes/opcodes_tmp_arm.h
@@ -1,7 +1,29 @@
 #ifndef arm_def_tmp_h
 #define arm_def_tmp_h
+#define armv7_read_arm_instr_adc_register_shifted_register(r) NULL
+#define armv7_read_arm_instr_add_register_shifted_register(r) NULL
+#define armv7_read_arm_instr_and_register_shifted_register(r) NULL
+#define armv7_read_arm_instr_asr_register(r) NULL
 #define armv7_read_arm_instr_bfc(r) NULL
 #define armv7_read_arm_instr_bfi(r) NULL
+#define armv7_read_arm_instr_bic_register_shifted_register(r) NULL
+#define armv7_read_arm_instr_bkpt(r) NULL
+#define armv7_read_arm_instr_bxj(r) NULL
+#define armv7_read_arm_instr_cdp_cdp2(r) NULL
+#define armv7_read_arm_instr_clrex(r) NULL
+#define armv7_read_arm_instr_clz(r) NULL
+#define armv7_read_arm_instr_cmn_register_shifted_register(r) NULL
+#define armv7_read_arm_instr_cmp_register_shifted_register(r) NULL
+#define armv7_read_arm_instr_cps_arm(r) NULL
+#define armv7_read_arm_instr_dbg(r) NULL
+#define armv7_read_arm_instr_dmd(r) NULL
+#define armv7_read_arm_instr_dsb(r) NULL
+#define armv7_read_arm_instr_eor_register_shifted_register(r) NULL
+#define armv7_read_arm_instr_eret(r) NULL
+#define armv7_read_arm_instr_hvc(r) NULL
+#define armv7_read_arm_instr_isb(r) NULL
+#define armv7_read_arm_instr_ldc_ldc2_immediate(r) NULL
+#define armv7_read_arm_instr_ldc_ldc2_literal(r) NULL
 #define armv7_read_arm_instr_ldmda_ldmfa(r) NULL
 #define armv7_read_arm_instr_ldmdb_ldmea(r) NULL
 #define armv7_read_arm_instr_ldm_exception_return(r) NULL
@@ -10,41 +32,161 @@
 #define armv7_read_arm_instr_ldm_user_registers(r) NULL
 #define armv7_read_arm_instr_ldrb_literal(r) NULL
 #define armv7_read_arm_instr_ldrbt(r) NULL
+#define armv7_read_arm_instr_ldrd_immediate(r) NULL
+#define armv7_read_arm_instr_ldrd_literal(r) NULL
+#define armv7_read_arm_instr_ldrd_register(r) NULL
+#define armv7_read_arm_instr_ldrex(r) NULL
+#define armv7_read_arm_instr_ldrexb(r) NULL
+#define armv7_read_arm_instr_ldrexd(r) NULL
+#define armv7_read_arm_instr_ldrexh(r) NULL
+#define armv7_read_arm_instr_ldrh_immediate_arm(r) NULL
+#define armv7_read_arm_instr_ldrh_literal(r) NULL
+#define armv7_read_arm_instr_ldrh_register(r) NULL
+#define armv7_read_arm_instr_ldrht(r) NULL
 #define armv7_read_arm_instr_ldr_register(r) NULL
+#define armv7_read_arm_instr_ldrsb_immediate(r) NULL
+#define armv7_read_arm_instr_ldrsb_literal(r) NULL
+#define armv7_read_arm_instr_ldrsb_register(r) NULL
+#define armv7_read_arm_instr_ldrsbt(r) NULL
+#define armv7_read_arm_instr_ldrsh_immediate(r) NULL
+#define armv7_read_arm_instr_ldrsh_literal(r) NULL
+#define armv7_read_arm_instr_ldrsh_register(r) NULL
+#define armv7_read_arm_instr_ldrsht(r) NULL
 #define armv7_read_arm_instr_ldrt(r) NULL
+#define armv7_read_arm_instr_lsl_register(r) NULL
+#define armv7_read_arm_instr_lsr_register(r) NULL
+#define armv7_read_arm_instr_mcr_mcr2(r) NULL
+#define armv7_read_arm_instr_mcrr_mcrr2(r) NULL
+#define armv7_read_arm_instr_mrc_mrc2(r) NULL
+#define armv7_read_arm_instr_mrrc_mrrc2(r) NULL
+#define armv7_read_arm_instr_mrs(r) NULL
+#define armv7_read_arm_instr_mrs_banked_register(r) NULL
+#define armv7_read_arm_instr_msr_banked_register(r) NULL
+#define armv7_read_arm_instr_msr_immediate_a8(r) NULL
+#define armv7_read_arm_instr_msr_immediate_b9(r) NULL
+#define armv7_read_arm_instr_msr_register_a8(r) NULL
+#define armv7_read_arm_instr_msr_register_b9(r) NULL
+#define armv7_read_arm_instr_mvn_register_shifted_register(r) NULL
+#define armv7_read_arm_instr_orr_register_shifted_register(r) NULL
 #define armv7_read_arm_instr_pkh(r) NULL
+#define armv7_read_arm_instr_pld_literal(r) NULL
+#define armv7_read_arm_instr_pld_pldw_immediate(r) NULL
+#define armv7_read_arm_instr_pld_pldw_register(r) NULL
+#define armv7_read_arm_instr_pli_immediate_literal(r) NULL
+#define armv7_read_arm_instr_pli_register(r) NULL
+#define armv7_read_arm_instr_qadd(r) NULL
+#define armv7_read_arm_instr_qadd16(r) NULL
+#define armv7_read_arm_instr_qadd8(r) NULL
+#define armv7_read_arm_instr_qasx(r) NULL
+#define armv7_read_arm_instr_qdadd(r) NULL
+#define armv7_read_arm_instr_qdsub(r) NULL
+#define armv7_read_arm_instr_qsax(r) NULL
+#define armv7_read_arm_instr_qsub(r) NULL
+#define armv7_read_arm_instr_qsub16(r) NULL
+#define armv7_read_arm_instr_qsub8(r) NULL
 #define armv7_read_arm_instr_rbit(r) NULL
 #define armv7_read_arm_instr_rev(r) NULL
 #define armv7_read_arm_instr_rev16(r) NULL
 #define armv7_read_arm_instr_revsh(r) NULL
+#define armv7_read_arm_instr_rfe(r) NULL
 #define armv7_read_arm_instr_ror_immediate(r) NULL
+#define armv7_read_arm_instr_ror_register(r) NULL
 #define armv7_read_arm_instr_rrx(r) NULL
+#define armv7_read_arm_instr_rsb_register_shifted_register(r) NULL
+#define armv7_read_arm_instr_rsc_register_shifted_register(r) NULL
+#define armv7_read_arm_instr_sadd16(r) NULL
+#define armv7_read_arm_instr_sadd8(r) NULL
+#define armv7_read_arm_instr_sasx(r) NULL
+#define armv7_read_arm_instr_sbc_register_shifted_register(r) NULL
 #define armv7_read_arm_instr_sbfx(r) NULL
+#define armv7_read_arm_instr_sdiv(r) NULL
 #define armv7_read_arm_instr_sel(r) NULL
+#define armv7_read_arm_instr_sev(r) NULL
+#define armv7_read_arm_instr_shadd16(r) NULL
+#define armv7_read_arm_instr_shadd8(r) NULL
+#define armv7_read_arm_instr_shasx(r) NULL
+#define armv7_read_arm_instr_shsax(r) NULL
+#define armv7_read_arm_instr_shsub16(r) NULL
+#define armv7_read_arm_instr_shsub8(r) NULL
+#define armv7_read_arm_instr_smc_previously_smi(r) NULL
+#define armv7_read_arm_instr_smlabb_smlabt_smlatb_smlatt(r) NULL
+#define armv7_read_arm_instr_smlad(r) NULL
+#define armv7_read_arm_instr_smlalbb_smlalbt_smlaltb_smlaltt(r) NULL
+#define armv7_read_arm_instr_smlald(r) NULL
+#define armv7_read_arm_instr_smlawb_smlawt(r) NULL
+#define armv7_read_arm_instr_smlsd(r) NULL
+#define armv7_read_arm_instr_smlsld(r) NULL
+#define armv7_read_arm_instr_smmla(r) NULL
+#define armv7_read_arm_instr_smmls(r) NULL
+#define armv7_read_arm_instr_smmul(r) NULL
+#define armv7_read_arm_instr_smuad(r) NULL
+#define armv7_read_arm_instr_smulbb_smulbt_smultb_smultt(r) NULL
+#define armv7_read_arm_instr_smulwb_smulwt(r) NULL
+#define armv7_read_arm_instr_smusd(r) NULL
+#define armv7_read_arm_instr_srs_arm(r) NULL
 #define armv7_read_arm_instr_ssat(r) NULL
 #define armv7_read_arm_instr_ssat16(r) NULL
+#define armv7_read_arm_instr_ssax(r) NULL
+#define armv7_read_arm_instr_ssub16(r) NULL
+#define armv7_read_arm_instr_ssub8(r) NULL
+#define armv7_read_arm_instr_stc_stc2(r) NULL
 #define armv7_read_arm_instr_stmda_stmed(r) NULL
 #define armv7_read_arm_instr_stmdb_stmfd(r) NULL
 #define armv7_read_arm_instr_stmib_stmfa(r) NULL
 #define armv7_read_arm_instr_stm_stmia_stmea(r) NULL
 #define armv7_read_arm_instr_stm_user_registers(r) NULL
 #define armv7_read_arm_instr_strbt(r) NULL
+#define armv7_read_arm_instr_strd_immediate(r) NULL
+#define armv7_read_arm_instr_strd_register(r) NULL
+#define armv7_read_arm_instr_strex(r) NULL
+#define armv7_read_arm_instr_strexb(r) NULL
+#define armv7_read_arm_instr_strexd(r) NULL
+#define armv7_read_arm_instr_strexh(r) NULL
+#define armv7_read_arm_instr_strh_immediate_arm(r) NULL
+#define armv7_read_arm_instr_strh_register(r) NULL
+#define armv7_read_arm_instr_strht(r) NULL
 #define armv7_read_arm_instr_str_register(r) NULL
 #define armv7_read_arm_instr_strt(r) NULL
+#define armv7_read_arm_instr_sub_register_shifted_register(r) NULL
+#define armv7_read_arm_instr_svc_previously_swi(r) NULL
+#define armv7_read_arm_instr_swp_swpb(r) NULL
 #define armv7_read_arm_instr_sxtab(r) NULL
 #define armv7_read_arm_instr_sxtab16(r) NULL
 #define armv7_read_arm_instr_sxtah(r) NULL
 #define armv7_read_arm_instr_sxtb(r) NULL
 #define armv7_read_arm_instr_sxtb16(r) NULL
 #define armv7_read_arm_instr_sxth(r) NULL
+#define armv7_read_arm_instr_teq_register_shifted_register(r) NULL
+#define armv7_read_arm_instr_tst_register_shifted_register(r) NULL
+#define armv7_read_arm_instr_uadd16(r) NULL
+#define armv7_read_arm_instr_uadd8(r) NULL
+#define armv7_read_arm_instr_uasx(r) NULL
 #define armv7_read_arm_instr_ubfx(r) NULL
+#define armv7_read_arm_instr_udiv(r) NULL
+#define armv7_read_arm_instr_uhadd16(r) NULL
+#define armv7_read_arm_instr_uhadd8(r) NULL
+#define armv7_read_arm_instr_uhasx(r) NULL
+#define armv7_read_arm_instr_uhsax(r) NULL
+#define armv7_read_arm_instr_uhsub16(r) NULL
+#define armv7_read_arm_instr_uhsub8(r) NULL
+#define armv7_read_arm_instr_uqadd16(r) NULL
+#define armv7_read_arm_instr_uqadd8(r) NULL
+#define armv7_read_arm_instr_uqasx(r) NULL
+#define armv7_read_arm_instr_uqsax(r) NULL
+#define armv7_read_arm_instr_uqsub16(r) NULL
+#define armv7_read_arm_instr_uqsub8(r) NULL
 #define armv7_read_arm_instr_usad8(r) NULL
 #define armv7_read_arm_instr_usada8(r) NULL
 #define armv7_read_arm_instr_usat(r) NULL
 #define armv7_read_arm_instr_usat16(r) NULL
+#define armv7_read_arm_instr_usax(r) NULL
+#define armv7_read_arm_instr_usub16(r) NULL
+#define armv7_read_arm_instr_usub8(r) NULL
 #define armv7_read_arm_instr_uxtab(r) NULL
 #define armv7_read_arm_instr_uxtab16(r) NULL
 #define armv7_read_arm_instr_uxtah(r) NULL
 #define armv7_read_arm_instr_uxtb16(r) NULL
 #define armv7_read_arm_instr_uxth(r) NULL
+#define armv7_read_arm_instr_wfe(r) NULL
+#define armv7_read_arm_instr_wfi(r) NULL
 #endif
diff --git a/src/arch/arm/v7/opcodes/opcodes_tmp_thumb_32.h b/src/arch/arm/v7/opcodes/opcodes_tmp_thumb_32.h
index 7510b20..1970369 100644
--- a/src/arch/arm/v7/opcodes/opcodes_tmp_thumb_32.h
+++ b/src/arch/arm/v7/opcodes/opcodes_tmp_thumb_32.h
@@ -6,6 +6,7 @@
 #define armv7_read_thumb_32_instr_b_mrs(r) NULL
 #define armv7_read_thumb_32_instr_b_msr_register(r) NULL
 #define armv7_read_thumb_32_instr_bxj(r) NULL
+#define armv7_read_thumb_32_instr_cdp_cdp2(r) NULL
 #define armv7_read_thumb_32_instr_clrex(r) NULL
 #define armv7_read_thumb_32_instr_clz(r) NULL
 #define armv7_read_thumb_32_instr_cps_thumb(r) NULL
@@ -16,17 +17,37 @@
 #define armv7_read_thumb_32_instr_eret(r) NULL
 #define armv7_read_thumb_32_instr_hvc(r) NULL
 #define armv7_read_thumb_32_instr_isb(r) NULL
+#define armv7_read_thumb_32_instr_ldc_ldc2_immediate(r) NULL
+#define armv7_read_thumb_32_instr_ldc_ldc2_literal(r) NULL
 #define armv7_read_thumb_32_instr_ldmdb_ldmea(r) NULL
 #define armv7_read_thumb_32_instr_ldm_ldmia_ldmfd_thumb(r) NULL
 #define armv7_read_thumb_32_instr_ldrb_literal(r) NULL
 #define armv7_read_thumb_32_instr_ldrbt(r) NULL
+#define armv7_read_thumb_32_instr_ldrd_immediate(r) NULL
+#define armv7_read_thumb_32_instr_ldrd_literal(r) NULL
+#define armv7_read_thumb_32_instr_ldrex(r) NULL
+#define armv7_read_thumb_32_instr_ldrexb(r) NULL
+#define armv7_read_thumb_32_instr_ldrexd(r) NULL
+#define armv7_read_thumb_32_instr_ldrexh(r) NULL
+#define armv7_read_thumb_32_instr_ldrh_immediate_thumb(r) NULL
+#define armv7_read_thumb_32_instr_ldrh_literal(r) NULL
+#define armv7_read_thumb_32_instr_ldrh_register(r) NULL
+#define armv7_read_thumb_32_instr_ldrht(r) NULL
 #define armv7_read_thumb_32_instr_ldrsb_immediate(r) NULL
 #define armv7_read_thumb_32_instr_ldrsb_literal(r) NULL
 #define armv7_read_thumb_32_instr_ldrsb_register(r) NULL
 #define armv7_read_thumb_32_instr_ldrsbt(r) NULL
+#define armv7_read_thumb_32_instr_ldrsh_immediate(r) NULL
+#define armv7_read_thumb_32_instr_ldrsh_literal(r) NULL
+#define armv7_read_thumb_32_instr_ldrsh_register(r) NULL
+#define armv7_read_thumb_32_instr_ldrsht(r) NULL
 #define armv7_read_thumb_32_instr_ldrt(r) NULL
 #define armv7_read_thumb_32_instr_lsl_register(r) NULL
 #define armv7_read_thumb_32_instr_lsr_register(r) NULL
+#define armv7_read_thumb_32_instr_mcr_mcr2(r) NULL
+#define armv7_read_thumb_32_instr_mcrr_mcrr2(r) NULL
+#define armv7_read_thumb_32_instr_mrc_mrc2(r) NULL
+#define armv7_read_thumb_32_instr_mrrc_mrrc2(r) NULL
 #define armv7_read_thumb_32_instr_mrs(r) NULL
 #define armv7_read_thumb_32_instr_mrs_banked_register(r) NULL
 #define armv7_read_thumb_32_instr_msr_banked_register(r) NULL
@@ -36,6 +57,8 @@
 #define armv7_read_thumb_32_instr_pkh(r) NULL
 #define armv7_read_thumb_32_instr_pld_immediate(r) NULL
 #define armv7_read_thumb_32_instr_pld_literal(r) NULL
+#define armv7_read_thumb_32_instr_pld_pldw_immediate(r) NULL
+#define armv7_read_thumb_32_instr_pld_pldw_register(r) NULL
 #define armv7_read_thumb_32_instr_pld_register(r) NULL
 #define armv7_read_thumb_32_instr_pli_immediate_literal(r) NULL
 #define armv7_read_thumb_32_instr_pli_register(r) NULL
@@ -48,7 +71,9 @@
 #define armv7_read_thumb_32_instr_rev16(r) NULL
 #define armv7_read_thumb_32_instr_revsh(r) NULL
 #define armv7_read_thumb_32_instr_rfe(r) NULL
+#define armv7_read_thumb_32_instr_ror_immediate(r) NULL
 #define armv7_read_thumb_32_instr_ror_register(r) NULL
+#define armv7_read_thumb_32_instr_rrx(r) NULL
 #define armv7_read_thumb_32_instr_sadd16(r) NULL
 #define armv7_read_thumb_32_instr_sadd8(r) NULL
 #define armv7_read_thumb_32_instr_sasx(r) NULL
@@ -89,9 +114,15 @@
 #define armv7_read_thumb_32_instr_ssax(r) NULL
 #define armv7_read_thumb_32_instr_ssub16(r) NULL
 #define armv7_read_thumb_32_instr_ssub8(r) NULL
+#define armv7_read_thumb_32_instr_stc_stc2(r) NULL
 #define armv7_read_thumb_32_instr_stmdb_stmfd(r) NULL
 #define armv7_read_thumb_32_instr_stm_stmia_stmea(r) NULL
 #define armv7_read_thumb_32_instr_strbt(r) NULL
+#define armv7_read_thumb_32_instr_strd_immediate(r) NULL
+#define armv7_read_thumb_32_instr_strex(r) NULL
+#define armv7_read_thumb_32_instr_strexb(r) NULL
+#define armv7_read_thumb_32_instr_strexd(r) NULL
+#define armv7_read_thumb_32_instr_strexh(r) NULL
 #define armv7_read_thumb_32_instr_strh_immediate_thumb(r) NULL
 #define armv7_read_thumb_32_instr_strh_register(r) NULL
 #define armv7_read_thumb_32_instr_strht(r) NULL
@@ -105,6 +136,7 @@
 #define armv7_read_thumb_32_instr_sxtb(r) NULL
 #define armv7_read_thumb_32_instr_sxtb16(r) NULL
 #define armv7_read_thumb_32_instr_sxth(r) NULL
+#define armv7_read_thumb_32_instr_tbb_tbh(r) NULL
 #define armv7_read_thumb_32_instr_uadd16(r) NULL
 #define armv7_read_thumb_32_instr_uadd8(r) NULL
 #define armv7_read_thumb_32_instr_uasx(r) NULL