[v3,2/7] target/riscv: Adjust PMP size for no-MMU RV64 QEMU running RV32

Commit Message

LIU Zhiwei July 3, 2024, 2:49 p.m. UTC

From: TANG Tiancheng <[e-mail]>

Ensure pmp_size is correctly determined using mxl for RV32
in RV64 QEMU.

Signed-off-by: TANG Tiancheng <[e-mail]>
Reviewed-by: Liu Zhiwei <[e-mail]>
Reviewed-by: Alistair Francis <[e-mail]>
---
 target/riscv/pmp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Richard Henderson July 3, 2024, 4:48 p.m. UTC | #1

On 7/3/24 07:49, LIU Zhiwei wrote:
> -            pmp_size = sizeof(target_ulong);
> +            pmp_size = 2UL << riscv_cpu_mxl(env);

UL is almost always incorrect in qemu, as 'long' has no specifically useful meaning.

In this case you can drop it completely.


r~

Patch

diff --git a/target/riscv/pmp.c b/target/riscv/pmp.c
index 9eea397e72..f65aa3dba7 100644
--- a/target/riscv/pmp.c
+++ b/target/riscv/pmp.c
@@ -326,7 +326,7 @@  bool pmp_hart_has_privs(CPURISCVState *env, hwaddr addr,
              */
             pmp_size = -(addr | TARGET_PAGE_MASK);
         } else {
-            pmp_size = sizeof(target_ulong);
+            pmp_size = 2UL << riscv_cpu_mxl(env);
         }
     } else {
         pmp_size = size;