From 674cca50eead616ef37b3014407164d4c876c1b8 Mon Sep 17 00:00:00 2001
From: Luke Kenneth Casson Leighton <lkcl@lkcl.net>
Date: Wed, 3 Jun 2020 23:00:05 +0100
Subject: [PATCH] connect read-enable and src_i to regfile ports

---
 src/soc/regfile/regfiles.py |  2 +-
 src/soc/simple/core.py      | 21 ++++++++++++++++++++-
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/src/soc/regfile/regfiles.py b/src/soc/regfile/regfiles.py
index 4dfb522a..895739a1 100644
--- a/src/soc/regfile/regfiles.py
+++ b/src/soc/regfile/regfiles.py
@@ -135,7 +135,7 @@ class RegFiles:
         for (name, kls) in [('int', IntRegs),
                             ('cr', CRRegs),
                             ('xer', XERRegs),
-                            ('fasr', FastRegs),
+                            ('fast', FastRegs),
                             ('spr', SPRRegs),]:
             rf = self.rf[name] = kls()
             setattr(self, name, rf)
diff --git a/src/soc/simple/core.py b/src/soc/simple/core.py
index a8b3b33e..ff7f9277 100644
--- a/src/soc/simple/core.py
+++ b/src/soc/simple/core.py
@@ -8,6 +8,7 @@ from nmigen import Elaboratable, Module, Signal
 from nmigen.cli import rtlil
 
 from nmutil.picker import PriorityPicker
+from nmutil.util import treereduce
 
 from soc.fu.compunits.compunits import AllFunctionUnits
 from soc.regfile.regfiles import RegFiles
@@ -15,6 +16,11 @@ from soc.decoder.power_decoder import create_pdecode
 from soc.decoder.power_decoder2 import PowerDecode2
 
 
+
+def ortreereduce(tree, attr="data_o"):
+    return treereduce(tree, operator.or_, lambda x: getattr(x, attr))
+
+
 class NonProductionCore(Elaboratable):
     def __init__(self):
         self.fus = AllFunctionUnits()
@@ -73,14 +79,27 @@ class NonProductionCore(Elaboratable):
         rdpickers = {}
         for regfile, spec in byregfiles_rd.items():
             rdpickers[regfile] = {}
-            for idx, fuspec in spec.items():
+            for rpidx, (idx, fuspec) in enumerate(spec.items()):
+                # select the required read port.  these are pre-defined sizes
+                print (regfile, regs.rf.keys())
+                rport = regs.rf[regfile.lower()].r_ports[rpidx]
+
+                # create a priority picker to manage this port
                 rdpickers[regfile][idx] = rdpick = PriorityPicker(len(fuspec))
                 setattr(m.submodules, "rdpick_%s_%d" % (regfile, idx), rdpick)
+
+                # connect the regspec "reg select" number to this port
+                (regname, rdflag, read, wid) = byregfiles_rdspec[regfile]
+                comb += rport.ren.eq(read)
+
+                # connect up the FU req/go signals and the reg-read to the FU
                 for pi, (funame, fu) in enumerate(fuspec):
                     # connect request-read to picker input, and output to go-rd
                     fu_active = fu_bitdict[funame]
                     comb += rdpick.i[pi].eq(fu.rd_rel_o[idx] & fu_active)
                     comb += fu.go_rd_i[idx].eq(rdpick.o[pi])
+                    # connect regfile port to input
+                    comb += fu.src_i[idx].eq(rport.data_o)
 
         return m
 
-- 
2.30.2