From: Luke Kenneth Casson Leighton <lkcl@lkcl.net>
Date: Wed, 8 Apr 2020 14:48:48 +0000 (+0100)
Subject: use power decoder InternalOp
X-Git-Tag: div_pipeline~1435^2~34
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c0c0aab2b956c1aec6cf26ba702c5a172364576f;p=soc.git

use power decoder InternalOp
---

diff --git a/src/soc/experiment/alu_hier.py b/src/soc/experiment/alu_hier.py
index f1606198..27331dfd 100644
--- a/src/soc/experiment/alu_hier.py
+++ b/src/soc/experiment/alu_hier.py
@@ -12,6 +12,7 @@ only one cycle (sync)
 from nmigen import Elaboratable, Signal, Module, Const, Mux
 from nmigen.cli import main
 from nmigen.cli import verilog, rtlil
+from soc.decoder.power_enums import InternalOp
 
 import operator
 
@@ -74,7 +75,7 @@ class ALU(Elaboratable):
         self.n_ready_i = Signal()
         self.n_valid_o = Signal()
         self.counter   = Signal(4)
-        self.op  = Signal(2)
+        self.op  = Signal(InternalOp)
         self.a   = Signal(width)
         self.b   = Signal(width)
         self.o   = Signal(width)
@@ -91,6 +92,8 @@ class ALU(Elaboratable):
         m.submodules.sub = sub
         m.submodules.mul = mul
         m.submodules.shf = shf
+
+        # really should not activate absolutely all ALU inputs like this
         for mod in [add, sub, mul, shf]:
             m.d.comb += [
                 mod.a.eq(self.a),
@@ -105,6 +108,14 @@ class ALU(Elaboratable):
                 m.d.sync += self.p_ready_o.eq(1)
 
                 # as this is a "fake" pipeline, just grab the output right now
+                with m.If(self.op == InternalOp.OP_ADD):
+                    m.d.sync += self.o.eq(add.o)
+                with m.Elif(self.op == InternalOp.OP_MUL_L64):
+                    m.d.sync += self.o.eq(mul.o)
+                with m.Elif(self.op == InternalOp.OP_SHR):
+                    m.d.sync += self.o.eq(shf.o)
+                # TODO: SUB
+
                 with m.Switch(self.op):
                     for i, mod in enumerate([add, sub, mul, shf]):
                         with m.Case(i):