Report proper GVA bit on breakpoint traps

3 files changed, 3 insertions, 3 deletions

diff --git a/riscv/execute.cc b/riscv/execute.cc
index 467a2b4..3f7584e 100644
--- a/riscv/execute.cc
+++ b/riscv/execute.cc
@@ -329,7 +329,7 @@ void processor_t::step(size_t n)
           enter_debug_mode(DCSR_CAUSE_HWBP);
           break;
         case ACTION_DEBUG_EXCEPTION: {
-          trap_breakpoint trap(/*gva*/false, t.address);
+          trap_breakpoint trap(state.v, t.address);
           take_trap(trap, pc);
           break;
         }
diff --git a/riscv/insns/c_ebreak.h b/riscv/insns/c_ebreak.h
index 216e04b..7d04f46 100644
--- a/riscv/insns/c_ebreak.h
+++ b/riscv/insns/c_ebreak.h
@@ -1,2 +1,2 @@
 require_extension('C');
-throw trap_breakpoint(/*gva*/false, pc);
+throw trap_breakpoint(STATE.v, pc);
diff --git a/riscv/insns/ebreak.h b/riscv/insns/ebreak.h
index dda89d4..9f3d44d 100644
--- a/riscv/insns/ebreak.h
+++ b/riscv/insns/ebreak.h
@@ -1 +1 @@
-throw trap_breakpoint(/*gva*/false, pc);
+throw trap_breakpoint(STATE.v, pc);