Add submodule dependency filesHEADmaster

Change-Id: Iaf8d18082d3991dec7c0ebbea540f092188eb4ec

2 files changed, 483 insertions, 0 deletions

diff --git a/capstone/contrib/m68k_instruction_tbl_gen/M68KInstructionTblGen.c b/capstone/contrib/m68k_instruction_tbl_gen/M68KInstructionTblGen.c
new file mode 100644
index 000000000..54de4955e
--- /dev/null
+++ b/capstone/contrib/m68k_instruction_tbl_gen/M68KInstructionTblGen.c
@@ -0,0 +1,468 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdint.h>
+
+/* This code is used to build the static lookup table used inside the M68KDisassembler.c code
+ * To run this use the Makefile in the same directory
+ */
+
+typedef struct {
+	const char *name;    /* handler function name */
+	uint16_t mask;       /* mask on opcode */
+	uint16_t match;      /* what to match after masking */
+	uint16_t ea_mask;    /* what ea modes are allowed */
+	uint16_t mask2;      /* mask the 2nd word */
+	uint16_t match2;     /* what to match after masking */
+} opcode_struct;
+
+/* ======================================================================== */
+/* ======================= INSTRUCTION TABLE BUILDER ====================== */
+/* ======================================================================== */
+
+/* EA Masks:
+   800 = data register direct
+   400 = address register direct
+   200 = address register indirect
+   100 = ARI postincrement
+   80 = ARI pre-decrement
+   40 = ARI displacement
+   20 = ARI index
+   10 = absolute short
+   8 = absolute long
+   4 = immediate / sr
+   2 = pc displacement
+   1 = pc idx
+ */
+
+static opcode_struct g_opcode_info[] = {
+	/*  opcode handler         mask    match   ea_mask   mask2   match2*/
+	{"d68000_1010"         , 0xf000, 0xa000, 0x000},
+	{"d68000_1111"         , 0xf000, 0xf000, 0x000},
+	{"d68000_abcd_rr"      , 0xf1f8, 0xc100, 0x000},
+	{"d68000_abcd_mm"      , 0xf1f8, 0xc108, 0x000},
+	{"d68000_add_er_8"     , 0xf1c0, 0xd000, 0xbff},
+	{"d68000_add_er_16"    , 0xf1c0, 0xd040, 0xfff},
+	{"d68000_add_er_32"    , 0xf1c0, 0xd080, 0xfff},
+	{"d68000_add_re_8"     , 0xf1c0, 0xd100, 0x3f8},
+	{"d68000_add_re_16"    , 0xf1c0, 0xd140, 0x3f8},
+	{"d68000_add_re_32"    , 0xf1c0, 0xd180, 0x3f8},
+	{"d68000_adda_16"      , 0xf1c0, 0xd0c0, 0xfff},
+	{"d68000_adda_32"      , 0xf1c0, 0xd1c0, 0xfff},
+	{"d68000_addi_8"       , 0xffc0, 0x0600, 0xbf8},
+	{"d68000_addi_16"      , 0xffc0, 0x0640, 0xbf8},
+	{"d68000_addi_32"      , 0xffc0, 0x0680, 0xbf8},
+	{"d68000_addq_8"       , 0xf1c0, 0x5000, 0xbf8},
+	{"d68000_addq_16"      , 0xf1c0, 0x5040, 0xff8},
+	{"d68000_addq_32"      , 0xf1c0, 0x5080, 0xff8},
+	{"d68000_addx_rr_8"    , 0xf1f8, 0xd100, 0x000},
+	{"d68000_addx_rr_16"   , 0xf1f8, 0xd140, 0x000},
+	{"d68000_addx_rr_32"   , 0xf1f8, 0xd180, 0x000},
+	{"d68000_addx_mm_8"    , 0xf1f8, 0xd108, 0x000},
+	{"d68000_addx_mm_16"   , 0xf1f8, 0xd148, 0x000},
+	{"d68000_addx_mm_32"   , 0xf1f8, 0xd188, 0x000},
+	{"d68000_and_er_8"     , 0xf1c0, 0xc000, 0xbff},
+	{"d68000_and_er_16"    , 0xf1c0, 0xc040, 0xbff},
+	{"d68000_and_er_32"    , 0xf1c0, 0xc080, 0xbff},
+	{"d68000_and_re_8"     , 0xf1c0, 0xc100, 0x3f8},
+	{"d68000_and_re_16"    , 0xf1c0, 0xc140, 0x3f8},
+	{"d68000_and_re_32"    , 0xf1c0, 0xc180, 0x3f8},
+	{"d68000_andi_to_ccr"  , 0xffff, 0x023c, 0x000, 0xff00, 0x0000},
+	{"d68000_andi_to_sr"   , 0xffff, 0x027c, 0x000},
+	{"d68000_andi_8"       , 0xffc0, 0x0200, 0xbf8},
+	{"d68000_andi_16"      , 0xffc0, 0x0240, 0xbf8},
+	{"d68000_andi_32"      , 0xffc0, 0x0280, 0xbf8},
+	{"d68000_asr_s_8"      , 0xf1f8, 0xe000, 0x000},
+	{"d68000_asr_s_16"     , 0xf1f8, 0xe040, 0x000},
+	{"d68000_asr_s_32"     , 0xf1f8, 0xe080, 0x000},
+	{"d68000_asr_r_8"      , 0xf1f8, 0xe020, 0x000},
+	{"d68000_asr_r_16"     , 0xf1f8, 0xe060, 0x000},
+	{"d68000_asr_r_32"     , 0xf1f8, 0xe0a0, 0x000},
+	{"d68000_asr_ea"       , 0xffc0, 0xe0c0, 0x3f8},
+	{"d68000_asl_s_8"      , 0xf1f8, 0xe100, 0x000},
+	{"d68000_asl_s_16"     , 0xf1f8, 0xe140, 0x000},
+	{"d68000_asl_s_32"     , 0xf1f8, 0xe180, 0x000},
+	{"d68000_asl_r_8"      , 0xf1f8, 0xe120, 0x000},
+	{"d68000_asl_r_16"     , 0xf1f8, 0xe160, 0x000},
+	{"d68000_asl_r_32"     , 0xf1f8, 0xe1a0, 0x000},
+	{"d68000_asl_ea"       , 0xffc0, 0xe1c0, 0x3f8},
+	{"d68000_bcc_8"        , 0xf000, 0x6000, 0x000},
+	{"d68000_bcc_16"       , 0xf0ff, 0x6000, 0x000},
+	{"d68020_bcc_32"       , 0xf0ff, 0x60ff, 0x000},
+	{"d68000_bchg_r"       , 0xf1c0, 0x0140, 0xbf8},
+	{"d68000_bchg_s"       , 0xffc0, 0x0840, 0xbf8, 0xff00, 0x0000},
+	{"d68000_bclr_r"       , 0xf1c0, 0x0180, 0xbf8},
+	{"d68000_bclr_s"       , 0xffc0, 0x0880, 0xbf8, 0xff00, 0x0000},
+	{"d68020_bfchg"        , 0xffc0, 0xeac0, 0xa78, 0xf000, 0x0000},
+	{"d68020_bfclr"        , 0xffc0, 0xecc0, 0xa78, 0xf000, 0x0000},
+	{"d68020_bfexts"       , 0xffc0, 0xebc0, 0xa7b, 0x8000, 0x0000},
+	{"d68020_bfextu"       , 0xffc0, 0xe9c0, 0xa7b, 0x8000, 0x0000},
+	{"d68020_bfffo"        , 0xffc0, 0xedc0, 0xa7b, 0x8000, 0x0000},
+	{"d68020_bfins"        , 0xffc0, 0xefc0, 0xa78, 0x8000, 0x0000},
+	{"d68020_bfset"        , 0xffc0, 0xeec0, 0xa78, 0xf000, 0x0000},
+	{"d68020_bftst"        , 0xffc0, 0xe8c0, 0xa7b, 0xf000, 0x0000},
+	{"d68010_bkpt"         , 0xfff8, 0x4848, 0x000},
+	{"d68000_bra_8"        , 0xff00, 0x6000, 0x000},
+	{"d68000_bra_16"       , 0xffff, 0x6000, 0x000},
+	{"d68020_bra_32"       , 0xffff, 0x60ff, 0x000},
+	{"d68000_bset_r"       , 0xf1c0, 0x01c0, 0xbf8},
+	{"d68000_bset_s"       , 0xffc0, 0x08c0, 0xbf8, 0xfe00, 0x0000 },
+	{"d68000_bsr_8"        , 0xff00, 0x6100, 0x000},
+	{"d68000_bsr_16"       , 0xffff, 0x6100, 0x000},
+	{"d68020_bsr_32"       , 0xffff, 0x61ff, 0x000},
+	{"d68000_btst_r"       , 0xf1c0, 0x0100, 0xbff},
+	{"d68000_btst_s"       , 0xffc0, 0x0800, 0xbfb, 0xff00, 0x0000},
+	{"d68020_callm"        , 0xffc0, 0x06c0, 0x27b, 0xff00, 0x0000},
+	{"d68020_cas_8"        , 0xffc0, 0x0ac0, 0x3f8, 0xfe38, 0x0000},
+	{"d68020_cas_16"       , 0xffc0, 0x0cc0, 0x3f8, 0xfe38, 0x0000},
+	{"d68020_cas_32"       , 0xffc0, 0x0ec0, 0x3f8, 0xfe38, 0x0000},
+	{"d68020_cas2_16"      , 0xffff, 0x0cfc, 0x000, 0x0e38, 0x0000/*, 0x0e38, 0x0000 */},
+	{"d68020_cas2_32"      , 0xffff, 0x0efc, 0x000, 0x0e38, 0x0000/*, 0x0e38, 0x0000 */},
+	{"d68000_chk_16"       , 0xf1c0, 0x4180, 0xbff},
+	{"d68020_chk_32"       , 0xf1c0, 0x4100, 0xbff},
+	{"d68020_chk2_cmp2_8"  , 0xffc0, 0x00c0, 0x27b, 0x07ff, 0x0000},
+	{"d68020_chk2_cmp2_16" , 0xffc0, 0x02c0, 0x27b, 0x07ff, 0x0000},
+	{"d68020_chk2_cmp2_32" , 0xffc0, 0x04c0, 0x27b, 0x07ff, 0x0000},
+	{"d68040_cinv"         , 0xff20, 0xf400, 0x000},
+	{"d68000_clr_8"        , 0xffc0, 0x4200, 0xbf8},
+	{"d68000_clr_16"       , 0xffc0, 0x4240, 0xbf8},
+	{"d68000_clr_32"       , 0xffc0, 0x4280, 0xbf8},
+	{"d68000_cmp_8"        , 0xf1c0, 0xb000, 0xbff},
+	{"d68000_cmp_16"       , 0xf1c0, 0xb040, 0xfff},
+	{"d68000_cmp_32"       , 0xf1c0, 0xb080, 0xfff},
+	{"d68000_cmpa_16"      , 0xf1c0, 0xb0c0, 0xfff},
+	{"d68000_cmpa_32"      , 0xf1c0, 0xb1c0, 0xfff},
+	{"d68000_cmpi_8"       , 0xffc0, 0x0c00, 0xbf8},
+	{"d68020_cmpi_pcdi_8"  , 0xffff, 0x0c3a, 0x000},
+	{"d68020_cmpi_pcix_8"  , 0xffff, 0x0c3b, 0x000},
+	{"d68000_cmpi_16"      , 0xffc0, 0x0c40, 0xbf8},
+	{"d68020_cmpi_pcdi_16" , 0xffff, 0x0c7a, 0x000},
+	{"d68020_cmpi_pcix_16" , 0xffff, 0x0c7b, 0x000},
+	{"d68000_cmpi_32"      , 0xffc0, 0x0c80, 0xbf8},
+	{"d68020_cmpi_pcdi_32" , 0xffff, 0x0cba, 0x000},
+	{"d68020_cmpi_pcix_32" , 0xffff, 0x0cbb, 0x000},
+	{"d68000_cmpm_8"       , 0xf1f8, 0xb108, 0x000},
+	{"d68000_cmpm_16"      , 0xf1f8, 0xb148, 0x000},
+	{"d68000_cmpm_32"      , 0xf1f8, 0xb188, 0x000},
+	{"d68020_cpbcc_16"     , 0xf1c0, 0xf080, 0x000},
+	{"d68020_cpbcc_32"     , 0xf1c0, 0xf0c0, 0x000},
+	{"d68020_cpdbcc"       , 0xf1f8, 0xf048, 0x000},
+	{"d68020_cpgen"        , 0xf1c0, 0xf000, 0x000},
+	{"d68020_cprestore"    , 0xf1c0, 0xf140, 0x37f},
+	{"d68020_cpsave"       , 0xf1c0, 0xf100, 0x2f8},
+	{"d68020_cpscc"        , 0xf1c0, 0xf040, 0xbf8},
+	{"d68020_cptrapcc_0"   , 0xf1ff, 0xf07c, 0x000},
+	{"d68020_cptrapcc_16"  , 0xf1ff, 0xf07a, 0x000},
+	{"d68020_cptrapcc_32"  , 0xf1ff, 0xf07b, 0x000},
+	{"d68040_cpush"        , 0xff20, 0xf420, 0x000},
+	{"d68000_dbcc"         , 0xf0f8, 0x50c8, 0x000},
+	{"d68000_dbra"         , 0xfff8, 0x51c8, 0x000},
+	{"d68000_divs"         , 0xf1c0, 0x81c0, 0xbff},
+	{"d68000_divu"         , 0xf1c0, 0x80c0, 0xbff},
+	{"d68020_divl"         , 0xff80, 0x4c00, 0xbff, 0x83f8, 0x0000},
+	{"d68000_eor_8"        , 0xf1c0, 0xb100, 0xbf8},
+	{"d68000_eor_16"       , 0xf1c0, 0xb140, 0xbf8},
+	{"d68000_eor_32"       , 0xf1c0, 0xb180, 0xbf8},
+	{"d68000_eori_to_ccr"  , 0xffff, 0x0a3c, 0x000, 0xff00, 0x0000},
+	{"d68000_eori_to_sr"   , 0xffff, 0x0a7c, 0x000},
+	{"d68000_eori_8"       , 0xffc0, 0x0a00, 0xbf8},
+	{"d68000_eori_16"      , 0xffc0, 0x0a40, 0xbf8},
+	{"d68000_eori_32"      , 0xffc0, 0x0a80, 0xbf8},
+	{"d68000_exg_dd"       , 0xf1f8, 0xc140, 0x000},
+	{"d68000_exg_aa"       , 0xf1f8, 0xc148, 0x000},
+	{"d68000_exg_da"       , 0xf1f8, 0xc188, 0x000},
+	{"d68020_extb_32"      , 0xfff8, 0x49c0, 0x000},
+	{"d68000_ext_16"       , 0xfff8, 0x4880, 0x000},
+	{"d68000_ext_32"       , 0xfff8, 0x48c0, 0x000},
+	{"d68000_illegal"      , 0xffff, 0x4afc, 0x000},
+	{"d68000_jmp"          , 0xffc0, 0x4ec0, 0x27b},
+	{"d68000_jsr"          , 0xffc0, 0x4e80, 0x27b},
+	{"d68000_lea"          , 0xf1c0, 0x41c0, 0x27b},
+	{"d68000_link_16"      , 0xfff8, 0x4e50, 0x000},
+	{"d68020_link_32"      , 0xfff8, 0x4808, 0x000},
+	{"d68000_lsr_s_8"      , 0xf1f8, 0xe008, 0x000},
+	{"d68000_lsr_s_16"     , 0xf1f8, 0xe048, 0x000},
+	{"d68000_lsr_s_32"     , 0xf1f8, 0xe088, 0x000},
+	{"d68000_lsr_r_8"      , 0xf1f8, 0xe028, 0x000},
+	{"d68000_lsr_r_16"     , 0xf1f8, 0xe068, 0x000},
+	{"d68000_lsr_r_32"     , 0xf1f8, 0xe0a8, 0x000},
+	{"d68000_lsr_ea"       , 0xffc0, 0xe2c0, 0x3f8},
+	{"d68000_lsl_s_8"      , 0xf1f8, 0xe108, 0x000},
+	{"d68000_lsl_s_16"     , 0xf1f8, 0xe148, 0x000},
+	{"d68000_lsl_s_32"     , 0xf1f8, 0xe188, 0x000},
+	{"d68000_lsl_r_8"      , 0xf1f8, 0xe128, 0x000},
+	{"d68000_lsl_r_16"     , 0xf1f8, 0xe168, 0x000},
+	{"d68000_lsl_r_32"     , 0xf1f8, 0xe1a8, 0x000},
+	{"d68000_lsl_ea"       , 0xffc0, 0xe3c0, 0x3f8},
+	{"d68000_move_8"       , 0xf000, 0x1000, 0xbff},
+	{"d68000_move_16"      , 0xf000, 0x3000, 0xfff},
+	{"d68000_move_32"      , 0xf000, 0x2000, 0xfff},
+	{"d68000_movea_16"     , 0xf1c0, 0x3040, 0xfff},
+	{"d68000_movea_32"     , 0xf1c0, 0x2040, 0xfff},
+	{"d68000_move_to_ccr"  , 0xffc0, 0x44c0, 0xbff},
+	{"d68010_move_fr_ccr"  , 0xffc0, 0x42c0, 0xbf8},
+	{"d68000_move_to_sr"   , 0xffc0, 0x46c0, 0xbff},
+	{"d68000_move_fr_sr"   , 0xffc0, 0x40c0, 0xbf8},
+	{"d68000_move_to_usp"  , 0xfff8, 0x4e60, 0x000},
+	{"d68000_move_fr_usp"  , 0xfff8, 0x4e68, 0x000},
+	{"d68010_movec"        , 0xfffe, 0x4e7a, 0x000},
+	{"d68000_movem_pd_16"  , 0xfff8, 0x48a0, 0x000},
+	{"d68000_movem_pd_32"  , 0xfff8, 0x48e0, 0x000},
+	{"d68000_movem_re_16"  , 0xffc0, 0x4880, 0x2f8},
+	{"d68000_movem_re_32"  , 0xffc0, 0x48c0, 0x2f8},
+	{"d68000_movem_er_16"  , 0xffc0, 0x4c80, 0x37b},
+	{"d68000_movem_er_32"  , 0xffc0, 0x4cc0, 0x37b},
+	{"d68000_movep_er_16"  , 0xf1f8, 0x0108, 0x000},
+	{"d68000_movep_er_32"  , 0xf1f8, 0x0148, 0x000},
+	{"d68000_movep_re_16"  , 0xf1f8, 0x0188, 0x000},
+	{"d68000_movep_re_32"  , 0xf1f8, 0x01c8, 0x000},
+	{"d68010_moves_8"      , 0xffc0, 0x0e00, 0x3f8, 0x07ff, 0x0000},
+	{"d68010_moves_16"     , 0xffc0, 0x0e40, 0x3f8, 0x07ff, 0x0000},
+	{"d68010_moves_32"     , 0xffc0, 0x0e80, 0x3f8, 0x07ff, 0x0000},
+	{"d68000_moveq"        , 0xf100, 0x7000, 0x000},
+	{"d68040_move16_pi_pi" , 0xfff8, 0xf620, 0x000, 0x8fff, 0x8000},
+	{"d68040_move16_pi_al" , 0xfff8, 0xf600, 0x000},
+	{"d68040_move16_al_pi" , 0xfff8, 0xf608, 0x000},
+	{"d68040_move16_ai_al" , 0xfff8, 0xf610, 0x000},
+	{"d68040_move16_al_ai" , 0xfff8, 0xf618, 0x000},
+	{"d68000_muls"         , 0xf1c0, 0xc1c0, 0xbff},
+	{"d68000_mulu"         , 0xf1c0, 0xc0c0, 0xbff},
+	{"d68020_mull"         , 0xffc0, 0x4c00, 0xbff, 0x83f8, 0x0000},
+	{"d68000_nbcd"         , 0xffc0, 0x4800, 0xbf8},
+	{"d68000_neg_8"        , 0xffc0, 0x4400, 0xbf8},
+	{"d68000_neg_16"       , 0xffc0, 0x4440, 0xbf8},
+	{"d68000_neg_32"       , 0xffc0, 0x4480, 0xbf8},
+	{"d68000_negx_8"       , 0xffc0, 0x4000, 0xbf8},
+	{"d68000_negx_16"      , 0xffc0, 0x4040, 0xbf8},
+	{"d68000_negx_32"      , 0xffc0, 0x4080, 0xbf8},
+	{"d68000_nop"          , 0xffff, 0x4e71, 0x000},
+	{"d68000_not_8"        , 0xffc0, 0x4600, 0xbf8},
+	{"d68000_not_16"       , 0xffc0, 0x4640, 0xbf8},
+	{"d68000_not_32"       , 0xffc0, 0x4680, 0xbf8},
+	{"d68000_or_er_8"      , 0xf1c0, 0x8000, 0xbff},
+	{"d68000_or_er_16"     , 0xf1c0, 0x8040, 0xbff},
+	{"d68000_or_er_32"     , 0xf1c0, 0x8080, 0xbff},
+	{"d68000_or_re_8"      , 0xf1c0, 0x8100, 0x3f8},
+	{"d68000_or_re_16"     , 0xf1c0, 0x8140, 0x3f8},
+	{"d68000_or_re_32"     , 0xf1c0, 0x8180, 0x3f8},
+	{"d68000_ori_to_ccr"   , 0xffff, 0x003c, 0x000, 0xff00, 0x0000},
+	{"d68000_ori_to_sr"    , 0xffff, 0x007c, 0x000},
+	{"d68000_ori_8"        , 0xffc0, 0x0000, 0xbf8},
+	{"d68000_ori_16"       , 0xffc0, 0x0040, 0xbf8},
+	{"d68000_ori_32"       , 0xffc0, 0x0080, 0xbf8},
+	{"d68020_pack_rr"      , 0xf1f8, 0x8140, 0x000},
+	{"d68020_pack_mm"      , 0xf1f8, 0x8148, 0x000},
+	{"d68000_pea"          , 0xffc0, 0x4840, 0x27b},
+	{"d68000_reset"        , 0xffff, 0x4e70, 0x000},
+	{"d68000_ror_s_8"      , 0xf1f8, 0xe018, 0x000},
+	{"d68000_ror_s_16"     , 0xf1f8, 0xe058, 0x000},
+	{"d68000_ror_s_32"     , 0xf1f8, 0xe098, 0x000},
+	{"d68000_ror_r_8"      , 0xf1f8, 0xe038, 0x000},
+	{"d68000_ror_r_16"     , 0xf1f8, 0xe078, 0x000},
+	{"d68000_ror_r_32"     , 0xf1f8, 0xe0b8, 0x000},
+	{"d68000_ror_ea"       , 0xffc0, 0xe6c0, 0x3f8},
+	{"d68000_rol_s_8"      , 0xf1f8, 0xe118, 0x000},
+	{"d68000_rol_s_16"     , 0xf1f8, 0xe158, 0x000},
+	{"d68000_rol_s_32"     , 0xf1f8, 0xe198, 0x000},
+	{"d68000_rol_r_8"      , 0xf1f8, 0xe138, 0x000},
+	{"d68000_rol_r_16"     , 0xf1f8, 0xe178, 0x000},
+	{"d68000_rol_r_32"     , 0xf1f8, 0xe1b8, 0x000},
+	{"d68000_rol_ea"       , 0xffc0, 0xe7c0, 0x3f8},
+	{"d68000_roxr_s_8"     , 0xf1f8, 0xe010, 0x000},
+	{"d68000_roxr_s_16"    , 0xf1f8, 0xe050, 0x000},
+	{"d68000_roxr_s_32"    , 0xf1f8, 0xe090, 0x000},
+	{"d68000_roxr_r_8"     , 0xf1f8, 0xe030, 0x000},
+	{"d68000_roxr_r_16"    , 0xf1f8, 0xe070, 0x000},
+	{"d68000_roxr_r_32"    , 0xf1f8, 0xe0b0, 0x000},
+	{"d68000_roxr_ea"      , 0xffc0, 0xe4c0, 0x3f8},
+	{"d68000_roxl_s_8"     , 0xf1f8, 0xe110, 0x000},
+	{"d68000_roxl_s_16"    , 0xf1f8, 0xe150, 0x000},
+	{"d68000_roxl_s_32"    , 0xf1f8, 0xe190, 0x000},
+	{"d68000_roxl_r_8"     , 0xf1f8, 0xe130, 0x000},
+	{"d68000_roxl_r_16"    , 0xf1f8, 0xe170, 0x000},
+	{"d68000_roxl_r_32"    , 0xf1f8, 0xe1b0, 0x000},
+	{"d68000_roxl_ea"      , 0xffc0, 0xe5c0, 0x3f8},
+	{"d68010_rtd"          , 0xffff, 0x4e74, 0x000},
+	{"d68000_rte"          , 0xffff, 0x4e73, 0x000},
+	{"d68020_rtm"          , 0xfff0, 0x06c0, 0x000},
+	{"d68000_rtr"          , 0xffff, 0x4e77, 0x000},
+	{"d68000_rts"          , 0xffff, 0x4e75, 0x000},
+	{"d68000_sbcd_rr"      , 0xf1f8, 0x8100, 0x000},
+	{"d68000_sbcd_mm"      , 0xf1f8, 0x8108, 0x000},
+	{"d68000_scc"          , 0xf0c0, 0x50c0, 0xbf8},
+	{"d68000_stop"         , 0xffff, 0x4e72, 0x000},
+	{"d68000_sub_er_8"     , 0xf1c0, 0x9000, 0xbff},
+	{"d68000_sub_er_16"    , 0xf1c0, 0x9040, 0xfff},
+	{"d68000_sub_er_32"    , 0xf1c0, 0x9080, 0xfff},
+	{"d68000_sub_re_8"     , 0xf1c0, 0x9100, 0x3f8},
+	{"d68000_sub_re_16"    , 0xf1c0, 0x9140, 0x3f8},
+	{"d68000_sub_re_32"    , 0xf1c0, 0x9180, 0x3f8},
+	{"d68000_suba_16"      , 0xf1c0, 0x90c0, 0xfff},
+	{"d68000_suba_32"      , 0xf1c0, 0x91c0, 0xfff},
+	{"d68000_subi_8"       , 0xffc0, 0x0400, 0xbf8},
+	{"d68000_subi_16"      , 0xffc0, 0x0440, 0xbf8},
+	{"d68000_subi_32"      , 0xffc0, 0x0480, 0xbf8},
+	{"d68000_subq_8"       , 0xf1c0, 0x5100, 0xbf8},
+	{"d68000_subq_16"      , 0xf1c0, 0x5140, 0xff8},
+	{"d68000_subq_32"      , 0xf1c0, 0x5180, 0xff8},
+	{"d68000_subx_rr_8"    , 0xf1f8, 0x9100, 0x000},
+	{"d68000_subx_rr_16"   , 0xf1f8, 0x9140, 0x000},
+	{"d68000_subx_rr_32"   , 0xf1f8, 0x9180, 0x000},
+	{"d68000_subx_mm_8"    , 0xf1f8, 0x9108, 0x000},
+	{"d68000_subx_mm_16"   , 0xf1f8, 0x9148, 0x000},
+	{"d68000_subx_mm_32"   , 0xf1f8, 0x9188, 0x000},
+	{"d68000_swap"         , 0xfff8, 0x4840, 0x000},
+	{"d68000_tas"          , 0xffc0, 0x4ac0, 0xbf8},
+	{"d68000_trap"         , 0xfff0, 0x4e40, 0x000},
+	{"d68020_trapcc_0"     , 0xf0ff, 0x50fc, 0x000},
+	{"d68020_trapcc_16"    , 0xf0ff, 0x50fa, 0x000},
+	{"d68020_trapcc_32"    , 0xf0ff, 0x50fb, 0x000},
+	{"d68000_trapv"        , 0xffff, 0x4e76, 0x000},
+	{"d68000_tst_8"        , 0xffc0, 0x4a00, 0xbf8},
+	{"d68020_tst_pcdi_8"   , 0xffff, 0x4a3a, 0x000},
+	{"d68020_tst_pcix_8"   , 0xffff, 0x4a3b, 0x000},
+	{"d68020_tst_i_8"      , 0xffff, 0x4a3c, 0x000},
+	{"d68000_tst_16"       , 0xffc0, 0x4a40, 0xbf8},
+	{"d68020_tst_a_16"     , 0xfff8, 0x4a48, 0x000},
+	{"d68020_tst_pcdi_16"  , 0xffff, 0x4a7a, 0x000},
+	{"d68020_tst_pcix_16"  , 0xffff, 0x4a7b, 0x000},
+	{"d68020_tst_i_16"     , 0xffff, 0x4a7c, 0x000},
+	{"d68000_tst_32"       , 0xffc0, 0x4a80, 0xbf8},
+	{"d68020_tst_a_32"     , 0xfff8, 0x4a88, 0x000},
+	{"d68020_tst_pcdi_32"  , 0xffff, 0x4aba, 0x000},
+	{"d68020_tst_pcix_32"  , 0xffff, 0x4abb, 0x000},
+	{"d68020_tst_i_32"     , 0xffff, 0x4abc, 0x000},
+	{"d68000_unlk"         , 0xfff8, 0x4e58, 0x000},
+	{"d68020_unpk_rr"      , 0xf1f8, 0x8180, 0x000},
+	{"d68020_unpk_mm"      , 0xf1f8, 0x8188, 0x000},
+	{0, 0, 0, 0}
+};
+
+/* Check if opcode is using a valid ea mode */
+static int valid_ea(unsigned int opcode, unsigned int mask)
+{
+	if (mask == 0)
+		return 1;
+
+	switch(opcode & 0x3f) {
+		case 0x00: case 0x01: case 0x02: case 0x03:
+		case 0x04: case 0x05: case 0x06: case 0x07:
+			return (mask & 0x800) != 0;
+		case 0x08: case 0x09: case 0x0a: case 0x0b:
+		case 0x0c: case 0x0d: case 0x0e: case 0x0f:
+			return (mask & 0x400) != 0;
+		case 0x10: case 0x11: case 0x12: case 0x13:
+		case 0x14: case 0x15: case 0x16: case 0x17:
+			return (mask & 0x200) != 0;
+		case 0x18: case 0x19: case 0x1a: case 0x1b:
+		case 0x1c: case 0x1d: case 0x1e: case 0x1f:
+			return (mask & 0x100) != 0;
+		case 0x20: case 0x21: case 0x22: case 0x23:
+		case 0x24: case 0x25: case 0x26: case 0x27:
+			return (mask & 0x080) != 0;
+		case 0x28: case 0x29: case 0x2a: case 0x2b:
+		case 0x2c: case 0x2d: case 0x2e: case 0x2f:
+			return (mask & 0x040) != 0;
+		case 0x30: case 0x31: case 0x32: case 0x33:
+		case 0x34: case 0x35: case 0x36: case 0x37:
+			return (mask & 0x020) != 0;
+		case 0x38:
+			return (mask & 0x010) != 0;
+		case 0x39:
+			return (mask & 0x008) != 0;
+		case 0x3a:
+			return (mask & 0x002) != 0;
+		case 0x3b:
+			return (mask & 0x001) != 0;
+		case 0x3c:
+			return (mask & 0x004) != 0;
+	}
+	return 0;
+
+}
+
+#ifndef DECL_SPEC
+#ifdef _MSC_VER
+#define DECL_SPEC __cdecl
+#else
+#define DECL_SPEC
+#endif	// _MSC_VER
+#endif	// DECL_SPEC
+
+/* Used by qsort */
+static int DECL_SPEC compare_nof_true_bits(const void *aptr, const void *bptr)
+{
+	unsigned int a = ((const opcode_struct*)aptr)->mask;
+	unsigned int b = ((const opcode_struct*)bptr)->mask;
+
+	a = ((a & 0xAAAA) >> 1) + (a & 0x5555);
+	a = ((a & 0xCCCC) >> 2) + (a & 0x3333);
+	a = ((a & 0xF0F0) >> 4) + (a & 0x0F0F);
+	a = ((a & 0xFF00) >> 8) + (a & 0x00FF);
+
+	b = ((b & 0xAAAA) >> 1) + (b & 0x5555);
+	b = ((b & 0xCCCC) >> 2) + (b & 0x3333);
+	b = ((b & 0xF0F0) >> 4) + (b & 0x0F0F);
+	b = ((b & 0xFF00) >> 8) + (b & 0x00FF);
+
+	return b - a; /* reversed to get greatest to least sorting */
+}
+
+/* build the opcode handler jump table */
+static void build_opcode_table(void)
+{
+	unsigned int i;
+	unsigned int opcode;
+	opcode_struct* ostruct;
+	unsigned int opcode_info_length = 0;
+	const unsigned int total_count = 0x10000;
+
+	for(ostruct = g_opcode_info;ostruct->name != 0;ostruct++)
+		opcode_info_length++;
+
+	qsort((void *)g_opcode_info, opcode_info_length, sizeof(g_opcode_info[0]), compare_nof_true_bits);
+
+	printf("/* This table is auto-generated. DO NOT MANUALLY EDIT! Look in M68KInstructionTblGen.c for more info */\n");
+	printf("static const instruction_struct g_instruction_table[] = {\n");
+
+	for(i=0;i<0x10000;i++) {
+		const char *name = "d68000_invalid";
+		uint16_t word2_mask = 0;
+		uint16_t word2_match = 0;
+		opcode = i;
+		/* search through opcode info for a match */
+		for(ostruct = g_opcode_info;ostruct->name != 0;ostruct++) {
+			/* match opcode mask and allowed ea modes */
+			if ((opcode & ostruct->mask) == ostruct->match) {
+				/* Handle destination ea for move instructions */
+				if ((!strcmp(ostruct->name, "d68000_move_8") ||
+					 !strcmp(ostruct->name, "d68000_move_16") ||
+				 	 !strcmp(ostruct->name, "d68000_move_32")) &&
+						!valid_ea(((opcode>>9)&7) | ((opcode>>3)&0x38), 0xbf8))
+					continue;
+				if (valid_ea(opcode, ostruct->ea_mask)) {
+					name = ostruct->name;
+					word2_mask = ostruct->mask2;
+					word2_match = ostruct->match2;
+					break;
+				}
+			}
+		}
+
+		// Handle so the last entry won't have a , at the end
+		if (i != total_count - 1) {
+			printf("\t{ %s, 0x%x, 0x%x },\n", name, word2_mask, word2_match);
+		} else {
+			printf("\t{ %s, 0x%x, 0x%x }\n", name, word2_mask, word2_match);
+		}
+	}
+
+	printf("};\n\n");
+}
+
+int main() {
+	build_opcode_table();
+	return 0;
+}
+
+
diff --git a/capstone/contrib/m68k_instruction_tbl_gen/Makefile b/capstone/contrib/m68k_instruction_tbl_gen/Makefile
new file mode 100644
index 000000000..c01dbe470
--- /dev/null
+++ b/capstone/contrib/m68k_instruction_tbl_gen/Makefile
@@ -0,0 +1,15 @@
+CC=gcc
+ODIR=obj
+TBL_GEN=tbl_gen
+INC_FILE=../../arch/M68K/M68KInstructionTable.inc
+
+gen_inc: $(TBL_GEN)
+	./$(TBL_GEN) > $(INC_FILE)
+
+tbl_gen: M68KInstructionTblGen.c
+	$(CC) -O3 M68KInstructionTblGen.c -o $(TBL_GEN)
+
+.PHONY: clean
+
+clean:
+	rm $(TBL_GEN)