fix(priv): do not check xstimecmp if normal permit is violated (#571)

OpenXiangShan · Oct 10, 2024 · ffe101a · ffe101a
1 parent 079a180
commit ffe101a
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/isa/riscv64/system/priv.c b/src/isa/riscv64/system/priv.c
@@ -1824,7 +1824,7 @@ static inline void csr_permit_check(uint32_t addr, bool is_write) {
   has_vi |= csr_readonly_permit_check(addr, is_write);
 
   // Attempts to access unprivileged counters without s/h/mcounteren
-  if ((addr >= 0xC00 && addr <= 0xC1F) || (addr == 0x14D) || (addr == 0x24D)) {
+  if (!has_vi && ((addr >= 0xC00 && addr <= 0xC1F) || (addr == 0x14D) || (addr == 0x24D))) {
     has_vi |= csr_counter_enable_check(addr);
   }
   // check smstateen