From 2f12bb8c58286c45b19ded54a242a03ec24131f7 Mon Sep 17 00:00:00 2001 From: YenHaoChen Date: Tue, 21 Feb 2023 12:20:47 +0800 Subject: triggers: refactor: move mcontrol_common_t::hit to mcontrol_t::hit and mcontrol6_t::hit Add mcontrol_common_t::set_hit() --- riscv/triggers.cc | 2 +- riscv/triggers.h | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/riscv/triggers.cc b/riscv/triggers.cc index f8ceac3..51a5091 100644 --- a/riscv/triggers.cc +++ b/riscv/triggers.cc @@ -233,7 +233,7 @@ std::optional mcontrol_common_t::detect_memory_access_match(proc if (simple_match(xlen, value) && allow_action(proc->get_state())) { /* This is OK because this function is only called if the trigger was not * inhibited by the previous trigger in the chain. */ - hit = true; + set_hit(true); return match_result_t(timing_t(timing), action); } return std::nullopt; diff --git a/riscv/triggers.h b/riscv/triggers.h index 6f00122..7a4a942 100644 --- a/riscv/triggers.h +++ b/riscv/triggers.h @@ -205,6 +205,7 @@ public: virtual bool get_store() const override { return store; } virtual bool get_load() const override { return load; } virtual action_t get_action() const override { return action; } + virtual void set_hit(bool val) = 0; virtual std::optional detect_memory_access_match(processor_t * const proc, operation_t operation, reg_t address, std::optional data) noexcept override; @@ -217,7 +218,6 @@ protected: static bool legalize_timing(reg_t val, reg_t timing_mask, reg_t select_mask, reg_t execute_mask, reg_t load_mask) noexcept; bool dmode = false; action_t action = ACTION_DEBUG_EXCEPTION; - bool hit = false; bool select = false; bool timing = false; bool chain = false; @@ -231,12 +231,22 @@ class mcontrol_t : public mcontrol_common_t { public: virtual reg_t tdata1_read(const processor_t * const proc) const noexcept override; virtual void tdata1_write(processor_t * const proc, const reg_t val, const bool allow_chain) noexcept override; + + virtual void set_hit(bool val) override { hit = val; } + +private: + bool hit = false; }; class mcontrol6_t : public mcontrol_common_t { public: virtual reg_t tdata1_read(const processor_t * const proc) const noexcept override; virtual void tdata1_write(processor_t * const proc, const reg_t val, const bool allow_chain) noexcept override; + + virtual void set_hit(bool val) override { hit = val; } + +private: + bool hit = false; }; class icount_t : public trigger_t { -- cgit v1.1