From 31f5ede662303183d93f80e869379e49b7a01608 Mon Sep 17 00:00:00 2001 From: Atul Khare Date: Wed, 17 May 2023 12:40:01 -0700 Subject: Enhance mode_match() functionality The current version of mode_match() is based on the current privilege level. This adds an explicit privilege and virtual mode parameters in anticipation of an upcoming patch for matching trap triggers. --- riscv/triggers.cc | 11 ++++++----- riscv/triggers.h | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) (limited to 'riscv') diff --git a/riscv/triggers.cc b/riscv/triggers.cc index 86dcc81..51dcf18 100644 --- a/riscv/triggers.cc +++ b/riscv/triggers.cc @@ -56,15 +56,16 @@ void trigger_t::tdata3_write(processor_t * const proc, const reg_t val) noexcept } bool trigger_t::common_match(processor_t * const proc) const noexcept { - return mode_match(proc->get_state()) && textra_match(proc); + auto state = proc->get_state(); + return mode_match(state->prv, state->v) && textra_match(proc); } -bool trigger_t::mode_match(state_t * const state) const noexcept +bool trigger_t::mode_match(reg_t prv, bool v) const noexcept { - switch (state->prv) { + switch (prv) { case PRV_M: return m; - case PRV_S: return state->v ? vs : s; - case PRV_U: return state->v ? vu : u; + case PRV_S: return v ? vs : s; + case PRV_U: return v ? vu : u; default: assert(false); } } diff --git a/riscv/triggers.h b/riscv/triggers.h index aeda4d5..94e7e5c 100644 --- a/riscv/triggers.h +++ b/riscv/triggers.h @@ -102,7 +102,7 @@ protected: private: unsigned legalize_mhselect(bool h_enabled) const noexcept; - bool mode_match(state_t * const state) const noexcept; + bool mode_match(reg_t prv, bool v) const noexcept; bool textra_match(processor_t * const proc) const noexcept; struct mhselect_interpretation { -- cgit v1.1