whoops realised src1/2 need to receive reg data, not reg #
authorLuke Kenneth Casson Leighton <lkcl@lkcl.net>
Wed, 8 Apr 2020 14:54:09 +0000 (15:54 +0100)
committerLuke Kenneth Casson Leighton <lkcl@lkcl.net>
Wed, 8 Apr 2020 14:54:09 +0000 (15:54 +0100)
src/soc/experiment/compalu.py

index 18bbb208ab2a136d8271f20b243d388dcc6dc050..13884c503342095ea7668f8fc9e84e9e24f99e74 100644 (file)
@@ -62,8 +62,8 @@ class ComputationUnitNoDelay(Elaboratable):
         # operation / data input
         self.oper_i = e.insn_type    # operand
         self.imm_i =  e.imm_data      # immediate in
-        self.src1_i = e.read_reg1    # oper1 in
-        self.src2_i = e.read_reg2    # oper2 in
+        self.src1_i = Signal(rwid, reset_less=True) # oper1 in
+        self.src2_i = Signal(rwid, reset_less=True) # oper2 in
 
         self.busy_o = Signal(reset_less=True) # fn busy out
         self.data_o = Signal(rwid, reset_less=True) # Dest out
@@ -164,8 +164,8 @@ class ComputationUnitNoDelay(Elaboratable):
         yield self.go_die_i
         yield self.oper_i
         yield from self.imm_i.ports()
-        yield from self.src1_i.ports()
-        yield from self.src2_i.ports()
+        yield self.src1_i
+        yield self.src2_i
         yield self.busy_o
         yield self.rd_rel_o
         yield self.req_rel_o