*sigh*

3 files changed, 126 insertions, 36 deletions

diff --git a/lib/dis-arm.inc b/lib/dis-arm.inc
deleted file mode 100644
index 37581a3..0000000
--- a/lib/dis-arm.inc
+++ /dev/null
@@ -1,36 +0,0 @@
-static inline tdis_ret P(addr_offset_none_addr_33_STC2L_OPTION)(tdis_ctx ctx, struct bitslice addr) {}
-static inline tdis_ret P(GPR_Rn_GPR_Rm_1_ADDrr)(tdis_ctx ctx, struct bitslice Rm, struct bitslice Rn) {
-
-    return P(regs)(ctx, Rm, 0, 4, Rn, 0, 4);
-}
-static inline tdis_ret P(GPR_Rn_3_ADDri)(tdis_ctx ctx, struct bitslice Rn) {
-    return P(regs)(ctx, Rn, 0, 4, Rn, 0, 0);
-}
-static inline tdis_ret P(addrmode3_addr_2_STRD)(tdis_ctx ctx, struct bitslice addr) {
-    return P(regs)(ctx, addr, 9, 4, addr, 0, 4);
-}
-static inline tdis_ret P(addrmode3_pre_addr_2_STRD_PRE)(tdis_ctx ctx, struct bitslice addr) {
-    return P(regs)(ctx, addr, 9, 4, addr, 0, 4);
-}
-static inline tdis_ret P(addrmode_imm12_addr_2_STRBi12)(tdis_ctx ctx, struct bitslice addr) {
-    return P(regs)(ctx, addr, 13, 4, addr, 0, 0);
-}
-static inline tdis_ret P(addrmode_imm12_pre_addr_2_STRB_PRE_IMM)(tdis_ctx ctx, struct bitslice addr) {
-    return P(regs)(ctx, addr, 13, 4, addr, 0, 0);
-}
-static inline tdis_ret P(addrmode5_addr_8_STC2L_OFFSET)(tdis_ctx ctx, struct bitslice addr) {
-    return P(regs)(ctx, addr, 9, 4, addr, 0, 0);
-}
-static inline tdis_ret P(addrmode5_pre_addr_4_STC2L_PRE)(tdis_ctx ctx, struct bitslice addr) {
-    return P(regs)(ctx, addr, 9, 4, addr, 0, 0);
-}
-static inline tdis_ret P(adrlabel_label_1_ADR)(tdis_ctx ctx, struct bitslice label) {
-    return P(adr)(ctx, ctx->pc + 8 + bs_get(label, ctx->op));
-}
-static inline tdis_ret P(br_target_target_1_Bcc)(tdis_ctx ctx, struct bitslice target) {
-    return P(branch)(ctx, ctx->pc + 8 + sext(bs_get(target, ctx->op), 24));
-}
-static inline tdis_ret P(ldst_so_reg_addr_2_STRB_PRE_REG)(tdis_ctx ctx, struct bitslice addr) {
-    return P(regs)(ctx, addr, 13, 4, addr, 0, 4);
-}
-
diff --git a/lib/dis-arm.inc.h b/lib/dis-arm.inc.h
new file mode 100644
index 0000000..d03025d
--- /dev/null
+++ b/lib/dis-arm.inc.h
@@ -0,0 +1,98 @@
+
+static inline tdis_ret P(GPR_Rt_addr_offset_none_addr_S_21_STL)(tdis_ctx ctx, struct bitslice Rt, struct bitslice addr) {
+}
+static inline tdis_ret P(GPR_Rn_GPR_Rm_1_ADDrr)(tdis_ctx ctx, struct bitslice Rm, struct bitslice Rn) {
+}
+static inline tdis_ret P(GPR_Rn_3_ADDri)(tdis_ctx ctx, struct bitslice Rn) {
+}
+static inline tdis_ret P(addr_offset_none_addr_unk_Rt_2_SWP)(tdis_ctx ctx, struct bitslice Rt, struct bitslice addr) {
+}
+static inline tdis_ret P(GPRPairOp_Rt_addr_offset_none_addr_2_STLEXD)(tdis_ctx ctx, struct bitslice Rt, struct bitslice addr) {
+    return P(reg)(ctx, addr, 0, 4);
+}
+static inline tdis_ret P(GPR_Rt_addrmode3_addr_S_2_STRD)(tdis_ctx ctx, struct bitslice addr, struct bitslice Rt) {
+    return P(regs3)(ctx, addr, 9, 4, addr, 0, 4, Rt, 0, 4);
+}
+static inline tdis_ret P(GPR_Rt_addrmode3_pre_addr_S_2_STRD_PRE)(tdis_ctx ctx, struct bitslice addr, struct bitslice Rt) {
+    return P(regs3)(ctx, addr, 9, 4, addr, 0, 4, Rt, 0, 4);
+}
+static inline tdis_ret P(adrlabel_label_1_ADR)(tdis_ctx ctx, struct bitslice label) {
+    return P(adr)(ctx, ctx->pc + 8 + bs_get(label, ctx->op));
+}
+static inline tdis_ret P(br_target_target_B_1_Bcc)(tdis_ctx ctx, struct bitslice target) {
+    return P(branch)(ctx, ctx->pc + 8 + sext(bs_get(target, ctx->op), 24));
+}
+static inline tdis_ret P(GPR_Rt_S_1_STRrs)(tdis_ctx ctx, struct bitslice Rt) {
+}
+static inline tdis_ret P(GPRnopc_Rt_S_1_STRBrs)(tdis_ctx ctx, struct bitslice Rt) {
+}
+static inline tdis_ret P(unk_Rt_11_VMOVRRD)(tdis_ctx ctx, struct bitslice Rt) {}
+static inline tdis_ret P(addr_offset_none_addr_8_STC2L_OPTION)(tdis_ctx ctx, struct bitslice addr) {}
+static inline tdis_ret P(GPR_Rt_addrmode_imm12_addr_1_STRi12)(tdis_ctx ctx, struct bitslice addr, struct bitslice Rt) {}
+static inline tdis_ret P(addrmode5_addr_S_8_STC2L_OFFSET)(tdis_ctx ctx, struct bitslice addr) {
+    return P(reg)(ctx, addr, 9, 4);
+}
+static inline tdis_ret P(addrmode5_pre_addr_S_4_STC2L_PRE)(tdis_ctx ctx, struct bitslice addr) {
+    return P(reg)(ctx, addr, 9, 4);
+}
+static inline tdis_ret P(GPRnopc_Rt_addrmode_imm12_addr_1_STRBi12)(tdis_ctx ctx, struct bitslice addr, struct bitslice Rt) {
+    return P(reg)(ctx, addr, 13, 4);
+}
+static inline tdis_ret P(GPR_Rt_addrmode_imm12_pre_addr_2_STRB_PRE_IMM)(tdis_ctx ctx, struct bitslice addr, struct bitslice Rt) {
+    return P(reg)(ctx, addr, 13, 4);
+}
+static inline tdis_ret P(GPR_Rt_ldst_so_reg_addr_2_STRB_PRE_REG)(tdis_ctx ctx, struct bitslice addr, struct bitslice Rt) {
+    return P(regs2)(ctx, addr, 13, 4, addr, 0, 4);
+}
+
+
+static inline tdis_ret P(so_reg_imm_shift_14_ADCrsi)(tdis_ctx ctx, struct bitslice shift) {}
+static inline tdis_ret P(so_reg_reg_shift_14_ADCrsr)(tdis_ctx ctx, struct bitslice shift) {}
+static inline tdis_ret P(addr_offset_none_addr_unk_Rt_31_LDA)(tdis_ctx ctx, struct bitslice Rt, struct bitslice addr) {
+    /* hope nobody's SWPping into PC */
+    return P(reg)(ctx, addr, 0, 4);
+}
+static inline tdis_ret P(GPR_Rt_addr_offset_none_addr_S_21_STL)(tdis_ctx ctx, struct bitslice Rt, struct bitslice addr) {
+    return P(regs)(ctx, addr, 0, 4, addr, 0, 0, &Rt);
+}
+static inline tdis_ret P(adrlabel_label_1_ADR)(tdis_ctx ctx, struct bitslice label) {}
+static inline tdis_ret P(br_target_target_B_1_Bcc)(tdis_ctx ctx, struct bitslice target) {}
+static inline tdis_ret P(GPR_Rt_4_MCR)(tdis_ctx ctx, struct bitslice Rt) {}
+static inline tdis_ret P(GPRnopc_Rt_4_MCRR)(tdis_ctx ctx, struct bitslice Rt) {}
+static inline tdis_ret P(unk_Rt_13_MRC)(tdis_ctx ctx, struct bitslice Rt) {}
+static inline tdis_ret P(addr_offset_none_addr_S_8_STC2L_OPTION)(tdis_ctx ctx, struct bitslice addr) {}
+static inline tdis_ret P(addr_offset_none_addr_8_LDC2L_OPTION)(tdis_ctx ctx, struct bitslice addr) {}
+static inline tdis_ret P(GPR_Rn_GPR_Rm_1_ADDrr)(tdis_ctx ctx, struct bitslice Rm, struct bitslice Rn) {
+    return P(regs2)(ctx, Rm, 0, 4, Rn, 0, 4);
+}
+static inline tdis_ret P(GPR_Rn_so_reg_imm_shift_1_ADDrsi)(tdis_ctx ctx, struct bitslice shift, struct bitslice Rn) {}
+static inline tdis_ret P(GPR_Rn_so_reg_reg_shift_1_ADDrsr)(tdis_ctx ctx, struct bitslice shift, struct bitslice Rn) {}
+static inline tdis_ret P(GPR_Rn_1_ADDri)(tdis_ctx ctx, struct bitslice Rn) {
+    return P(reg)(ctx, Rn, 0, 4);
+}
+static inline tdis_ret P(addrmode3_addr_unk_Rt_4_LDRD)(tdis_ctx ctx, struct bitslice addr, struct bitslice Rt) {}
+static inline tdis_ret P(GPR_Rt_addrmode3_addr_S_2_STRD)(tdis_ctx ctx, struct bitslice addr, struct bitslice Rt) {}
+static inline tdis_ret P(GPR_Rt_addrmode_imm12_addr_S_1_STRi12)(tdis_ctx ctx, struct bitslice addr, struct bitslice Rt) {}
+static inline tdis_ret P(GPR_Rt_ldst_so_reg_shift_S_1_STRrs)(tdis_ctx ctx, struct bitslice shift, struct bitslice Rt) {}
+static inline tdis_ret P(addrmode5_addr_8_LDC2L_OFFSET)(tdis_ctx ctx, struct bitslice addr) {}
+static inline tdis_ret P(addrmode3_pre_addr_unk_Rt_4_LDRD_PRE)(tdis_ctx ctx, struct bitslice addr, struct bitslice Rt) {}
+static inline tdis_ret P(GPR_Rt_addrmode3_pre_addr_S_2_STRD_PRE)(tdis_ctx ctx, struct bitslice addr, struct bitslice Rt) {}
+static inline tdis_ret P(GPRnopc_Rt_addrmode_imm12_addr_S_1_STRBi12)(tdis_ctx ctx, struct bitslice addr, struct bitslice Rt) {}
+static inline tdis_ret P(GPRnopc_Rt_ldst_so_reg_shift_S_1_STRBrs)(tdis_ctx ctx, struct bitslice shift, struct bitslice Rt) {}
+static inline tdis_ret P(addrmode5_addr_S_4_STC2L_OFFSET)(tdis_ctx ctx, struct bitslice addr) {}
+static inline tdis_ret P(addrmode_imm12_addr_unk_Rt_2_LDRBi12)(tdis_ctx ctx, struct bitslice addr, struct bitslice Rt) {}
+static inline tdis_ret P(ldst_so_reg_shift_unk_Rt_2_LDRBrs)(tdis_ctx ctx, struct bitslice shift, struct bitslice Rt) {}
+static inline tdis_ret P(GPR_Rt_addrmode_imm12_pre_addr_S_2_STRB_PRE_IMM)(tdis_ctx ctx, struct bitslice addr, struct bitslice Rt) {}
+static inline tdis_ret P(addrmode5_pre_addr_S_4_STC2L_PRE)(tdis_ctx ctx, struct bitslice addr) {}
+static inline tdis_ret P(GPR_Rt_ldst_so_reg_addr_S_2_STRB_PRE_REG)(tdis_ctx ctx, struct bitslice addr, struct bitslice Rt) {}
+static inline tdis_ret P(addrmode_imm12_pre_addr_unk_Rt_2_LDRB_PRE_IMM)(tdis_ctx ctx, struct bitslice addr, struct bitslice Rt) {}
+static inline tdis_ret P(ldst_so_reg_addr_unk_Rt_2_LDRB_PRE_REG)(tdis_ctx ctx, struct bitslice addr, struct bitslice Rt) {}
+static inline tdis_ret P(addrmode5_pre_addr_4_LDC2L_PRE)(tdis_ctx ctx, struct bitslice addr) {}
+static inline tdis_ret P(GPR_Rm_1_MOVr)(tdis_ctx ctx, struct bitslice Rm) {}
+static inline tdis_ret P(tcGPR_Rm_1_MOVr_TC)(tdis_ctx ctx, struct bitslice Rm) {}
+static inline tdis_ret P(GPRPairOp_Rt_addr_offset_none_addr_S_2_STLEXD)(tdis_ctx ctx, struct bitslice Rt, struct bitslice addr) {}
+
+static inline tdis_ret P(dis_arm)(tdis_ctx ctx) {
+    unsigned op = ctx->op;
+    #include "../generated/transform-dis-arm.inc"
+}
diff --git a/lib/dis-thumb.inc.h b/lib/dis-thumb.inc.h
new file mode 100644
index 0000000..dd38147
--- /dev/null
+++ b/lib/dis-thumb.inc.h
@@ -0,0 +1,28 @@
+static inline tdis_ret transform_dis_thumb_GPR_Rm_3_tADDhirr(tdis_ctx ctx, struct bitslice Rm) {
+    return P(regs)(ctx, Rm, 0, 3, Rm, 0, 0);
+}
+static inline tdis_ret transform_dis_thumb_GPR_Rm_B_1_tBX(tdis_ctx ctx, struct bitslice Rm) {
+    if(bs_get(Rm, ctx->op) == 15) // bx pc?
+        return P(bad)(ctx);
+    return P(unidentified)(ctx);
+}
+static inline tdis_ret transform_dis_thumb_t_addrmode_pc_addr_unk_Rt_1_tLDRpci(tdis_ctx ctx, struct bitslice addr, struct bitslice Rt) {
+    return P(adr)(ctx, ((ctx->pc + 4) & ~2) + bs_get(addr, ctx->op));
+}
+static inline tdis_ret transform_dis_thumb_t_adrlabel_addr_1_tADR(tdis_ctx ctx, struct bitslice addr) {
+    return P(adr)(ctx, ((ctx->pc + 4) & ~2) + bs_get(addr, ctx->op));
+}
+static inline tdis_ret transform_dis_thumb_t_brtarget_target_B_1_tB(tdis_ctx ctx, struct bitslice target) {
+    return P(branch)(ctx->pc + 2 + sext(bs_get(target, ctx->op), 11);
+}
+static inline tdis_ret transform_dis_thumb_t_bcctarget_target_B_1_tBcc(tdis_ctx ctx, struct bitslice target) {
+    return P(branch)(ctx->pc + 2 + sext(bs_get(target, ctx->op), 8);
+}
+static inline tdis_ret transform_dis_thumb_t_cbtarget_target_B_2_tCBNZ(tdis_ctx ctx, struct bitslice target) {
+    return P(branch)(ctx->pc + 2 + bs_get(target, ctx->op);
+}
+
+static inline tdis_ret P(dis_thumb)(tdis_ctx ctx) {
+    unsigned op = ctx->op;
+    #include "../generated/transform-dis-thumb.inc"
+}