diff options
Diffstat (limited to 'lib/arm64')
| -rw-r--r-- | lib/arm64/dis-arm64.inc.h | 21 | ||||
| -rw-r--r-- | lib/arm64/transform-dis-arm64.inc.h | 9 |
2 files changed, 19 insertions, 11 deletions
diff --git a/lib/arm64/dis-arm64.inc.h b/lib/arm64/dis-arm64.inc.h index 5317b89..14a3a92 100644 --- a/lib/arm64/dis-arm64.inc.h +++ b/lib/arm64/dis-arm64.inc.h @@ -1,17 +1,22 @@ static INLINE void P(adrlabel_label_unk_Xd_1_ADR)(tdis_ctx ctx, struct bitslice Xd, struct bitslice label) { - return P(pcrel)(ctx, ctx->pc + sext(bs_get(label, ctx->op), 22), bs_get(Xd, ctx->op), PLM_ADR); + return P(pcrel)(ctx, ctx->pc + sext(bs_get(label, ctx->op), 22), + bs_get(Xd, ctx->op), PLM_ADR); } static INLINE void P(adrplabel_label_unk_Xd_1_ADRP)(tdis_ctx ctx, struct bitslice Xd, struct bitslice label) { - return P(pcrel)(ctx, ctx->pc + (sext(bs_get(label, ctx->op), 22) << 12), bs_get(Xd, ctx->op), PLM_ADR); + return P(pcrel)(ctx, ctx->pc + (sext(bs_get(label, ctx->op), 22) << 12), + bs_get(Xd, ctx->op), PLM_ADR); } static INLINE void P(am_b_target_addr_B_1_B)(tdis_ctx ctx, struct bitslice addr) { - return P(branch)(ctx, ctx->pc + sext(bs_get(addr, ctx->op), 26) * 4, /*cond*/ false); + return P(branch)(ctx, ctx->pc + sext(bs_get(addr, ctx->op), 26) * 4, + /*cond*/ false); } static INLINE void P(am_bl_target_addr_1_BL)(tdis_ctx ctx, struct bitslice addr) { - return P(branch)(ctx, ctx->pc + sext(bs_get(addr, ctx->op), 26) * 4, /*cond*/ false); + return P(branch)(ctx, ctx->pc + sext(bs_get(addr, ctx->op), 26) * 4, + /*cond*/ false); } static INLINE void P(am_brcond_target_B_5_Bcc)(tdis_ctx ctx, struct bitslice target) { - return P(branch)(ctx, ctx->pc + sext(bs_get(target, ctx->op), 19) * 4, /*cond*/ true); + return P(branch)(ctx, ctx->pc + sext(bs_get(target, ctx->op), 19) * 4, + /*cond*/ true); } static INLINE void P(am_ldrlit_label_unk_Rt_6_LDRDl)(tdis_ctx ctx, struct bitslice Rt, struct bitslice label) { enum pcrel_load_mode mode; @@ -30,10 +35,12 @@ static INLINE void P(am_ldrlit_label_unk_Rt_6_LDRDl)(tdis_ctx ctx, struct bitsli default: __builtin_abort(); } } - return P(pcrel)(ctx, ctx->pc + sext(bs_get(label, ctx->op), 19) * 4, bs_get(Rt, ctx->op), mode); + return P(pcrel)(ctx, ctx->pc + sext(bs_get(label, ctx->op), 19) * 4, + bs_get(Rt, ctx->op), mode); } static INLINE void P(am_tbrcond_target_B_4_TBNZW)(tdis_ctx ctx, struct bitslice target) { - return P(branch)(ctx, ctx->pc + sext(bs_get(target, ctx->op), 14) * 4, /*cond*/ true); + return P(branch)(ctx, ctx->pc + sext(bs_get(target, ctx->op), 14) * 4, + /*cond*/ true); } static INLINE void P(GPR64_Rn_1_RET)(tdis_ctx ctx, UNUSED struct bitslice Rn) { return P(ret)(ctx); diff --git a/lib/arm64/transform-dis-arm64.inc.h b/lib/arm64/transform-dis-arm64.inc.h index af2d4c7..97a4aca 100644 --- a/lib/arm64/transform-dis-arm64.inc.h +++ b/lib/arm64/transform-dis-arm64.inc.h @@ -1,7 +1,8 @@ #include "arm64/assemble.h" -static NOINLINE UNUSED void transform_dis_pcrel(struct transform_dis_ctx *ctx, - uintptr_t dpc, unsigned reg, enum pcrel_load_mode load_mode) { +static NOINLINE UNUSED +void transform_dis_pcrel(struct transform_dis_ctx *ctx, uintptr_t dpc, unsigned reg, + enum pcrel_load_mode load_mode) { ctx->write_newop_here = NULL; void **codep = ctx->rewritten_ptr_ptr; if (load_mode >= PLM_U32_SIMD) { @@ -16,8 +17,8 @@ static NOINLINE UNUSED void transform_dis_pcrel(struct transform_dis_ctx *ctx, } } -static NOINLINE UNUSED void transform_dis_branch(struct transform_dis_ctx *ctx, - uintptr_t dpc, int cc) { +static NOINLINE UNUSED +void transform_dis_branch(struct transform_dis_ctx *ctx, uintptr_t dpc, int cc) { #ifdef TRANSFORM_DIS_VERBOSE printf("transform_dis (%p): branch => %p\n", (void *) ctx->pc, (void *) dpc); #endif |