From bb313206e5db82bb23901a8e7934e2ce6800df17 Mon Sep 17 00:00:00 2001 From: Richard Henderson Date: Sun, 12 Jan 2020 10:25:04 -0500 Subject: [PATCH] cputlb: Remove double-alignment in store_helper We have already aligned page2 to the start of the next page. There is no reason to do that a second time. Backports commit 5787585d0406cfd54dda0c71ea1a603347ce6e71 from qemu --- qemu/accel/tcg/cputlb.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/qemu/accel/tcg/cputlb.c b/qemu/accel/tcg/cputlb.c index fbd1f4a0..8b31f61d 100644 --- a/qemu/accel/tcg/cputlb.c +++ b/qemu/accel/tcg/cputlb.c @@ -1371,8 +1371,7 @@ store_helper(CPUArchState *env, target_ulong addr, uint64_t val, entry2 = tlb_entry(env, mmu_idx, page2); tlb_addr2 = tlb_addr_write(entry2); if (!tlb_hit_page(tlb_addr2, page2) - && !victim_tlb_hit(env, mmu_idx, index2, tlb_off, - page2 & TARGET_PAGE_MASK)) { + && !victim_tlb_hit(env, mmu_idx, index2, tlb_off, page2)) { tlb_fill(env_cpu(env), page2, size2, MMU_DATA_STORE, mmu_idx, retaddr); }