colin
/
Hazard3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix latent bug with asynchronous debug entry during stalled load/store address phase

This commit is contained in:
Luke Wren 2021-09-04 07:49:29 +01:00
parent d03a82a826
commit 65bfca5fdf
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hdl/hazard3_csr.v
View File

@ -922,9 +922,10 @@ end
// may already have had system side effects: for example a load/store on an // may already have had system side effects: for example a load/store on an
// IO region. // IO region.
// //
// However a halt request when the instruction in stage 3 is itself generating // However an asynchronous halt request when the instruction in stage 3 is
// an exception is an exception-like halt entry. Otherwise, we set DPC to the // itself generating an exception is an exception-like halt entry. Otherwise,
// instruction *after* the excepting one, which is never actually reached. // we set DPC to the instruction *after* (in X) the excepting one, which is
// never actually reached, due to the exception.
wire exception_req_any; wire exception_req_any;
@ -1037,10 +1038,12 @@ assign trap_addr =
assign trap_is_irq = DEBUG_SUPPORT && (want_halt_except || want_halt_irq) ? assign trap_is_irq = DEBUG_SUPPORT && (want_halt_except || want_halt_irq) ?
!want_halt_except : !exception_req_any; !want_halt_except : !exception_req_any;
// delay_irq_entry also applies to IRQ-like debug entries.
assign trap_enter_vld = assign trap_enter_vld =
CSR_M_TRAP && (exception_req_any || CSR_M_TRAP && (exception_req_any ||
!delay_irq_entry && !debug_mode && (standard_irq_active || external_irq_active)) || !delay_irq_entry && !debug_mode && (standard_irq_active || external_irq_active)) ||
DEBUG_SUPPORT && (want_halt_irq || want_halt_except || pending_dbg_resume); DEBUG_SUPPORT && (
(!delay_irq_entry && want_halt_irq) || want_halt_except || pending_dbg_resume);
assign mcause_irq_next = !exception_req_any; assign mcause_irq_next = !exception_req_any;
assign mcause_code_next = exception_req_any ? {2'h0, except} : mcause_irq_num; assign mcause_code_next = exception_req_any ? {2'h0, except} : mcause_irq_num;