add in branch speculation recorder, link to branch

[soc.git] / src / scoreboard / shadow.py

diff --git a/src/scoreboard/shadow.py b/src/scoreboard/shadow.py
index aaee56cc9de5b8393a84ca5c0b658b79874fe608..c1d77a0229835913fbf334416b27850837dcadbf 100644 (file)
--- a/src/scoreboard/shadow.py
+++ b/src/scoreboard/shadow.py
@@ -203,16 +203,15 @@ class BranchSpeculationRecord(Elaboratable):
         # ANDing and ORing...
         for i in range(self.n_fus):
             with m.If(self.branch_i):
+                with m.If(good_r[i] | fail_r[i]):
+                    m.d.comb += self.good_o[i].eq(good_r[i] | ~fail_r[i])
+                    m.d.comb += self.fail_o[i].eq(fail_r[i] | ~good_r[i])
                 m.d.sync += good_r[i].eq(0) # might be set if issue set as well
                 m.d.sync += fail_r[i].eq(0) # might be set if issue set as well
             with m.If(self.issue_i[i]):
                 m.d.sync += good_r[i].eq(self.good_i[i])
                 m.d.sync += fail_r[i].eq(self.fail_i[i])
 
-        with m.If(self.branch_i):
-            m.d.comb += self.good_o.eq(good_r | ~fail_r)
-            m.d.comb += self.fail_o.eq(fail_r | ~good_r)
-
         return m
 
     def __iter__(self):