diff options
author | Yifan Lu | 2016-11-23 17:24:50 -0600 |
---|---|---|
committer | Yifan Lu | 2016-11-23 17:24:50 -0600 |
commit | f1df6fbca8975ceb0eebd51519eb5f753ff75fa4 (patch) | |
tree | cc82fdacbe5c5a5dbceaf5107a5b961dffd6b188 /lib/arm/jump-patch.h | |
parent | Merge branch 'master' of https://github.com/comex/substitute (diff) | |
download | substitute-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/jump-patch.h')
-rw-r--r-- | lib/arm/jump-patch.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/arm/jump-patch.h b/lib/arm/jump-patch.h index 8ba4c3a..361e357 100644 --- a/lib/arm/jump-patch.h +++ b/lib/arm/jump-patch.h @@ -14,6 +14,6 @@ static inline int jump_patch_size(uint_tptr pc, static inline void make_jump_patch(void **codep, uint_tptr pc, uint_tptr dpc, struct arch_dis_ctx arch) { - struct assemble_ctx actx = {codep, pc, arch.pc_low_bit, 0xe}; + struct assemble_ctx actx = {codep, *codep, pc, arch.pc_low_bit, 0xe}; LDR_PC(actx, dpc); } |