From: Paul Mackerras <paulus@ozlabs.org>
Date: Sat, 9 Jul 2022 03:17:18 +0000 (+1000)
Subject: fetch1: Fix debug stop again
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=7c240a664bb68bc1d9c35254fe06e07436eb1318;p=microwatt.git

fetch1: Fix debug stop again

This fixes a bug which prevents the core from stopping properly.  The
same bug was previously fixed in commit e41cb01bca99 ("fetch1: Fix
debug stop", 2020-12-19) and reintroduced by commit 0fb207be6069
("fetch1: Implement a simple branch target cache", 2020-12-19).

Signed-off-by: Paul Mackerras <paulus@ozlabs.org>
---

diff --git a/fetch1.vhdl b/fetch1.vhdl
index 4c4a6a8..af1dd6b 100644
--- a/fetch1.vhdl
+++ b/fetch1.vhdl
@@ -93,7 +93,7 @@ begin
             end if;
             -- always send the up-to-date stop mark and req
             r.stop_mark <= stop_in;
-            r.req <= not rst;
+            r.req <= not rst and not stop_in;
 	end if;
     end process;
     log_out <= log_nia;