correctly identify atomic reservation CSV file field and

copy into op in PowerDecoder2

diff --git a/src/openpower/decoder/power_decoder.py b/src/openpower/decoder/power_decoder.py
index 4f7ab855543d3712680272808f6fc582ae72e932..080bd65f7b4dc285ff6a9b7f5d2d16fd4e485833 100644 (file)
--- a/src/openpower/decoder/power_decoder.py
+++ b/src/openpower/decoder/power_decoder.py
@@ -163,7 +163,7 @@ power_op_csvmap = {'function_unit': 'unit',
                    'cr_out': 'CR out',
                    'ldst_len': 'ldst len',
                    'upd': 'upd',
-                   'rsrv': 'reserve', # atomic operation
+                   'rsrv': 'rsrv', # atomic operation
                    'rc_sel': 'rc',
                    'cry_in': 'cry in',
                    }

diff --git a/src/openpower/decoder/power_decoder2.py b/src/openpower/decoder/power_decoder2.py
index 923c8ed1e01e24c202764c5b54258e237397db27..a636fdf5160cbfa680cdbf8ea36bced0304ca7f7 100644 (file)
--- a/src/openpower/decoder/power_decoder2.py
+++ b/src/openpower/decoder/power_decoder2.py
@@ -756,6 +756,7 @@ record_names = {'insn_type': 'internal_op',
                 'is_signed': 'sgn',
                 'lk': 'lk',
                 'data_len': 'ldst_len',
+                'reserve': 'rsrv',
                 'byte_reverse': 'br',
                 'sign_extend': 'sgn_ext',
                 'ldst_mode': 'upd',
@@ -1063,6 +1064,7 @@ class PowerDecodeSubset(Elaboratable):
         comb += self.do_copy("byte_reverse", self.op_get("br"))
         comb += self.do_copy("sign_extend", self.op_get("sgn_ext"))
         comb += self.do_copy("ldst_mode", self.op_get("upd"))  # LD/ST mode
+        comb += self.do_copy("reserve", self.op_get("rsrv"))  # atomic
 
         # copy over SVP64 input record fields (if they exist)
         if self.svp64_en: