diff options
| author | Richard Henderson | 2017-07-28 20:24:17 +0200 |
|---|---|---|
| committer | Richard Henderson | 2017-08-03 19:56:44 +0200 |
| commit | ca671de8af96798e0f493378240034620a3a04ee (patch) | |
| tree | 6c3a4b63bccc9dc8c49c925df13c908401ec28fa | |
| parent | Update version for v2.10.0-rc1 release (diff) | |
| download | qemu-ca671de8af96798e0f493378240034620a3a04ee.tar.gz qemu-ca671de8af96798e0f493378240034620a3a04ee.tar.xz qemu-ca671de8af96798e0f493378240034620a3a04ee.zip | |
tcg/arm: Fix runtime overalignment test
Patch 85aa80813dd changed the IF emitting the TST instruction,
but failed to change the ?: converting CMP to CMPEQ, so the
result of the TST is ignored.
Signed-off-by: Richard Henderson <rth@twiddle.net>
| -rw-r--r-- | tcg/arm/tcg-target.inc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tcg/arm/tcg-target.inc.c b/tcg/arm/tcg-target.inc.c index d1793ec77d..37efcf06af 100644 --- a/tcg/arm/tcg-target.inc.c +++ b/tcg/arm/tcg-target.inc.c @@ -1223,7 +1223,7 @@ static TCGReg tcg_out_tlb_read(TCGContext *s, TCGReg addrlo, TCGReg addrhi, /* Load the tlb addend. */ tcg_out_ld32_12(s, COND_AL, TCG_REG_R2, TCG_REG_R2, add_off); - tcg_out_dat_reg(s, (s_bits ? COND_EQ : COND_AL), ARITH_CMP, 0, + tcg_out_dat_reg(s, (a_bits ? COND_EQ : COND_AL), ARITH_CMP, 0, TCG_REG_R0, TCG_REG_TMP, SHIFT_IMM_LSL(TARGET_PAGE_BITS)); if (TARGET_LONG_BITS == 64) { |