diff options
| author | comex | 2015-02-03 02:57:46 -0500 |
|---|---|---|
| committer | comex | 2015-02-03 02:57:46 -0500 |
| commit | ef3f404f209c716bd2dc8ff5c0b559d25a2c5a92 (patch) | |
| tree | da331fb2b301d9752180e6ceb7a378c7234f21e1 /lib/arm/dis-thumb.inc.h | |
| parent | fix ARM64 too, theoretically (diff) | |
| download | substitute-ef3f404f209c716bd2dc8ff5c0b559d25a2c5a92.tar.gz | |
Make the ARM branches actually go to the right place. I need automated tests before stable.
Diffstat (limited to '')
| -rw-r--r-- | lib/arm/dis-thumb.inc.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/arm/dis-thumb.inc.h b/lib/arm/dis-thumb.inc.h index 8be137e..72865cf 100644 --- a/lib/arm/dis-thumb.inc.h +++ b/lib/arm/dis-thumb.inc.h @@ -61,7 +61,8 @@ static INLINE void P(t_cbtarget_target_B_2_tCBNZ)(tdis_ctx ctx, struct bitslice P(branch)(ctx, ctx->pc + 4 + 2 * bs_get(target, ctx->op), CC_CBXZ); if (TDIS_CTX_MODIFY(ctx)) { /* change target, and flip z/nz if necessary (i.e. always) */ - unsigned new = bs_set(target, TDIS_CTX_NEWVAL(ctx, 0), ctx->op); + int new_target = (TDIS_CTX_NEWVAL(ctx, 0) - (ctx->pc + 4)) / 2; + unsigned new = bs_set(target, new_target, ctx->op); if (TDIS_CTX_NEWVAL(ctx, 1)) new ^= 1 << 11; TDIS_CTX_SET_NEWOP(ctx, new); |