commit b315ef7e9e686a3fc4408cd3c538e00101ad1d46
author Tor Jeremiassen <torerik@google.com> Fri Sep 06 12:49:52 2024 -0700
committer Tor Jeremiassen <torerik@google.com> Fri Sep 06 14:38:05 2024 -0700
tree ec566679adf587c2ff11b41cfac8ec7b995af8ec
parent 41e4d5e42b6c3a78c2982756975225ef70fc2ae4

Fixes issue in the RiscVCounterCsrHigh<> class.

PiperOrigin-RevId: 671861339
Change-Id: I3d35a82d48cd6a62fd5f009ef15cd3c1da9fd0fb

cheriot/cheriot_state.cc

diff --git a/cheriot/cheriot_state.cc b/cheriot/cheriot_state.cc
index 39ac0bf..6dc3ca0 100644
--- a/cheriot/cheriot_state.cc
+++ b/cheriot/cheriot_state.cc
@@ -199,7 +199,9 @@
   CHECK_NE(minstret, nullptr);
   if (sizeof(T) == sizeof(uint32_t)) {
     CHECK_NE(CreateCsr<RiscVCounterCsrHigh<CheriotState>>(
-                 state, csr_vec, "minstreth", RiscVCsrEnum::kMInstretH, state),
+                 state, csr_vec, "minstreth", RiscVCsrEnum::kMInstretH, state,
+                 reinterpret_cast<RiscVCounterCsr<uint32_t, CheriotState> *>(
+                     minstret)),
              nullptr);
   }
   // mcycle/mcycleh
@@ -208,7 +210,9 @@
   CHECK_NE(mcycle, nullptr);
   if (sizeof(T) == sizeof(uint32_t)) {
     CHECK_NE(CreateCsr<RiscVCounterCsrHigh<CheriotState>>(
-                 state, csr_vec, "mcycleh", RiscVCsrEnum::kMCycleH, state),
+                 state, csr_vec, "mcycleh", RiscVCsrEnum::kMCycleH, state,
+                 reinterpret_cast<RiscVCounterCsr<uint32_t, CheriotState> *>(
+                     mcycle)),
              nullptr);
   }