diff options
author | Tim Newsome <tim@sifive.com> | 2022-03-18 10:58:44 -0700 |
---|---|---|
committer | Tim Newsome <tim@sifive.com> | 2022-04-05 10:10:03 -0700 |
commit | bd7ca31454507df073e66d4c9e1d32a062231fc2 (patch) | |
tree | d57333c70a0de577d8b89329a8a04001d60e90c6 | |
parent | da4afeac5812a8d0751301a1b566bc3abaea2bda (diff) | |
download | spike-bd7ca31454507df073e66d4c9e1d32a062231fc2.zip spike-bd7ca31454507df073e66d4c9e1d32a062231fc2.tar.gz spike-bd7ca31454507df073e66d4c9e1d32a062231fc2.tar.bz2 |
module_t::trigger_match -> memory_access_match
-rw-r--r-- | riscv/mmu.h | 4 | ||||
-rw-r--r-- | riscv/triggers.cc | 2 | ||||
-rw-r--r-- | riscv/triggers.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/riscv/mmu.h b/riscv/mmu.h index 1ca2d9f..7faa266 100644 --- a/riscv/mmu.h +++ b/riscv/mmu.h @@ -457,7 +457,7 @@ private: } if (unlikely(tlb_insn_tag[vpn % TLB_ENTRIES] == (vpn | TLB_CHECK_TRIGGERS))) { target_endian<uint16_t>* ptr = (target_endian<uint16_t>*)(tlb_data[vpn % TLB_ENTRIES].host_offset + addr); - int match = proc->TM.trigger_match(triggers::OPERATION_EXECUTE, addr, from_target(*ptr)); + int match = proc->TM.memory_access_match(triggers::OPERATION_EXECUTE, addr, from_target(*ptr)); if (match >= 0) { throw triggers::matched_t(match, triggers::OPERATION_EXECUTE, addr, from_target(*ptr)); } @@ -475,7 +475,7 @@ private: if (!proc) { return NULL; } - int match = proc->TM.trigger_match(operation, address, data); + int match = proc->TM.memory_access_match(operation, address, data); if (match == -1) return NULL; if (proc->TM.triggers[match]->timing == 0) { diff --git a/riscv/triggers.cc b/riscv/triggers.cc index 092dbbd..b693bfd 100644 --- a/riscv/triggers.cc +++ b/riscv/triggers.cc @@ -139,7 +139,7 @@ module_t::module_t(unsigned count) : triggers(count) { } // Return the index of a trigger that matched, or -1. -int module_t::trigger_match(triggers::operation_t operation, reg_t address, reg_t data) +int module_t::memory_access_match(triggers::operation_t operation, reg_t address, reg_t data) { state_t *state = proc->get_state(); if (state->debug_mode) diff --git a/riscv/triggers.h b/riscv/triggers.h index 555706e..8163887 100644 --- a/riscv/triggers.h +++ b/riscv/triggers.h @@ -91,7 +91,7 @@ public: module_t(unsigned count); // Return the index of a trigger that matched, or -1. - int trigger_match(triggers::operation_t operation, reg_t address, reg_t data); + int memory_access_match(triggers::operation_t operation, reg_t address, reg_t data); processor_t *proc; std::vector<mcontrol_t *> triggers; |