diff options
| author | comex | 2015-02-18 02:57:08 -0500 |
|---|---|---|
| committer | comex | 2015-02-18 02:57:08 -0500 |
| commit | ce8cffd7cba9925779163fa4380f98b2f70f5a7b (patch) | |
| tree | d5229e823757b8e836a28fd00ffd7bb1c67e4d7d /lib/x86 | |
| parent | er, don't unnecessarily spam thread start/resume. (diff) | |
| download | substitute-ce8cffd7cba9925779163fa4380f98b2f70f5a7b.tar.gz | |
various fixes
Diffstat (limited to 'lib/x86')
| -rw-r--r-- | lib/x86/arch-dis.h | 4 | ||||
| -rw-r--r-- | lib/x86/jump-patch.h | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/lib/x86/arch-dis.h b/lib/x86/arch-dis.h index a76884f..c52561a 100644 --- a/lib/x86/arch-dis.h +++ b/lib/x86/arch-dis.h @@ -6,6 +6,7 @@ * See transform_dis_* for size figures. Technically unsafe, since we don't * check for overlong x86 instructions. */ #define TD_MAX_REWRITTEN_SIZE 55 +#define ARCH_MAX_CODE_ALIGNMENT 1 struct arch_pcrel_info { int reg; @@ -14,6 +15,3 @@ struct arch_pcrel_info { struct arch_dis_ctx {}; static inline void arch_dis_ctx_init(UNUSED struct arch_dis_ctx *ctx) {} -static inline int arch_code_alignment(UNUSED struct arch_dis_ctx ctx) { - return 4; -} diff --git a/lib/x86/jump-patch.h b/lib/x86/jump-patch.h index ca7b16c..569eb74 100644 --- a/lib/x86/jump-patch.h +++ b/lib/x86/jump-patch.h @@ -5,7 +5,7 @@ static inline int jump_patch_size(uint_tptr pc, uint_tptr dpc, UNUSED struct arch_dis_ctx arch, bool force) { - uint_tptr diff = pc - (dpc + 5); + uint_tptr diff = dpc - (pc + 5); /* fits in 32? */ if (diff == (uint_tptr) (int32_t) diff) return 5; |