diff options
| -rw-r--r-- | riscv/triggers.cc | 10 | ||||
| -rw-r--r-- | riscv/triggers.h | 14 |
2 files changed, 12 insertions, 12 deletions
diff --git a/riscv/triggers.cc b/riscv/triggers.cc index 1c54d55..957d2bb 100644 --- a/riscv/triggers.cc +++ b/riscv/triggers.cc @@ -113,7 +113,7 @@ bool mcontrol_t::simple_match(unsigned xlen, reg_t value) const { assert(0); } -match_result_t mcontrol_t::detect_memory_access_match(processor_t * const proc, operation_t operation, reg_t address, std::optional<reg_t> data) { +match_result_t mcontrol_t::detect_memory_access_match(processor_t * const proc, operation_t operation, reg_t address, std::optional<reg_t> data) noexcept { state_t * const state = proc->get_state(); if ((operation == triggers::OPERATION_EXECUTE && !execute) || (operation == triggers::OPERATION_STORE && !store) || @@ -184,7 +184,7 @@ void itrigger_t::tdata1_write(processor_t * const proc, const reg_t val, const b action = ACTION_DEBUG_EXCEPTION; } -match_result_t itrigger_t::detect_trap_match(processor_t * const proc, const trap_t& t) +match_result_t itrigger_t::detect_trap_match(processor_t * const proc, const trap_t& t) noexcept { state_t * const state = proc->get_state(); if ((state->prv == PRV_M && !m) || @@ -238,7 +238,7 @@ void etrigger_t::tdata1_write(processor_t * const proc, const reg_t val, const b action = ACTION_DEBUG_EXCEPTION; } -match_result_t etrigger_t::detect_trap_match(processor_t * const proc, const trap_t& t) +match_result_t etrigger_t::detect_trap_match(processor_t * const proc, const trap_t& t) noexcept { state_t * const state = proc->get_state(); if ((state->prv == PRV_M && !m) || @@ -333,7 +333,7 @@ bool module_t::tdata2_write(processor_t * const proc, unsigned index, const reg_ return true; } -match_result_t module_t::detect_memory_access_match(operation_t operation, reg_t address, std::optional<reg_t> data) +match_result_t module_t::detect_memory_access_match(operation_t operation, reg_t address, std::optional<reg_t> data) noexcept { state_t * const state = proc->get_state(); if (state->debug_mode) @@ -362,7 +362,7 @@ match_result_t module_t::detect_memory_access_match(operation_t operation, reg_t return match_result_t(false); } -match_result_t module_t::detect_trap_match(const trap_t& t) +match_result_t module_t::detect_trap_match(const trap_t& t) noexcept { state_t * const state = proc->get_state(); if (state->debug_mode) diff --git a/riscv/triggers.h b/riscv/triggers.h index a287849..428dfda 100644 --- a/riscv/triggers.h +++ b/riscv/triggers.h @@ -68,8 +68,8 @@ public: virtual action_t get_action() const { return ACTION_DEBUG_EXCEPTION; } virtual match_result_t detect_memory_access_match(processor_t UNUSED * const proc, - operation_t UNUSED operation, reg_t UNUSED address, std::optional<reg_t> UNUSED data) { return match_result_t(false); } - virtual match_result_t detect_trap_match(processor_t UNUSED * const proc, const trap_t UNUSED & t) { return match_result_t(false); } + operation_t UNUSED operation, reg_t UNUSED address, std::optional<reg_t> UNUSED data) noexcept { return match_result_t(false); } + virtual match_result_t detect_trap_match(processor_t UNUSED * const proc, const trap_t UNUSED & t) noexcept { return match_result_t(false); } protected: reg_t tdata2; @@ -94,7 +94,7 @@ public: bool get_dmode() const override { return dmode; } virtual action_t get_action() const override { return action; } - virtual match_result_t detect_trap_match(processor_t * const proc, const trap_t& t) override; + virtual match_result_t detect_trap_match(processor_t * const proc, const trap_t& t) noexcept override; private: bool dmode; @@ -116,7 +116,7 @@ public: bool get_dmode() const override { return dmode; } virtual action_t get_action() const override { return action; } - virtual match_result_t detect_trap_match(processor_t * const proc, const trap_t& t) override; + virtual match_result_t detect_trap_match(processor_t * const proc, const trap_t& t) noexcept override; private: bool dmode; @@ -152,7 +152,7 @@ public: virtual action_t get_action() const override { return action; } virtual match_result_t detect_memory_access_match(processor_t * const proc, - operation_t operation, reg_t address, std::optional<reg_t> data) override; + operation_t operation, reg_t address, std::optional<reg_t> data) noexcept override; private: bool simple_match(unsigned xlen, reg_t value) const; @@ -185,8 +185,8 @@ public: unsigned count() const { return triggers.size(); } - match_result_t detect_memory_access_match(operation_t operation, reg_t address, std::optional<reg_t> data); - match_result_t detect_trap_match(const trap_t& t); + match_result_t detect_memory_access_match(operation_t operation, reg_t address, std::optional<reg_t> data) noexcept; + match_result_t detect_trap_match(const trap_t& t) noexcept; processor_t *proc; private: |