From 066a1fa86407c80c3b7ef2c3e8c86f1ffbd2929d Mon Sep 17 00:00:00 2001
From: comex
Date: Mon, 19 Jan 2015 19:08:48 -0500
Subject: some reorganization

---
 lib/dis-thumb.inc.h | 79 -----------------------------------------------------
 1 file changed, 79 deletions(-)
 delete mode 100644 lib/dis-thumb.inc.h

(limited to 'lib/dis-thumb.inc.h')

diff --git a/lib/dis-thumb.inc.h b/lib/dis-thumb.inc.h
deleted file mode 100644
index 4e6d106..0000000
--- a/lib/dis-thumb.inc.h
+++ /dev/null
@@ -1,79 +0,0 @@
-#include "dis.h"
-static INLINE void P(GPR_Rm_unk_Rdn_1_tADDhirr)(tdis_ctx ctx, struct bitslice Rdn, struct bitslice Rm) {
-    data(rout(Rdn), r(Rm), r(Rdn)); /* yes, twice */
-}
-static INLINE void P(unk_Rdn_1_tADDrSP)(tdis_ctx ctx, UNUSED struct bitslice Rdn) {
-    /* this doesn't support constants, and nobody's going to add pc, sp, so... */
-    return P(unidentified)(ctx);
-}
-static INLINE void P(GPR_Rm_1_tADDspr)(tdis_ctx ctx, UNUSED struct bitslice Rm) {
-    /* ditto */
-    return P(unidentified)(ctx);
-}
-static INLINE void P(GPR_Rm_B_1_tBX)(tdis_ctx ctx, struct bitslice Rm) {
-    unsigned val = bs_get(Rm, ctx->op);
-    if (val == 15) /* bx pc */
-        return P(bad)(ctx);
-    else if (val == 14) /* bx lr */
-        return P(ret)(ctx);
-    return P(unidentified)(ctx);
-}
-static INLINE void P(GPR_Rm_unk_Rd_1_tMOVr)(tdis_ctx ctx, struct bitslice Rd, struct bitslice Rm) {
-    unsigned Rd_val = bs_get(Rd, ctx->op);
-    unsigned Rm_val = bs_get(Rm, ctx->op);
-    /* does anyone do this? */
-    if (Rd_val == 15)
-        return P(bad)(ctx);
-    if (Rm_val == 15)
-        return P(pcrel)(ctx, ctx->pc + 4, Rd_val, PLM_ADR);
-    return P(unidentified)(ctx);
-}
-static INLINE void P(tGPR_Rn_reglist_regs_1_tLDMIA)(tdis_ctx ctx, UNUSED struct bitslice regs, UNUSED struct bitslice Rn) {
-    return P(unidentified)(ctx);
-}
-static INLINE void P(tGPR_Rn_reglist_regs_S_1_tSTMIA_UPD)(tdis_ctx ctx, UNUSED struct bitslice regs, UNUSED struct bitslice Rn) {
-    return P(unidentified)(ctx);
-}
-static INLINE void P(reglist_regs_1_tPOP)(tdis_ctx ctx, struct bitslice regs) {
-    unsigned regs_val = bs_get(regs, ctx->op);
-    if(regs_val & (1 << 15))
-        return P(ret)(ctx);
-    return P(unidentified)(ctx);
-}
-static INLINE void P(reglist_regs_S_1_tPUSH)(tdis_ctx ctx, UNUSED struct bitslice regs) {
-    return P(unidentified)(ctx);
-}
-static INLINE void P(t_addrmode_pc_addr_unk_Rt_1_tLDRpci)(tdis_ctx ctx, struct bitslice addr, struct bitslice Rt) {
-    return P(pcrel)(ctx, ((ctx->pc + 4) & ~2) + bs_get(addr, ctx->op), bs_get(Rt, ctx->op), PLM_U32);
-}
-static INLINE void P(t_adrlabel_addr_unk_Rd_1_tADR)(tdis_ctx ctx, struct bitslice addr, struct bitslice Rd) {
-    return P(pcrel)(ctx, ((ctx->pc + 4) & ~2) + bs_get(addr, ctx->op), bs_get(Rd, ctx->op), PLM_ADR);
-}
-static INLINE void P(t_bcctarget_target_B_1_tBcc)(tdis_ctx ctx, struct bitslice target) {
-    return P(branch)(ctx, ctx->pc + 4 + 2 * sext(bs_get(target, ctx->op), 8), /*cond*/ true);
-}
-static INLINE void P(t_brtarget_target_B_1_tB)(tdis_ctx ctx, struct bitslice target) {
-    bool cond = ctx->arch.thumb_it_length > 0;
-    return P(branch)(ctx, ctx->pc + 4 + 2 * sext(bs_get(target, ctx->op), 11), cond);
-}
-static INLINE void P(t_cbtarget_target_B_2_tCBNZ)(tdis_ctx ctx, struct bitslice target) {
-    return P(branch)(ctx, ctx->pc + 4 + 2 * bs_get(target, ctx->op), /*cond*/ true);
-}
-static INLINE void P(it_pred_cc_it_mask_mask_1_t2IT)(tdis_ctx ctx, struct bitslice mask, UNUSED struct bitslice cc) {
-    /* why */
-    unsigned mask_val = bs_get(mask, ctx->op);
-    unsigned length = __builtin_ctz(mask_val);
-    if (length >= 3)
-        return P(unidentified)(ctx); /* nop */
-    ctx->arch.thumb_it_length = length;
-    return P(unidentified)(ctx);
-}
-
-static INLINE void P(dis_thumb)(tdis_ctx ctx) {
-    uint16_t op = ctx->op = *(uint16_t *) ctx->ptr;
-    ctx->op_size = 2;
-    if (ctx->arch.thumb_it_length)
-        ctx->arch.thumb_it_length--;
-    #include "../generated/generic-dis-thumb.inc.h"
-    __builtin_abort();
-}
-- 
cgit v1.2.3