From: Michael Nolan <mtnolan2640@gmail.com>
Date: Thu, 19 Mar 2020 15:41:03 +0000 (-0400)
Subject: Add assertions for input registers
X-Git-Tag: div_pipeline~1678
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=cfbe3bc75b57c9e124bdcfddf8edabf9419414ee;p=soc.git

Add assertions for input registers
---

diff --git a/src/soc/decoder/test/test_decoder_gas.py b/src/soc/decoder/test/test_decoder_gas.py
index d575f9b1..0f298a9e 100644
--- a/src/soc/decoder/test/test_decoder_gas.py
+++ b/src/soc/decoder/test/test_decoder_gas.py
@@ -6,9 +6,10 @@ import os
 import unittest
 from soc.decoder.power_decoder import (create_pdecode)
 from soc.decoder.power_enums import (Function, InternalOp,
-                         In1Sel, In2Sel,In3Sel,
-                         OutSel, RC, LdstLen, CryIn, single_bit_flags,
-                         get_signal_name, get_csv)
+                                     In1Sel, In2Sel,In3Sel,
+                                     OutSel, RC, LdstLen, CryIn,
+                                     single_bit_flags, Form,
+                                     get_signal_name, get_csv)
 from soc.decoder.power_decoder2 import (PowerDecode2)
 import tempfile
 import subprocess
@@ -88,9 +89,18 @@ class DecoderTestCase(FHDLTestCase):
                 yield Delay(1e-6)
 
                 r1sel = yield pdecode2.e.write_reg.data
-                r2sel = yield pdecode2.e.read_reg2.data
-                r3sel = yield pdecode2.e.read_reg3.data
+                r3sel = yield pdecode2.e.read_reg2.data
+
+                # For some reason r2 gets decoded either in read_reg1
+                # or read_reg3
+                form = yield pdecode2.dec.op.form
+                if form == Form.X.value:
+                    r2sel = yield pdecode2.e.read_reg3.data
+                else:
+                    r2sel = yield pdecode2.e.read_reg1.data
                 assert(r1sel == r1.num)
+                assert(r3sel == r3.num)
+                assert(r2sel == r2.num)
                 
         sim.add_process(process)
         with sim.write_vcd("gas.vcd", "gas.gtkw", traces=[pdecode2.ports()]):