From fdad44c4ccb219454c698645d4f2cb9726826c06 Mon Sep 17 00:00:00 2001
From: comex
Date: Sun, 8 Feb 2015 22:06:56 -0500
Subject: starting x86 support

---
 lib/arm/misc.h                        | 6 +++---
 lib/arm/transform-dis-arm-multi.inc.h | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'lib/arm')

diff --git a/lib/arm/misc.h b/lib/arm/misc.h
index 02b06fe..ef11a05 100644
--- a/lib/arm/misc.h
+++ b/lib/arm/misc.h
@@ -50,10 +50,10 @@ static inline void advance_it_cond(struct arch_dis_ctx *ctx) {
 
 /* Types of conditionals for 'branch' */
 /* a regular old branch-with-condition */
-#define CC_ARMCC         (CC_CONDITIONAL | 0x200)
+#define CC_ARMCC         (CC_CONDITIONAL | 0x400)
 /* already in an IT block - in transform_dis this will be rewritten to a branch
  * anyway, so it can be treated as unconditional; in jump_dis we have to know
  * to keep going */
-#define CC_ALREADY_IN_IT (CC_CONDITIONAL | 0x400)
+#define CC_ALREADY_IN_IT (CC_CONDITIONAL | 0x800)
 /* CBZ/CBNZ is rewritten */
-#define CC_CBXZ          (CC_CONDITIONAL | 0x800)
+#define CC_CBXZ          (CC_CONDITIONAL | 0xc00)
diff --git a/lib/arm/transform-dis-arm-multi.inc.h b/lib/arm/transform-dis-arm-multi.inc.h
index e080866..6e91ff5 100644
--- a/lib/arm/transform-dis-arm-multi.inc.h
+++ b/lib/arm/transform-dis-arm-multi.inc.h
@@ -1,3 +1,4 @@
+/* TODO fix BL incl MOV LR, PC */
 #include "arm/assemble.h"
 
 static struct assemble_ctx tdctx_to_actx(const struct transform_dis_ctx *ctx) {
-- 
cgit v1.2.3