]> xenbits.xensource.com Git - qemu-upstream-4.5-testing.git/commitdiff
tcg-arm: Fix 64-bit tlb load for pre-v6
authorRichard Henderson <rth@twiddle.net>
Mon, 29 Apr 2013 15:08:22 +0000 (08:08 -0700)
committerAurelien Jarno <aurelien@aurel32.net>
Fri, 3 May 2013 09:53:29 +0000 (11:53 +0200)
Found by inspection, since the effect of the bug was simply to
send all memory ops through the slow path.

Signed-off-by: Richard Henderson <rth@twiddle.net>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
tcg/arm/tcg-target.c

index 7216f7a63d2ae8cd117597df5a34a83605a995d2..12edad4875b5e80ad0e932050da23eae167d3b53 100644 (file)
@@ -1190,7 +1190,7 @@ static void tcg_out_tlb_read(TCGContext *s, TCGReg addrlo, TCGReg addrhi,
         tcg_out_memop_12(s, COND_AL, INSN_LDR_IMM, TCG_REG_R0,
                          TCG_REG_R2, tlb_offset, 1, 1);
         if (TARGET_LONG_BITS == 64) {
-            tcg_out_memop_12(s, COND_AL, INSN_LDR_IMM, TCG_REG_R0,
+            tcg_out_memop_12(s, COND_AL, INSN_LDR_IMM, TCG_REG_R1,
                              TCG_REG_R2, 4, 1, 0);
         }
     }