On EBREAK, set badaddr to pc

9 years ago · 8f4fb411b0
3 changed files with 3 additions and 3 deletions
--- a/riscv/insns/c_ebreak.h
+++ b/riscv/insns/c_ebreak.h
@ -1,2 +1,2 @@
 require_extension('C');
-throw trap_breakpoint();
+throw trap_breakpoint(pc);
--- a/riscv/insns/ebreak.h
+++ b/riscv/insns/ebreak.h
@ -1 +1 @@
-throw trap_breakpoint();
+throw trap_breakpoint(pc);
--- a/riscv/trap.h
+++ b/riscv/trap.h
@ -47,7 +47,7 @@ class mem_trap_t : public trap_t
 DECLARE_MEM_TRAP(CAUSE_MISALIGNED_FETCH, instruction_address_misaligned)
 DECLARE_MEM_TRAP(CAUSE_FETCH_ACCESS, instruction_access_fault)
 DECLARE_TRAP(CAUSE_ILLEGAL_INSTRUCTION, illegal_instruction)
-DECLARE_TRAP(CAUSE_BREAKPOINT, breakpoint)
+DECLARE_MEM_TRAP(CAUSE_BREAKPOINT, breakpoint)
 DECLARE_MEM_TRAP(CAUSE_MISALIGNED_LOAD, load_address_misaligned)
 DECLARE_MEM_TRAP(CAUSE_MISALIGNED_STORE, store_address_misaligned)
 DECLARE_MEM_TRAP(CAUSE_LOAD_ACCESS, load_access_fault)