From 281795def2d57ad203413bea7012c1148d847384 Mon Sep 17 00:00:00 2001 From: Luke Kenneth Casson Leighton Date: Sat, 15 Jan 2022 19:20:10 +0000 Subject: [PATCH] correctly identify atomic reservation CSV file field and copy into op in PowerDecoder2 --- src/openpower/decoder/power_decoder.py | 2 +- src/openpower/decoder/power_decoder2.py | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/openpower/decoder/power_decoder.py b/src/openpower/decoder/power_decoder.py index 4f7ab855..080bd65f 100644 --- 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 923c8ed1..a636fdf5 100644 --- 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: -- 2.30.2