From 099f0467fb99ec4df2235b5f1b9ce8fcf6d55fb6 Mon Sep 17 00:00:00 2001 From: Luke Wren Date: Mon, 29 Aug 2022 15:56:57 +0100 Subject: [PATCH] Clean up remnants of the 'wfi_is_nop' thing that seemed like a good idea at the time --- hdl/hazard3_csr.v | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/hdl/hazard3_csr.v b/hdl/hazard3_csr.v index e389cfd..ee4a1b9 100644 --- a/hdl/hazard3_csr.v +++ b/hdl/hazard3_csr.v @@ -118,7 +118,6 @@ module hazard3_csr #( // Other CSR-specific signalling output wire trap_wfi, - output wire wfi_is_nop, input wire instr_ret ); @@ -229,9 +228,9 @@ end // Trap all U-mode WFIs if timeout bit is set. Note that the debug spec // says "The `wfi` instruction acts as a `nop`" during program buffer -// execution, and nops do not trap, so in debug mode we uncondi allow WFIs but we inhibit their sleep signal. +// execution, and nops do not trap, so in debug mode we allow WFIs but +// immediately wake them. assign trap_wfi = mstatus_tw && !(debug_mode || m_mode); -assign wfi_is_nop = debug_mode; reg [XLEN-1:0] mscratch;