Revert "fix PowerDecoder2 to properly decode scalar EXTRA2"

Luke wants all changes to EXTRA2/3 decoding to be in one commit, restore to original state

This reverts commit 630dfa6c8b6633d66d1a41368dfad927754846ed.

diff --git a/src/openpower/decoder/power_svp64_extra.py b/src/openpower/decoder/power_svp64_extra.py
index 620f0660c4b7113327f8b0a04bb3c6aacfbf6741..c956eb99c2bee9c1bbb98d00fda15a353ce0a25a 100644 (file)
--- a/src/openpower/decoder/power_svp64_extra.py
+++ b/src/openpower/decoder/power_svp64_extra.py
@@ -105,11 +105,8 @@ class SVP64RegExtra(SVP64ExtraSpec):
         with m.If(self.isvec):
             # Vector: shifted up, extra in LSBs (RA << 2) | spec[1:2]
             comb += self.reg_out.eq(Cat(spec_aug, self.reg_in))
-        with m.Elif(self.etype == SVEType.EXTRA2):
-            # Scalar EXTRA2: not shifted up, extra in MSBs RA | (spec[1] << 5)
-            comb += self.reg_out.eq(Cat(self.reg_in, spec_aug[1]))
-        with m.Elif(self.etype == SVEType.EXTRA3):
-            # Scalar EXTRA3: not shifted up, extra in MSBs RA | (spec[1:2] << 5)
+        with m.Else():
+            # Scalar: not shifted up, extra in MSBs RA | (spec[1:2] << 5)
             comb += self.reg_out.eq(Cat(self.reg_in, spec_aug))
 
         return m