[v2,07/30] target-sparc: simplify replace_tlb_entry by using TTE_PGSIZE

Commit Message

Artyom Tarasenko Jan. 11, 2017, 8:19 p.m. UTC

Signed-off-by: Artyom Tarasenko <[e-mail]>
Reviewed-by: Richard Henderson <[e-mail]>
---
 target/sparc/ldst_helper.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

Patch

diff --git a/target/sparc/ldst_helper.c b/target/sparc/ldst_helper.c
index 043cbf8..68eca86 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;