[Qemu-devel] [PULL 07/30] target-sparc: simplify replace_tlb_entry by using TTE_PGSIZE

[Artyom Tarasenko]

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

diff --git a/target/sparc/ldst_helper.c b/target/sparc/ldst_helper.c
index 20e202b..7a134b3 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 = 0xe000ULL;
-mask <<= 3 * ((tlb->tte >> 61) & 3);
-size = ~mask + 1;
+size = 8192ULL << 3 * TTE_PGSIZE(tlb->tte);
+mask = 1ULL + ~size;
 
 va = tlb->tag & mask;
 
-- 
2.7.2

[Qemu-devel] [PULL 07/30] target-sparc: simplify replace_tlb_entry by using TTE_PGSIZE

[Richard Henderson]

From: Artyom Tarasenko 

Signed-off-by: Artyom Tarasenko 
Reviewed-by: Richard Henderson 
Message-Id: 
<65e7ea6ea1cd0ebf291b1ed76d5cb1cccff2d49e.1484165352.git.atar4q...@gmail.com>
Signed-off-by: Richard Henderson 
---
 target/sparc/ldst_helper.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

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 = 0xe000ULL;
-mask <<= 3 * ((tlb->tte >> 61) & 3);
-size = ~mask + 1;
+size = 8192ULL << 3 * TTE_PGSIZE(tlb->tte);
+mask = 1ULL + ~size;
 
 va = tlb->tag & mask;
 
-- 
2.9.3