starting to run into things being broken in LD/ST Comp (yay)

[soc.git] / src / experiment / compldst.py

diff --git a/src/experiment/compldst.py b/src/experiment/compldst.py
index f67d75b0a822c2cf19c24645f1cca7d3c1aa03bd..88d49647e41f74c4883a6e7b0b1fef1467d56582 100644 (file)
--- a/src/experiment/compldst.py
+++ b/src/experiment/compldst.py
@@ -52,6 +52,7 @@ class LDSTCompUnit(Elaboratable):
         * :go_die_i:   resets the unit back to "wait for issue"
     """
     def __init__(self, rwid, opwid, alu, mem):
+        self.opwid = opwid
         self.rwid = rwid
         self.alu = alu
         self.mem = mem
@@ -103,7 +104,7 @@ class LDSTCompUnit(Elaboratable):
         comb += reset_s.eq(self.go_st_i | self.go_die_i)
         comb += reset_r.eq(self.go_rd_i | self.go_die_i)
         # this one is slightly different, issue_alu_i selects go_wr_i)
-        a_sel = Mux(self.isalu_i, self.go_wr_i, self.go_ad_i )
+        a_sel = Mux(self.isalu_i, self.go_wr_i, self.go_ad_i)
         comb += reset_a.eq(a_sel| self.go_die_i)
 
         # opcode decode
@@ -113,14 +114,6 @@ class LDSTCompUnit(Elaboratable):
         op_ldst = Signal(reset_less=True)
         op_is_imm = Signal(reset_less=True)
 
-        comb += op_alu.eq(self.oper_i[0])
-        comb += op_is_imm.eq(self.oper_i[1])
-        comb += op_is_ld.eq(self.oper_i[2])
-        comb += op_is_st.eq(self.oper_i[3])
-        comb += op_ldst.eq(op_is_ld | op_is_st)
-        comb += self.load_mem_o.eq(op_is_ld & self.go_ad_i)
-        comb += self.stwd_mem_o.eq(op_is_st & self.go_st_i)
-
         # select immediate or src2 reg to add
         src2_or_imm = Signal(self.rwid, reset_less=True)
         src_sel = Signal(reset_less=True)
@@ -159,7 +152,7 @@ class LDSTCompUnit(Elaboratable):
         comb += self.sto_rel_o.eq(sto_l.q & busy_o & self.shadown_i)
 
         # address release only happens on LD/ST, and is shadowed.
-        comb += self.adr_rel_o.eq(adr_l.q & op_ldst & busy_o & self.shadownn_i)
+        comb += self.adr_rel_o.eq(adr_l.q & op_ldst & busy_o & self.shadown_i)
 
         # request release enabled based on if op is a LD/ST or a plain ALU
         # if op is a LD/ST, req_rel activates from the *address* latch
@@ -189,12 +182,24 @@ class LDSTCompUnit(Elaboratable):
         latchregister(m, src2_or_imm, self.alu.b, src_sel)
 
         # create a latch/register for the operand
-        latchregister(m, Cat(op_alu, 0), self.alu.op, self.issue_i)
+        oper_r = Signal(self.opwid, reset_less=True) # Dest register
+        latchregister(m, self.oper_i, oper_r, self.issue_i)
+        alu_op = Cat(op_alu, 0, op_is_imm) # using alu_hier, here.
+        comb += self.alu.op.eq(alu_op)
 
         # and one for the output from the ALU
         data_r = Signal(self.rwid, reset_less=True) # Dest register
         latchregister(m, self.alu.o, data_r, req_l.q)
 
+        # decode bits of operand (latched)
+        comb += op_alu.eq(oper_r[0])
+        comb += op_is_imm.eq(oper_r[1])
+        comb += op_is_ld.eq(oper_r[2])
+        comb += op_is_st.eq(oper_r[3])
+        comb += op_ldst.eq(op_is_ld | op_is_st)
+        comb += self.load_mem_o.eq(op_is_ld & self.go_ad_i)
+        comb += self.stwd_mem_o.eq(op_is_st & self.go_st_i)
+
         with m.If(self.go_wr_i):
             comb += self.data_o.eq(data_r)