enable extswsli tests, fix spec-patching

diff --git a/libreriscv b/libreriscv
index cde4b6519f6f23520899e1c1bba71548746015ec..a0ed154f4604d296ffc77e0489c4c0f2e23c94dc 160000 (submodule)
--- a/libreriscv
+++ b/libreriscv
@@ -1 +1 @@
-Subproject commit cde4b6519f6f23520899e1c1bba71548746015ec
+Subproject commit a0ed154f4604d296ffc77e0489c4c0f2e23c94dc

diff --git a/src/soc/decoder/isa/fixedshift.patch b/src/soc/decoder/isa/fixedshift.patch
index 442f9f91af5f971fb5211dc73fb1f26dc7f17f87..add7103f5890bc00ec66107f812e8e83dd726502 100644 (file)
--- a/src/soc/decoder/isa/fixedshift.patch
+++ b/src/soc/decoder/isa/fixedshift.patch
@@ -56,7 +56,7 @@
  
      @inject()
      def op_rldicl(self, RS):
--        n = concat(sh[5], sh[0:5])
+-        n = sh
 +        n = sh
          r = ROTL64(RS, n)
          b = concat(mb[5], mb[0:5])
@@ -65,7 +65,7 @@
  
      @inject()
      def op_rldicl_(self, RS):
--        n = concat(sh[5], sh[0:5])
+-        n = sh
 +        n = sh
          r = ROTL64(RS, n)
          b = concat(mb[5], mb[0:5])
@@ -74,7 +74,7 @@
  
      @inject()
      def op_rldicr(self, RS):
--        n = concat(sh[5], sh[0:5])
+-        n = sh
 +        n = sh
          r = ROTL64(RS, n)
          e = concat(me[5], me[0:5])
@@ -83,7 +83,7 @@
  
      @inject()
      def op_rldicr_(self, RS):
--        n = concat(sh[5], sh[0:5])
+-        n = sh
 +        n = sh
          r = ROTL64(RS, n)
          e = concat(me[5], me[0:5])
@@ -92,7 +92,7 @@
  
      @inject()
      def op_rldic(self, RS):
--        n = concat(sh[5], sh[0:5])
+-        n = sh
 +        n = sh
          r = ROTL64(RS, n)
          b = concat(mb[5], mb[0:5])
@@ -101,7 +101,7 @@
  
      @inject()
      def op_rldic_(self, RS):
--        n = concat(sh[5], sh[0:5])
+-        n = sh
 +        n = sh
          r = ROTL64(RS, n)
          b = concat(mb[5], mb[0:5])

diff --git a/src/soc/fu/shift_rot/test/test_pipe_caller.py b/src/soc/fu/shift_rot/test/test_pipe_caller.py
index 5a56f0176e477c89da7113254f3daac6819a3152..f19ba4d3e618aace90f3ed62f299380a6c598644 100644 (file)
--- a/src/soc/fu/shift_rot/test/test_pipe_caller.py
+++ b/src/soc/fu/shift_rot/test/test_pipe_caller.py
@@ -148,7 +148,7 @@ class ShiftRotTestCase(FHDLTestCase):
         initial_regs[1] = 0x5678
         self.run_tst_program(Program(lst, bigendian), initial_regs)
 
-    def tst_extswsli(self):
+    def test_extswsli(self):
         for i in range(40):
             sh = random.randint(0, 63)
             lst = [f"extswsli 3, 1, {sh}"]