From: Luke Kenneth Casson Leighton <lkcl@lkcl.net>
Date: Sat, 27 Jun 2020 20:35:27 +0000 (+0100)
Subject: only activate ld_in_progress if addr is ok
X-Git-Tag: div_pipeline~233
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=345a8ac76303b066c26f91bdaa86fba61fa3e670;p=soc.git

only activate ld_in_progress if addr is ok
---

diff --git a/src/soc/experiment/pi2ls.py b/src/soc/experiment/pi2ls.py
index e52425d1..9356b912 100644
--- a/src/soc/experiment/pi2ls.py
+++ b/src/soc/experiment/pi2ls.py
@@ -75,7 +75,7 @@ class Pi2LSUI(Elaboratable):
             # indicate "OK" - XXX should be checking address valid
             m.d.comb += pi.addr_ok_o.eq(1)
 
-        with m.If(pi.is_ld_i):
+        with m.If(pi.is_ld_i & pi.addr.ok):
             # shift/mask out the loaded data
             m.d.comb += pi.ld.data.eq((lsui.m_ld_data_o & lenexp.rexp_o) >>
                                       (lenexp.addr_i*8))