Update to new counter spec

1 files changed, 10 insertions, 25 deletions

diff --git a/machine/emulation.c b/machine/emulation.c
index ad74fb4..ae99908 100644
--- a/machine/emulation.c
+++ b/machine/emulation.c
@@ -88,37 +88,22 @@ void __attribute__((noinline)) truly_illegal_insn(uintptr_t* regs, uintptr_t mca
 
 static inline int emulate_read_csr(int num, uintptr_t mstatus, uintptr_t* result)
 {
+  uintptr_t counteren =
+    EXTRACT_FIELD(mstatus, MSTATUS_MPP) == PRV_U ? read_csr(mucounteren) :
+                                                   read_csr(mscounteren);
+
   switch (num)
   {
     case CSR_TIME:
-      *result = *mtime + HLS()->utime_delta;
-      return 0;
-    case CSR_CYCLE:
-      *result = read_csr(mcycle) + HLS()->ucycle_delta;
-      return 0;
-    case CSR_INSTRET:
-      *result = read_csr(minstret) + HLS()->uinstret_delta;
-      return 0;
-    case CSR_STIME:
-      *result = *mtime + HLS()->stime_delta;
-      return 0;
-    case CSR_SCYCLE:
-      *result = read_csr(mcycle) + HLS()->scycle_delta;
-      return 0;
-    case CSR_SINSTRET:
-      *result = read_csr(minstret) + HLS()->sinstret_delta;
+      if ((counteren >> (CSR_TIME - CSR_CYCLE)) & 1)
+        return -1;
+      *result = *mtime;
       return 0;
 #ifdef __riscv32
     case CSR_TIMEH:
-      *result = (*mtime + HLS()->stime_delta) >> 32;
-      return 0;
-    case CSR_CYCLEH:
-      *result = (((uint64_t)read_csr(mcycleh) << 32) + read_csr(mcycle)
-                 + HLS()->scycle_delta) >> 32;
-      return 0;
-    case CSR_INSTRETH:
-      *result = (((uint64_t)read_csr(minstreth) << 32) + read_csr(minstret)
-                 + HLS()->sinstret_delta) >> 32;
+      if ((counteren >> (CSR_TIME - CSR_CYCLE)) & 1)
+        return -1;
+      *result = *mtime >> 32;
       return 0;
 #endif
 #if !defined(__riscv_hard_float) && defined(PK_ENABLE_FP_EMULATION)