From 2855c71b850f53d735edf00ccd3221115f597d16 Mon Sep 17 00:00:00 2001 From: YenHaoChen Date: Tue, 21 Feb 2023 13:39:45 +0800 Subject: triggers: refactor: add typedef enum { ... } hit_t for mcontrol6 Avoid using private headers, e.g., debug_defines.h, in triggers.h --- riscv/triggers.cc | 7 ++++--- riscv/triggers.h | 15 +++++++++++---- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/riscv/triggers.cc b/riscv/triggers.cc index 51a5091..9c81b89 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. */ - set_hit(true); + set_hit(timing ? HIT_IMMEDIATELY_AFTER : HIT_BEFORE); return match_result_t(timing_t(timing), action); } return std::nullopt; @@ -268,9 +268,10 @@ reg_t mcontrol6_t::tdata1_read(const processor_t * const proc) const noexcept { reg_t tdata1 = 0; tdata1 = set_field(tdata1, CSR_MCONTROL6_TYPE(xlen), CSR_TDATA1_TYPE_MCONTROL6); tdata1 = set_field(tdata1, CSR_MCONTROL6_DMODE(xlen), dmode); + tdata1 = set_field(tdata1, CSR_MCONTROL6_HIT1, hit >> 1); // MSB of 2-bit field tdata1 = set_field(tdata1, CSR_MCONTROL6_VS, proc->extension_enabled('H') ? vs : 0); tdata1 = set_field(tdata1, CSR_MCONTROL6_VU, proc->extension_enabled('H') ? vu : 0); - tdata1 = set_field(tdata1, CSR_MCONTROL6_HIT0, hit); + tdata1 = set_field(tdata1, CSR_MCONTROL6_HIT0, hit & 1); // LSB of 2-bit field tdata1 = set_field(tdata1, CSR_MCONTROL6_SELECT, select); tdata1 = set_field(tdata1, CSR_MCONTROL6_ACTION, action); tdata1 = set_field(tdata1, CSR_MCONTROL6_CHAIN, chain); @@ -290,7 +291,7 @@ void mcontrol6_t::tdata1_write(processor_t * const proc, const reg_t val, const dmode = get_field(val, CSR_MCONTROL6_DMODE(xlen)); vs = get_field(val, CSR_MCONTROL6_VS); vu = get_field(val, CSR_MCONTROL6_VU); - hit = get_field(val, CSR_MCONTROL6_HIT0); + hit = hit_t(2 * get_field(val, CSR_MCONTROL6_HIT1) + get_field(val, CSR_MCONTROL6_HIT0)); // 2-bit field {hit1,hit0} select = get_field(val, CSR_MCONTROL6_SELECT); action = legalize_action(val, CSR_MCONTROL6_ACTION, CSR_MCONTROL6_DMODE(xlen)); chain = allow_chain ? get_field(val, CSR_MCONTROL6_CHAIN) : 0; diff --git a/riscv/triggers.h b/riscv/triggers.h index 7a4a942..b144ade 100644 --- a/riscv/triggers.h +++ b/riscv/triggers.h @@ -51,6 +51,13 @@ struct match_result_t { action_t action; }; +typedef enum { + HIT_FALSE = 0, + HIT_BEFORE = 1, + HIT_AFTER = 2, + HIT_IMMEDIATELY_AFTER = 3 +} hit_t; + class matched_t { public: @@ -205,7 +212,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 void set_hit(hit_t val) = 0; virtual std::optional detect_memory_access_match(processor_t * const proc, operation_t operation, reg_t address, std::optional data) noexcept override; @@ -232,7 +239,7 @@ 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; } + virtual void set_hit(hit_t val) override { hit = val != HIT_FALSE; } private: bool hit = false; @@ -243,10 +250,10 @@ 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; } + virtual void set_hit(hit_t UNUSED val) override { hit = HIT_BEFORE; } private: - bool hit = false; + hit_t hit = HIT_FALSE; }; class icount_t : public trigger_t { -- cgit v1.1