From eb93cee2a22cde812ccd6b9bd418d36185c058f5 Mon Sep 17 00:00:00 2001
From: comex
Date: Sun, 8 Feb 2015 23:45:24 -0500
Subject: Refactor disassembly so x86 works, and add x86 transform-dis.

This patch is a monolithic mess, because I was too lazy to do the
refactor first (that would require some stash fun, since I wasn't
actually sure before doing x86 transform-dis what would be needed).

Anyway, the resulting code should be cleaner - less duplication.

This breaks ARM/ARM64.
---
 lib/arm64/transform-dis-arm64.inc.h | 52 -------------------------------------
 1 file changed, 52 deletions(-)
 delete mode 100644 lib/arm64/transform-dis-arm64.inc.h

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

diff --git a/lib/arm64/transform-dis-arm64.inc.h b/lib/arm64/transform-dis-arm64.inc.h
deleted file mode 100644
index 792b835..0000000
--- a/lib/arm64/transform-dis-arm64.inc.h
+++ /dev/null
@@ -1,52 +0,0 @@
-#include "arm64/assemble.h"
-
-static NOINLINE UNUSED
-void transform_dis_pcrel(struct transform_dis_ctx *ctx, uintptr_t dpc, unsigned reg,
-                         enum pcrel_load_mode load_mode) {
-    ctx->write_newop_here = NULL;
-    void **codep = ctx->rewritten_ptr_ptr;
-    if (load_mode >= PLM_U32_SIMD) {
-        int reg = arm64_get_unwritten_temp_reg(&ctx->arch);
-        MOVi64(codep, 0, dpc);
-        LDRxi(codep, reg, 0, 0, true, load_mode);
-    } else {
-        MOVi64(codep, reg, dpc);
-        LDRxi(codep, reg, reg, 0, true, load_mode);
-    }
-}
-
-static NOINLINE UNUSED
-void transform_dis_branch(struct transform_dis_ctx *ctx, uintptr_t dpc, int cc) {
-    /* TODO fix BL */
-#ifdef TRANSFORM_DIS_VERBOSE
-    printf("transform_dis (%p): branch => %p\n", (void *) ctx->pc, (void *) dpc);
-#endif
-    if (dpc >= ctx->pc_patch_start && dpc < ctx->pc_patch_end) {
-        ctx->err = SUBSTITUTE_ERR_FUNC_BAD_INSN_AT_START;
-        return;
-    }
-    ctx->write_newop_here = NULL;
-    int mov_br_size = size_of_MOVi64(dpc) + 4;
-
-    void **codep = ctx->rewritten_ptr_ptr;
-    if ((cc & CC_ARMCC) == CC_ARMCC) {
-        int icc = (cc & 0xf) ^ 1;
-        Bccrel(codep, icc, 4 + mov_br_size);
-    } else if ((cc & CC_XBXZ) == CC_XBXZ) {
-        ctx->modify = true;
-        ctx->newval[0] = ctx->pc + 4 + mov_br_size;
-        ctx->newval[1] = 1; /* do invert */
-        ctx->write_newop_here = *codep; *codep += 4;
-    }
-    int reg = arm64_get_unwritten_temp_reg(&ctx->arch);
-    MOVi64(codep, reg, dpc);
-    BR(codep, reg);
-}
-
-static void transform_dis_pre_dis(UNUSED struct transform_dis_ctx *ctx) {}
-static void transform_dis_post_dis(struct transform_dis_ctx *ctx) {
-    uint32_t op = ctx->op;
-    ctx->arch.regs_possibly_written |= op & 31;
-    ctx->arch.regs_possibly_written |= op >> 10 & 31;
-    ctx->arch.regs_possibly_written |= op >> 16 & 31;
-}
-- 
cgit v1.2.3