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

Safer logic for load/store blocked by preceding WFI

This commit is contained in:
Luke Wren 2021-11-23 22:01:14 +00:00
parent 4d14203586
commit 0b9b706e81
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hdl/hazard3_core.v
View File

@ -373,7 +373,12 @@ always @ (*) begin
MEMOP_SH: bus_hsize_d = HSIZE_HWORD;
default: bus_hsize_d = HSIZE_BYTE;
endcase
bus_aph_req_d = x_memop_vld && !(x_stall_raw || x_unaligned_addr || m_trap_enter_soon);
bus_aph_req_d = x_memop_vld && !(
x_stall_raw ||
x_unaligned_addr ||
m_trap_enter_soon ||
(xm_wfi && !m_wfi_stall_clear) // FIXME will cause a timing issue, better to stall til *after* clear
);
end
// Multiply/divide