Fix trigger never fire on executing an instruction on plugin devices (#1084)

The trigger matching only checks on TLB hit (after refill_tlb()).
However, instructions on plugin devices will never be filled into
the TLB; thus, triggers cannot fire when executing instructions on
the plugin devices.

The PR removes the if-condition of TLB hit for trigger checking.

Co-authored-by: Howard Yen-Hao Chen <yhchen@andestech.com>

1 files changed, 5 insertions, 7 deletions

diff --git a/riscv/mmu.h b/riscv/mmu.h
index 9a93f16..ca8b792 100644
--- a/riscv/mmu.h
+++ b/riscv/mmu.h
@@ -477,13 +477,11 @@ private:
     } else {
       result = tlb_data[vpn % TLB_ENTRIES];
     }
-    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);
-      triggers::action_t action;
-      auto match = proc->TM.memory_access_match(&action, triggers::OPERATION_EXECUTE, addr, from_target(*ptr));
-      if (match != triggers::MATCH_NONE) {
-        throw triggers::matched_t(triggers::OPERATION_EXECUTE, addr, from_target(*ptr), action);
-      }
+    target_endian<uint16_t>* ptr = (target_endian<uint16_t>*)(result.host_offset + addr);
+    triggers::action_t action;
+    auto match = proc->TM.memory_access_match(&action, triggers::OPERATION_EXECUTE, addr, from_target(*ptr));
+    if (match != triggers::MATCH_NONE) {
+      throw triggers::matched_t(triggers::OPERATION_EXECUTE, addr, from_target(*ptr), action);
     }
     return result;
   }