aboutsummaryrefslogtreecommitdiff
path: root/lib/arm/arch-dis.h
diff options
context:
space:
mode:
authorYifan Lu2016-11-23 17:24:50 -0600
committerYifan Lu2016-11-23 17:24:50 -0600
commitf1df6fbca8975ceb0eebd51519eb5f753ff75fa4 (patch)
treecc82fdacbe5c5a5dbceaf5107a5b961dffd6b188 /lib/arm/arch-dis.h
parentMerge branch 'master' of https://github.com/comex/substitute (diff)
downloadsubstitute-f1df6fbca8975ceb0eebd51519eb5f753ff75fa4.tar.gz
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
Diffstat (limited to 'lib/arm/arch-dis.h')
-rw-r--r--lib/arm/arch-dis.h2
1 files changed, 1 insertions, 1 deletions
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)