From f1df6fbca8975ceb0eebd51519eb5f753ff75fa4 Mon Sep 17 00:00:00 2001
From: Yifan Lu
Date: Wed, 23 Nov 2016 17:24:50 -0600
Subject: Fixed defination of CC_CBXZ collides with other bits Fixed incorrect
 pc value in tdctx_to_actx Fixed ARM32 handling of CC_CBXZ (uses incorrect
 field in ctx->base) Fixed ARM32 transform_dis_branch incorrectly trashing LR
 for non-call based jumps Fixed ARM32 make_jump_patch not updated to use new
 assemble_ctx Added new option SUBSTITUTE_RELAXED to relax the disassembly
 engine Currently SUBSTITUTE_RELAXED only disables TRANSFORM_DIS_REL_JUMPS so
 jumps at the beginning of functions are allowed

---
 lib/arm/arch-dis.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/arm/arch-dis.h')

diff --git a/lib/arm/arch-dis.h b/lib/arm/arch-dis.h
index 1c63b12..157acfb 100644
--- a/lib/arm/arch-dis.h
+++ b/lib/arm/arch-dis.h
@@ -62,4 +62,4 @@ static inline void advance_it_cond(struct arch_dis_ctx *ctx) {
  * to keep going */
 #define CC_ALREADY_IN_IT (CC_CONDITIONAL | 0x800)
 /* CBZ/CBNZ is rewritten */
-#define CC_CBXZ          (CC_CONDITIONAL | 0xc00)
+#define CC_CBXZ          (CC_CONDITIONAL | 0x1000)
-- 
cgit v1.2.3