From 4a9b31b82bcd2cafe85137334f1c07afe56cc224 Mon Sep 17 00:00:00 2001 From: Dayeol Lee Date: Fri, 26 Oct 2018 18:04:27 +0000 Subject: [PATCH] target/riscv/pmp.c: pmpcfg_csr_read returns bogus value on RV64 pmp_read_cfg() returns 8-bit value, which is combined together to form a single pmpcfg CSR. The default promotion rules will result in an integer here ("i*8" is integer, which flows through) resulting in a 32-bit signed value on most hosts. That's bogus on RV64I, with the high bits of the CSR being wrong. Signed-off-by: Dayeol Lee Reviewed-by: Palmer Dabbelt Reviewed-by: Alistair Francis Signed-off-by: Palmer Dabbelt --- target/riscv/pmp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/riscv/pmp.c b/target/riscv/pmp.c index f432f3b759..03abd8fe5e 100644 --- a/target/riscv/pmp.c +++ b/target/riscv/pmp.c @@ -325,7 +325,7 @@ target_ulong pmpcfg_csr_read(CPURISCVState *env, uint32_t reg_index) { int i; target_ulong cfg_val = 0; - uint8_t val = 0; + target_ulong val = 0; for (i = 0; i < sizeof(target_ulong); i++) { val = pmp_read_cfg(env, (reg_index * sizeof(target_ulong)) + i);