diff options
| author | Tim Newsome <tim@sifive.com> | 2022-03-15 08:14:50 -0700 |
|---|---|---|
| committer | Tim Newsome <tim@sifive.com> | 2022-03-30 10:38:53 -0700 |
| commit | a2a2587426e57f6207d5389620e9109bc0f82e6b (patch) | |
| tree | 94ac06e2e8797bf0a8ef3b4c08175450f37acd83 /riscv/mmu.h | |
| parent | 273fa05167c873e2cc92862ddbb52b10806f439a (diff) | |
| download | spike-a2a2587426e57f6207d5389620e9109bc0f82e6b.zip spike-a2a2587426e57f6207d5389620e9109bc0f82e6b.tar.gz spike-a2a2587426e57f6207d5389620e9109bc0f82e6b.tar.bz2 | |
trigger_operation_t -> triggers::operation_t
Diffstat (limited to 'riscv/mmu.h')
| -rw-r--r-- | riscv/mmu.h | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/riscv/mmu.h b/riscv/mmu.h index 017b483..a314888 100644 --- a/riscv/mmu.h +++ b/riscv/mmu.h @@ -11,6 +11,7 @@ #include "processor.h" #include "memtracer.h" #include "byteorder.h" +#include "triggers.h" #include <stdlib.h> #include <vector> @@ -41,11 +42,11 @@ class trigger_matched_t { public: trigger_matched_t(int index, - trigger_operation_t operation, reg_t address, reg_t data) : + triggers::operation_t operation, reg_t address, reg_t data) : index(index), operation(operation), address(address), data(data) {} int index; - trigger_operation_t operation; + triggers::operation_t operation; reg_t address; reg_t data; }; @@ -111,7 +112,7 @@ public: if ((xlate_flags) == 0 && unlikely(tlb_load_tag[vpn % TLB_ENTRIES] == (vpn | TLB_CHECK_TRIGGERS))) { \ type##_t data = from_target(*(target_endian<type##_t>*)(tlb_data[vpn % TLB_ENTRIES].host_offset + addr)); \ if (!matched_trigger) { \ - matched_trigger = trigger_exception(OPERATION_LOAD, addr, data); \ + matched_trigger = trigger_exception(triggers::OPERATION_LOAD, addr, data); \ if (matched_trigger) \ throw *matched_trigger; \ } \ @@ -170,7 +171,7 @@ public: } \ else if ((xlate_flags) == 0 && unlikely(tlb_store_tag[vpn % TLB_ENTRIES] == (vpn | TLB_CHECK_TRIGGERS))) { \ if (!matched_trigger) { \ - matched_trigger = trigger_exception(OPERATION_STORE, addr, val); \ + matched_trigger = trigger_exception(triggers::OPERATION_STORE, addr, val); \ if (matched_trigger) \ throw *matched_trigger; \ } \ @@ -469,9 +470,9 @@ 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->trigger_match(OPERATION_EXECUTE, addr, from_target(*ptr)); + int match = proc->trigger_match(triggers::OPERATION_EXECUTE, addr, from_target(*ptr)); if (match >= 0) { - throw trigger_matched_t(match, OPERATION_EXECUTE, addr, from_target(*ptr)); + throw trigger_matched_t(match, triggers::OPERATION_EXECUTE, addr, from_target(*ptr)); } } return result; @@ -481,7 +482,7 @@ private: return (uint16_t*)(translate_insn_addr(addr).host_offset + addr); } - inline trigger_matched_t *trigger_exception(trigger_operation_t operation, + inline trigger_matched_t *trigger_exception(triggers::operation_t operation, reg_t address, reg_t data) { if (!proc) { |