From: Andrew Waterman <waterman@cs.berkeley.edu>
Date: Fri, 5 Dec 2014 07:08:01 +0000 (-0800)
Subject: Set badvaddr on instruction page faults
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=cec752d09191e96a51f5c21ed8d51e1218f804ff;p=riscv-isa-sim.git

Set badvaddr on instruction page faults

This supports distinguishing the EPC (the address of the first byte of the
faulting instruction) from the address of the page fault (potentially some
bytes later).
---

diff --git a/riscv/decode.h b/riscv/decode.h
index 9890514..543080d 100644
--- a/riscv/decode.h
+++ b/riscv/decode.h
@@ -155,7 +155,7 @@ private:
 
 #define set_pc(x) \
   do { if ((x) & 3 /* For now... */) \
-         throw trap_instruction_address_misaligned(); \
+         throw trap_instruction_address_misaligned(x); \
        npc = sext_xprlen(x); \
      } while(0)
 
diff --git a/riscv/mmu.cc b/riscv/mmu.cc
index 4675f75..92cb6de 100644
--- a/riscv/mmu.cc
+++ b/riscv/mmu.cc
@@ -45,8 +45,7 @@ void* mmu_t::refill_tlb(reg_t addr, reg_t bytes, bool store, bool fetch)
   if(unlikely((pte_perm & perm) != perm))
   {
     if (fetch)
-      throw trap_instruction_access_fault();
-
+      throw trap_instruction_access_fault(addr);
     if (store)
       throw trap_store_access_fault(addr);
     throw trap_load_access_fault(addr);
diff --git a/riscv/trap.h b/riscv/trap.h
index b795948..53df4f4 100644
--- a/riscv/trap.h
+++ b/riscv/trap.h
@@ -42,8 +42,8 @@ class mem_trap_t : public trap_t
   const char* name() { return "trap_"#x; } \
 };
 
-DECLARE_TRAP(CAUSE_MISALIGNED_FETCH, instruction_address_misaligned)
-DECLARE_TRAP(CAUSE_FAULT_FETCH, instruction_access_fault)
+DECLARE_MEM_TRAP(CAUSE_MISALIGNED_FETCH, instruction_address_misaligned)
+DECLARE_MEM_TRAP(CAUSE_FAULT_FETCH, instruction_access_fault)
 DECLARE_TRAP(CAUSE_ILLEGAL_INSTRUCTION, illegal_instruction)
 DECLARE_TRAP(CAUSE_PRIVILEGED_INSTRUCTION, privileged_instruction)
 DECLARE_TRAP(CAUSE_FP_DISABLED, fp_disabled)