Add counteren registers.

2 files changed, 49 insertions, 1 deletions

diff --git a/riscv/riscv.sail b/riscv/riscv.sail
index e855a53d..91af45cf 100644
--- a/riscv/riscv.sail
+++ b/riscv/riscv.sail
@@ -829,6 +829,7 @@ function readCSR csr : csreg -> xlenbits =
     0x303 => mideleg.bits(),
     0x304 => mie.bits(),
     0x305 => mtvec.bits(),
+    0x306 => EXTS(mcounteren.bits()),
     0x340 => mscratch,
     0x341 => mepc,
     0x342 => mcause.bits(),
@@ -841,6 +842,7 @@ function readCSR csr : csreg -> xlenbits =
     0x103 => sideleg.bits(),
     0x104 => lower_mie(mie, mideleg).bits(),
     0x105 => stvec.bits(),
+    0x106 => EXTS(scounteren.bits()),
     0x140 => sscratch,
     0x141 => sepc,
     0x142 => scause.bits(),
@@ -869,6 +871,7 @@ function writeCSR (csr : csreg, value : xlenbits) -> unit =
     0x303 => { mideleg = legalize_mideleg(mideleg, value); Some(mideleg.bits()) },
     0x304 => { mie = legalize_mie(mie, value); Some(mie.bits()) },
     0x305 => { mtvec = legalize_tvec(mtvec, value); Some(mtvec.bits()) },
+    0x306 => { mcounteren = legalize_mcounteren(mcounteren, value); Some(EXTS(mcounteren.bits())) },
     0x340 => { mscratch = value; Some(mscratch) },
     0x341 => { mepc = legalize_xepc(value); Some(mepc) },
     0x342 => { mcause->bits() = value; Some(mcause.bits()) },
@@ -881,6 +884,7 @@ function writeCSR (csr : csreg, value : xlenbits) -> unit =
     0x103 => { sideleg->bits() = value; Some(sideleg.bits()) }, /* TODO: does this need legalization? */
     0x104 => { mie = legalize_sie(mie, mideleg, value); Some(mie.bits()) },
     0x105 => { stvec = legalize_tvec(stvec, value); Some(stvec.bits()) },
+    0x106 => { scounteren = legalize_scounteren(scounteren, value); Some(EXTS(scounteren.bits())) },
     0x140 => { sscratch = value; Some(sscratch) },
     0x141 => { sepc = legalize_xepc(value); Some(sepc) },
     0x142 => { scause->bits() = value; Some(scause.bits()) },
diff --git a/riscv/riscv_sys.sail b/riscv/riscv_sys.sail
index 0d1b69d9..fee13dee 100644
--- a/riscv/riscv_sys.sail
+++ b/riscv/riscv_sys.sail
@@ -235,7 +235,34 @@ function legalize_xepc(v : xlenbits) -> xlenbits = {
 register mtval : xlenbits
 register mscratch : xlenbits
 
-/* time/cycles */
+/* counters */
+
+bitfield Counteren : bits(32) = {
+  HPM  : 31 .. 3,
+  IR   : 2,
+  TM   : 1,
+  CY   : 0
+}
+
+register mcounteren : Counteren
+register scounteren : Counteren
+
+function legalize_mcounteren(c : Counteren, v : xlenbits) -> Counteren = {
+  /* no HPM counters yet */
+  let c = update_IR(c, v[2]);
+  let c = update_TM(c, v[1]);
+  let c = update_CY(c, v[0]);
+  c
+}
+
+function legalize_scounteren(c : Counteren, v : xlenbits) -> Counteren = {
+  /* no HPM counters yet */
+  let c = update_IR(c, v[2]);
+  let c = update_TM(c, v[1]);
+  let c = update_CY(c, v[0]);
+  c
+}
+
 register mcycle : xlenbits
 register mtime : xlenbits
 register minstret : xlenbits
@@ -534,10 +561,24 @@ function check_CSR_access(csrrw, csrpr, p, isWrite) =
 function check_TVM_SATP(csr : csreg, p : Privilege) -> bool =
   ~ (csr == 0x180 & p == Supervisor & mstatus.TVM() == true)
 
+function check_Counteren(csr : csreg, p : Privilege) -> bool =
+  match(csr, p) {
+    (0xC00, Supervisor) => mcounteren.CY() == true,
+    (0xC01, Supervisor) => mcounteren.TM() == true,
+    (0xC02, Supervisor) => mcounteren.IR() == true,
+
+    (0xC00, User) => scounteren.CY() == true,
+    (0xC01, User) => scounteren.TM() == true,
+    (0xC02, User) => scounteren.IR() == true,
+
+    (_, _) => true
+  }
+
 function check_CSR(csr : csreg, p : Privilege, isWrite : bool) -> bool =
     is_CSR_defined(csr, p)
   & check_CSR_access(csrAccess(csr), csrPriv(csr), p, isWrite)
   & check_TVM_SATP(csr, p)
+  & check_Counteren(csr, p)
 
 /* Exception delegation: given an exception and the privilege at which
  * it occured, returns the privilege at which it should be handled.
@@ -739,6 +780,9 @@ function init_sys() -> unit = {
   mstatus->SD()  = false;
 
   mhartid = EXTZ(0b0);
+
+  mcounteren->bits() = EXTZ(0b0);
+  scounteren->bits() = EXTZ(0b0);
 }
 
 function tick_clock() -> unit = {