changes to LDSTCompUnit, get score6600 working

diff --git a/src/soc/experiment/score6600_multi.py b/src/soc/experiment/score6600_multi.py
index 53d27ee978524659ae370e4515f6ac3f9e3672d1..6469624570e6a9b569bf371474835ed1ecf4c627 100644 (file)
--- a/src/soc/experiment/score6600_multi.py
+++ b/src/soc/experiment/score6600_multi.py
@@ -249,8 +249,7 @@ class CompUnitLDSTs(CompUnitsBase):
 
         units = []
         for alu in self.alus:
-            aluopwid = 4  # see compldst.py for "internal" opcode
-            units.append(LDSTCompUnit(rwid, aluopwid, alu, mem))
+            units.append(LDSTCompUnit(rwid, alu, mem))
 
         CompUnitsBase.__init__(self, rwid, units, ldstmode=True)
 
@@ -261,7 +260,7 @@ class CompUnitLDSTs(CompUnitsBase):
         # hand the same operation to all units, 4 lower bits though
         for alu in self.units:
             comb += alu.oper_i[0:4].eq(self.oper_i)
-            comb += alu.imm_i.eq(self.imm_i)
+            #comb += alu.imm_i.eq(self.imm_i)
             comb += alu.isalu_i.eq(0)
 
         return m