From: Luke Kenneth Casson Leighton <lkcl@lkcl.net>
Date: Mon, 1 Jun 2020 18:45:01 +0000 (+0100)
Subject: remove use of reg3 in logical pipeline: CSV files moved RS to position 1
X-Git-Tag: div_pipeline~674
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=480241bf6d0fcc00389e977cc063a340fd7687e6;p=soc.git

remove use of reg3 in logical pipeline: CSV files moved RS to position 1
---

diff --git a/libreriscv b/libreriscv
index ce306bad..177088bd 160000
--- a/libreriscv
+++ b/libreriscv
@@ -1 +1 @@
-Subproject commit ce306badc535e08b5fc5e061b26290dce44166ff
+Subproject commit 177088bdebe14a2e1173f8302127bbde504c3116
diff --git a/src/soc/fu/logical/test/test_pipe_caller.py b/src/soc/fu/logical/test/test_pipe_caller.py
index 04778c63..c8f1ebc2 100644
--- a/src/soc/fu/logical/test/test_pipe_caller.py
+++ b/src/soc/fu/logical/test/test_pipe_caller.py
@@ -29,13 +29,8 @@ def set_alu_inputs(alu, dec2, sim):
     # detect the immediate here (with m.If(self.i.ctx.op.imm_data.imm_ok))
     # and place it into data_i.b
 
-    reg3_ok = yield dec2.e.read_reg3.ok
     reg1_ok = yield dec2.e.read_reg1.ok
-    assert reg3_ok != reg1_ok
-    if reg3_ok:
-        data1 = yield dec2.e.read_reg3.data
-        data1 = sim.gpr(data1).value
-    elif reg1_ok:
+    if reg1_ok:
         data1 = yield dec2.e.read_reg1.data
         data1 = sim.gpr(data1).value
     else: