diff options
| author | Tim Newsome <tim@sifive.com> | 2022-11-15 10:09:24 -0800 |
|---|---|---|
| committer | Tim Newsome <tim@sifive.com> | 2022-11-15 10:49:09 -0800 |
| commit | 6f5a5845d67ff98345d4754c4cf9fca1c58abda4 (patch) | |
| tree | 214d0a26f64327928a1e7485d2ae3aa066562b30 | |
| parent | b231c3c3e5e45a06ce08e8f5080e64742aba8b37 (diff) | |
| download | spike-6f5a5845d67ff98345d4754c4cf9fca1c58abda4.zip spike-6f5a5845d67ff98345d4754c4cf9fca1c58abda4.tar.gz spike-6f5a5845d67ff98345d4754c4cf9fca1c58abda4.tar.bz2 | |
triggers: rename chain
chain() -> get_chain()
chain_bit -> chain
| -rw-r--r-- | riscv/triggers.cc | 10 | ||||
| -rw-r--r-- | riscv/triggers.h | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/riscv/triggers.cc b/riscv/triggers.cc index eae5e36..62a4318 100644 --- a/riscv/triggers.cc +++ b/riscv/triggers.cc @@ -27,7 +27,7 @@ reg_t mcontrol_t::tdata1_read(const processor_t * const proc) const noexcept { v = set_field(v, MCONTROL_SELECT, select); v = set_field(v, MCONTROL_TIMING, timing); v = set_field(v, MCONTROL_ACTION, action); - v = set_field(v, MCONTROL_CHAIN, chain_bit); + v = set_field(v, MCONTROL_CHAIN, chain); v = set_field(v, MCONTROL_MATCH, match); v = set_field(v, MCONTROL_M, m); v = set_field(v, MCONTROL_S, s); @@ -45,7 +45,7 @@ bool mcontrol_t::tdata1_write(processor_t * const proc, const reg_t val) noexcep select = get_field(val, MCONTROL_SELECT); timing = get_field(val, MCONTROL_TIMING); action = (triggers::action_t) get_field(val, MCONTROL_ACTION); - chain_bit = get_field(val, MCONTROL_CHAIN); + chain = get_field(val, MCONTROL_CHAIN); unsigned match_value = get_field(val, MCONTROL_MATCH); switch (match_value) { case MATCH_EQUAL: @@ -160,7 +160,7 @@ match_result_t module_t::memory_access_match(action_t * const action, operation_ for (unsigned int i = 0; i < triggers.size(); i++) { if (!chain_ok) { - chain_ok |= !triggers[i]->chain(); + chain_ok |= !triggers[i]->get_chain(); continue; } @@ -171,12 +171,12 @@ match_result_t module_t::memory_access_match(action_t * const action, operation_ * trigger in the chain will never get `hit` set unless the entire chain * matches. */ match_result_t result = triggers[i]->memory_access_match(proc, operation, address, data); - if (result != MATCH_NONE && !triggers[i]->chain()) { + if (result != MATCH_NONE && !triggers[i]->get_chain()) { *action = triggers[i]->action; return result; } - chain_ok = result != MATCH_NONE || !triggers[i]->chain(); + chain_ok = result != MATCH_NONE || !triggers[i]->get_chain(); } return MATCH_NONE; } diff --git a/riscv/triggers.h b/riscv/triggers.h index d2cb186..692d278 100644 --- a/riscv/triggers.h +++ b/riscv/triggers.h @@ -50,8 +50,8 @@ public: virtual reg_t tdata2_read(const processor_t * const proc) const noexcept = 0; virtual bool tdata2_write(processor_t * const proc, const reg_t val) noexcept = 0; - virtual bool chain() const { return false; } virtual bool get_dmode() const = 0; + virtual bool get_chain() const { return false; } virtual bool get_execute() const { return false; } virtual bool get_store() const { return false; } virtual bool get_load() const { return false; } @@ -89,8 +89,8 @@ public: virtual reg_t tdata1_read(const processor_t * const proc) const noexcept override; virtual bool tdata1_write(processor_t * const proc, const reg_t val) noexcept override; - virtual bool chain() const override { return chain_bit; } virtual bool get_dmode() const override { return dmode; } + virtual bool get_chain() const override { return chain; } virtual bool get_execute() const override { return execute; } virtual bool get_store() const override { return store; } virtual bool get_load() const override { return load; } @@ -105,7 +105,7 @@ public: bool dmode = false; bool select = false; bool timing = false; - bool chain_bit = false; + bool chain = false; match_t match = MATCH_EQUAL; bool m = false; bool s = false; |