From 61d788ebc758ed1c951c7063276d85d4c509e2f3 Mon Sep 17 00:00:00 2001
From: Franz Fuchs <franz.fuchs@cl.cam.ac.uk>
Date: Fri, 3 Sep 2021 14:14:32 +0100
Subject: [PATCH] define No_Of_Evts in StatCounters

---
 src_Core/CPU/CsrFile.bsv                   |  1 +
 src_Core/RISCY_OOO/procs/lib/ProcTypes.bsv | 10 +++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src_Core/CPU/CsrFile.bsv b/src_Core/CPU/CsrFile.bsv
index 77ca3a6..fdd5a11 100644
--- a/src_Core/CPU/CsrFile.bsv
+++ b/src_Core/CPU/CsrFile.bsv
@@ -40,6 +40,7 @@
 `include "ProcConfig.bsv"
 import Types::*;
 import ProcTypes::*;
+import StatCounters::*;
 import DefaultValue::*;
 import ConcatReg::*;
 import ConfigReg::*;
diff --git a/src_Core/RISCY_OOO/procs/lib/ProcTypes.bsv b/src_Core/RISCY_OOO/procs/lib/ProcTypes.bsv
index 7dc3f52..6406e80 100755
--- a/src_Core/RISCY_OOO/procs/lib/ProcTypes.bsv
+++ b/src_Core/RISCY_OOO/procs/lib/ProcTypes.bsv
@@ -1049,11 +1049,11 @@ endfunction
 function x addPc(x cap, Bit#(12) inc) provisos (Add#(f, 12, c), CHERICap::CHERICap#(x, a, b, c, d, e)) = setAddrUnsafe(cap, getAddr(cap) + signExtend(inc));
 
 `ifdef PERFORMANCE_MONITORING
-`ifdef CONTRACTS_VERIFY
-typedef 128 No_Of_Evts;
-`else
-typedef 112 No_Of_Evts;
-`endif
+//`ifdef CONTRACTS_VERIFY
+//typedef 128 No_Of_Evts;
+//`else
+//typedef 112 No_Of_Evts;
+//`endif
 typedef   8 Report_Width;
 typedef  64 Counter_Width;
 typedef  29 No_Of_Ctrs;