convert FU_RW_Pend accumulator to src-vector

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

diff --git a/src/scoreboard/fu_wr_pending.py b/src/scoreboard/fu_wr_pending.py
index abfca25f7257b33ea87f21174d2e4ffd7db5c638..d0bcb954301fd82396dc52b20009928a738f2268 100644 (file)
--- a/src/scoreboard/fu_wr_pending.py
+++ b/src/scoreboard/fu_wr_pending.py
@@ -1,27 +1,29 @@
-from nmigen import Elaboratable, Module, Signal, Cat
+from nmigen import Elaboratable, Module, Signal, Array
 
 
 class FU_RW_Pend(Elaboratable):
     """ these are allocated per-FU (horizontally),
         and are of length reg_count
     """
-    def __init__(self, reg_count):
+    def __init__(self, reg_count, n_src):
+        self.n_src = n_src
         self.reg_count = reg_count
         self.dest_fwd_i = Signal(reg_count, reset_less=True)
-        self.src1_fwd_i = Signal(reg_count, reset_less=True)
-        self.src2_fwd_i = Signal(reg_count, reset_less=True)
+        src = []
+        for i in range(n_src):
+            j = i + 1 # name numbering to match src1/src2
+            src.append(Signal(reg_count, name="src%d" % j, reset_less=True))
+        self.src_fwd_i = Array(src)
 
         self.reg_wr_pend_o = Signal(reset_less=True)
         self.reg_rd_pend_o = Signal(reset_less=True)
-        self.reg_rd_src1_pend_o = Signal(reset_less=True)
-        self.reg_rd_src2_pend_o = Signal(reset_less=True)
+        self.reg_rd_src_pend_o = Signal(n_src, reset_less=True)
 
     def elaborate(self, platform):
         m = Module()
         m.d.comb += self.reg_wr_pend_o.eq(self.dest_fwd_i.bool())
-        m.d.comb += self.reg_rd_src1_pend_o.eq(self.src1_fwd_i.bool())
-        m.d.comb += self.reg_rd_src2_pend_o.eq(self.src2_fwd_i.bool())
-        m.d.comb += self.reg_rd_pend_o.eq(self.reg_rd_src1_pend_o |
-                                          self.reg_rd_src2_pend_o)
+        for i in range(self.n_src):
+            m.d.comb += self.reg_rd_src_pend_o[i].eq(self.src_fwd_i[i].bool())
+        m.d.comb += self.reg_rd_pend_o.eq(self.reg_rd_src_pend_o.bool())
         return m