fix get_masked_reg and add test

diff --git a/src/openpower/decoder/isa/caller.py b/src/openpower/decoder/isa/caller.py
index 1aae2e603c647b889afd7510b30ab13876fa206e..92c761068ad936aefa539245b039de944fa2be50 100644 (file)
--- a/src/openpower/decoder/isa/caller.py
+++ b/src/openpower/decoder/isa/caller.py
@@ -92,16 +92,16 @@ fregs = ['FRA', 'FRB', 'FRC', 'FRS', 'FRT']
 
 def get_masked_reg(regs, base, offs, ew_bits):
     # rrrright.  start by breaking down into row/col, based on elwidth
-    gpr_offs = offs // (64//ew_bits)
-    gpr_col = offs % (64//ew_bits)
+    gpr_offs = offs // (64 // ew_bits)
+    gpr_col = offs % (64 // ew_bits)
     # compute the mask based on ew_bits
-    mask = (1 << ew_bits)-1
+    mask = (1 << ew_bits) - 1
     # now select the 64-bit register, but get its value (easier)
-    val = regs[base+gpr_offs]
-    # now mask out the bit we don't want
-    val = val & ~(mask << (gpr_col*ew_bits))
-    # then return the bits we want, shifted down
-    return val >> (gpr_col*ew_bits)
+    val = regs[base + gpr_offs]
+    # shift down so element we want is at LSB
+    val >>= gpr_col * ew_bits
+    # mask so we only return the LSB element
+    return val & mask
 
 
 def set_masked_reg(regs, base, offs, ew_bits, value):

diff --git a/src/openpower/decoder/isa/test_caller.py b/src/openpower/decoder/isa/test_caller.py
index 5e8ad9c478adb5958debc7aa563cb48eef45434e..48355d7835ccff3f619d3421d0034a89bdce10e7 100644 (file)
--- a/src/openpower/decoder/isa/test_caller.py
+++ b/src/openpower/decoder/isa/test_caller.py
@@ -1,6 +1,7 @@
 import unittest
 
 from nmutil.formaltest import FHDLTestCase
+from openpower.decoder.isa.caller import get_masked_reg, set_masked_reg
 from openpower.decoder.isa.test_runner import run_tst
 from openpower.decoder.selectable_int import SelectableInt
 from openpower.simulator.program import Program
@@ -254,5 +255,19 @@ class DecoderTestCase(FHDLTestCase):
         return simulator
 
 
+class TestGetSetMaskedReg(FHDLTestCase):
+    def test_get_set_masked_reg(self):
+        regs = [0x123456789abcdef, 0xfedcba9876543210,
+                0x2468ace13579bdf, 0xfdb975310eca8642]
+        set_masked_reg(regs, base=2, offs=5, ew_bits=16, value=0x369c)
+        self.assertEqual(list(map(hex, regs)), [
+            "0x123456789abcdef", "0xfedcba9876543210",
+            "0x2468ace13579bdf", "0xfdb97531369c8642"])
+        self.assertEqual(hex(get_masked_reg(regs, base=2, offs=5, ew_bits=16)),
+                         "0x369c")
+        self.assertEqual(hex(get_masked_reg(regs, base=2, offs=0, ew_bits=16)),
+                         "0x9bdf")
+
+
 if __name__ == "__main__":
     unittest.main()