From: Artyom Tarasenko <atar4qemu@gmail.com>
Date: Wed, 2 Mar 2016 13:01:20 +0000 (+0100)
Subject: target-sparc: simplify replace_tlb_entry by using TTE_PGSIZE
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=e4d06ca74b751e486ca2a57f586fd4b858a13085;p=qemu.git

target-sparc: simplify replace_tlb_entry by using TTE_PGSIZE

Signed-off-by: Artyom Tarasenko <atar4qemu@gmail.com>
Reviewed-by: Richard Henderson <rth@twiddle.net>
---

diff --git a/target/sparc/ldst_helper.c b/target/sparc/ldst_helper.c
index 20e202b5c8..7a134b3c0d 100644
--- a/target/sparc/ldst_helper.c
+++ b/target/sparc/ldst_helper.c
@@ -127,9 +127,8 @@ static void replace_tlb_entry(SparcTLBEntry *tlb,
     if (TTE_IS_VALID(tlb->tte)) {
         CPUState *cs = CPU(sparc_env_get_cpu(env1));
 
-        mask = 0xffffffffffffe000ULL;
-        mask <<= 3 * ((tlb->tte >> 61) & 3);
-        size = ~mask + 1;
+        size = 8192ULL << 3 * TTE_PGSIZE(tlb->tte);
+        mask = 1ULL + ~size;
 
         va = tlb->tag & mask;