[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH] target/riscv/pmp: simplify NAPOT address range computation
From: |
Nicolas Pitre |
Subject: |
[PATCH] target/riscv/pmp: simplify NAPOT address range computation |
Date: |
Thu, 7 Apr 2022 16:16:19 -0400 (EDT) |
No need for ctz64() nor special case for -1.
Signed-off-by: Nicolas Pitre <nico@fluxnic.net>
diff --git a/target/riscv/pmp.c b/target/riscv/pmp.c
index 81b61bb65c..151da3fa08 100644
--- a/target/riscv/pmp.c
+++ b/target/riscv/pmp.c
@@ -141,17 +141,9 @@ static void pmp_decode_napot(target_ulong a, target_ulong
*sa, target_ulong *ea)
0111...1111 2^(XLEN+2)-byte NAPOT range
1111...1111 Reserved
*/
- if (a == -1) {
- *sa = 0u;
- *ea = -1;
- return;
- } else {
- target_ulong t1 = ctz64(~a);
- target_ulong base = (a & ~(((target_ulong)1 << t1) - 1)) << 2;
- target_ulong range = ((target_ulong)1 << (t1 + 3)) - 1;
- *sa = base;
- *ea = base + range;
- }
+ a = (a << 2) | 0x3;
+ *sa = a & (a + 1);
+ *ea = a | (a + 1);
}
void pmp_update_rule_addr(CPURISCVState *env, uint32_t pmp_index)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [PATCH] target/riscv/pmp: simplify NAPOT address range computation,
Nicolas Pitre <=