From 9b9120960db9f8815e9e4c3c77ae01b356ddcbe2 Mon Sep 17 00:00:00 2001 From: Luke Wren Date: Sun, 5 Dec 2021 00:54:28 +0000 Subject: [PATCH] Fix missing RAW stall on sc.w succes result. Closing laptop again. --- hdl/hazard3_core.v | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/hdl/hazard3_core.v b/hdl/hazard3_core.v index 55145fd..79dbd0f 100644 --- a/hdl/hazard3_core.v +++ b/hdl/hazard3_core.v @@ -311,7 +311,11 @@ wire x_stall_on_amo = |EXTENSION_A && d_memop_is_amo && !m_trap_enter_soon && ( // Read-after-write hazard detection (e.g. load-use) wire m_fast_mul_result_vld; -wire m_generating_result = xm_memop < MEMOP_SW || x_memop == MEMOP_LR_W || m_fast_mul_result_vld; +wire m_generating_result = + xm_memop < MEMOP_SW || + |EXTENSION_A && xm_memop == MEMOP_LR_W || + |EXTENSION_A && xm_memop == MEMOP_SC_W || // sc.w success result is data phase + |EXTENSION_M && m_fast_mul_result_vld; reg x_stall_on_raw;