Fix weirdness with rldicl and friends in test_caller.py

diff --git a/src/soc/decoder/isa/fixedshift.patch b/src/soc/decoder/isa/fixedshift.patch
index 42fc2ac62895d20d752e634e55a7c507714dd9a8..442f9f91af5f971fb5211dc73fb1f26dc7f17f87 100644 (file)
--- a/src/soc/decoder/isa/fixedshift.patch
+++ b/src/soc/decoder/isa/fixedshift.patch
@@ -1,5 +1,5 @@
 --- fixedshift.py.orig 2020-05-11 10:20:55.781417649 -0400
-+++ fixedshift.py      2020-05-13 14:02:01.147691354 -0400
++++ fixedshift.py      2020-05-13 16:22:30.896089413 -0400
 @@ -13,7 +13,7 @@
      def op_rlwinm(self, RS):
          n = SH
@@ -45,7 +45,7 @@
          RA = r & m | RA & ~m
          return (RA,)
  
-@@ -53,7 +53,7 @@
+@@ -53,13 +53,13 @@
      def op_rlwimi_(self, RS, RA):
          n = SH
          r = ROTL32(RS[32:64], n)
@@ -54,6 +54,58 @@
          RA = r & m | RA & ~m
          return (RA,)
  
+     @inject()
+     def op_rldicl(self, RS):
+-        n = concat(sh[5], sh[0:5])
++        n = sh
+         r = ROTL64(RS, n)
+         b = concat(mb[5], mb[0:5])
+         m = MASK(b, 63)
+@@ -68,7 +68,7 @@
+ 
+     @inject()
+     def op_rldicl_(self, RS):
+-        n = concat(sh[5], sh[0:5])
++        n = sh
+         r = ROTL64(RS, n)
+         b = concat(mb[5], mb[0:5])
+         m = MASK(b, 63)
+@@ -77,7 +77,7 @@
+ 
+     @inject()
+     def op_rldicr(self, RS):
+-        n = concat(sh[5], sh[0:5])
++        n = sh
+         r = ROTL64(RS, n)
+         e = concat(me[5], me[0:5])
+         m = MASK(0, e)
+@@ -86,7 +86,7 @@
+ 
+     @inject()
+     def op_rldicr_(self, RS):
+-        n = concat(sh[5], sh[0:5])
++        n = sh
+         r = ROTL64(RS, n)
+         e = concat(me[5], me[0:5])
+         m = MASK(0, e)
+@@ -95,7 +95,7 @@
+ 
+     @inject()
+     def op_rldic(self, RS):
+-        n = concat(sh[5], sh[0:5])
++        n = sh
+         r = ROTL64(RS, n)
+         b = concat(mb[5], mb[0:5])
+         m = MASK(b, ~n)
+@@ -104,7 +104,7 @@
+ 
+     @inject()
+     def op_rldic_(self, RS):
+-        n = concat(sh[5], sh[0:5])
++        n = sh
+         r = ROTL64(RS, n)
+         b = concat(mb[5], mb[0:5])
+         m = MASK(b, ~n)
 @@ -168,9 +168,9 @@
      @inject()
      def op_slw(self, RB, RS):

diff --git a/src/soc/decoder/isa/test_caller.py b/src/soc/decoder/isa/test_caller.py
index 239e1d462c7c164ffc9f7393a4ab710271968438..4050fab35a311292fba8f522d34a36ae5d1773cd 100644 (file)
--- a/src/soc/decoder/isa/test_caller.py
+++ b/src/soc/decoder/isa/test_caller.py
@@ -222,6 +222,14 @@ class DecoderTestCase(FHDLTestCase):
             sim = self.run_tst_program(program, initial_regs)
             self.assertEqual(sim.gpr(3), SelectableInt(0xd5b7ddfbd4345dfb, 64))
 
+    def test_rldic(self):
+        lst = ["rldic 3, 1, 5, 20"]
+        initial_regs = [0] * 32
+        initial_regs[1] = 0xdeadbeefcafec0de
+        with Program(lst) as program:
+            sim = self.run_tst_program(program, initial_regs)
+            self.assertEqual(sim.gpr(3), SelectableInt(0xdf95fd81bc0, 64))
+
     def test_mtcrf(self):
         for i in range(4):
             # 0x76540000 gives expected (3+4) (2+4) (1+4) (0+4) for