From 5079281c8e8889efc2eeba664d93644126006743 Mon Sep 17 00:00:00 2001 From: Alejandro Soto Date: Mon, 17 Oct 2022 01:03:25 -0600 Subject: Fix data hazards in nzcv and PC increment --- rtl/core/fetch/fetch.sv | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'rtl/core/fetch/fetch.sv') diff --git a/rtl/core/fetch/fetch.sv b/rtl/core/fetch/fetch.sv index e8c6a9b..c1f150c 100644 --- a/rtl/core/fetch/fetch.sv +++ b/rtl/core/fetch/fetch.sv @@ -20,8 +20,8 @@ module core_fetch ptr next_pc, head, hold_addr; logic fetched_valid, do_flush, discard; - assign do_flush = branch | flush; - assign fetched_valid = fetched & ~discard; + assign do_flush = branch || flush; + assign fetched_valid = fetched && !discard; core_prefetch #(.ORDER(PREFETCH_ORDER)) prefetch ( @@ -40,7 +40,7 @@ module core_fetch if(do_flush) addr = head; - else if(fetched_valid) + else if(fetch && fetched_valid) addr = hold_addr + 1; else addr = hold_addr; -- cgit v1.2.3