Convert triggers::module_t::detect_memory_access_match to std::optional

Goal is to remove match_result_t.fire field to eliminate dont-care
fields when fire=false.

1 files changed, 5 insertions, 5 deletions

diff --git a/riscv/mmu.cc b/riscv/mmu.cc
index e4fba3d..1d15b91 100644
--- a/riscv/mmu.cc
+++ b/riscv/mmu.cc
@@ -157,18 +157,18 @@ void mmu_t::check_triggers(triggers::operation_t operation, reg_t address, std::
   if (matched_trigger || !proc)
     return;
 
-  triggers::match_result_t match = proc->TM.detect_memory_access_match(operation, address, data);
+  auto match = proc->TM.detect_memory_access_match(operation, address, data);
 
-  if (match.fire)
-    switch (match.timing) {
+  if (match.has_value())
+    switch (match->timing) {
       case triggers::TIMING_BEFORE:
-        throw triggers::matched_t(operation, address, match.action);
+        throw triggers::matched_t(operation, address, match->action);
 
       case triggers::TIMING_AFTER:
         // We want to take this exception on the next instruction.  We check
         // whether to do so in the I$ refill path, so flush the I$.
         flush_icache();
-        matched_trigger = new triggers::matched_t(operation, address, match.action);
+        matched_trigger = new triggers::matched_t(operation, address, match->action);
     }
 }