diff options
Diffstat (limited to 'lib/arm64/transform-dis-arm64.inc.h')
| -rw-r--r-- | lib/arm64/transform-dis-arm64.inc.h | 29 |
1 files changed, 23 insertions, 6 deletions
diff --git a/lib/arm64/transform-dis-arm64.inc.h b/lib/arm64/transform-dis-arm64.inc.h index 97a4aca..a98932d 100644 --- a/lib/arm64/transform-dis-arm64.inc.h +++ b/lib/arm64/transform-dis-arm64.inc.h @@ -6,11 +6,9 @@ void transform_dis_pcrel(struct transform_dis_ctx *ctx, uintptr_t dpc, unsigned ctx->write_newop_here = NULL; void **codep = ctx->rewritten_ptr_ptr; if (load_mode >= PLM_U32_SIMD) { - /* use x0 as scratch */ - op32(codep, 0xf81f0fe0); /* str x0, [sp, #-0x10]! */ + int reg = arm64_get_unwritten_temp_reg(&ctx->arch); MOVi64(codep, 0, dpc); LDRxi(codep, reg, 0, 0, true, load_mode); - op32(codep, 0xf84107e0); /* ldr x0, [sp], #0x10 */ } else { MOVi64(codep, reg, dpc); LDRxi(codep, reg, reg, 0, true, load_mode); @@ -26,9 +24,28 @@ void transform_dis_branch(struct transform_dis_ctx *ctx, uintptr_t dpc, int cc) ctx->err = SUBSTITUTE_ERR_FUNC_BAD_INSN_AT_START; return; } - /* TODO */ - (void) cc; + ctx->write_newop_here = NULL; + int mov_br_size = size_of_MOVi64(dpc) + 4; + + void **codep = ctx->rewritten_ptr_ptr; + if ((cc & CC_ARMCC) == CC_ARMCC) { + int icc = (cc & 0xf) ^ 1; + Bccrel(codep, icc, 4 + mov_br_size); + } else if ((cc & CC_XBXZ) == CC_XBXZ) { + ctx->modify = true; + ctx->newval[0] = ctx->pc + 4 + mov_br_size; + ctx->newval[1] = 1; /* do invert */ + ctx->write_newop_here = *codep; *codep += 4; + } + int reg = arm64_get_unwritten_temp_reg(&ctx->arch); + MOVi64(codep, reg, dpc); + BR(codep, reg); } static void transform_dis_pre_dis(UNUSED struct transform_dis_ctx *ctx) {} -static void transform_dis_post_dis(UNUSED struct transform_dis_ctx *ctx) {} +static void transform_dis_post_dis(struct transform_dis_ctx *ctx) { + uint32_t op = ctx->op; + ctx->arch.regs_possibly_written |= op & 31; + ctx->arch.regs_possibly_written |= op >> 10 & 31; + ctx->arch.regs_possibly_written |= op >> 16 & 31; +} |