From 2a36e91fe21fad4b91ffe82f53ef3ad873d1aefa Mon Sep 17 00:00:00 2001 From: Luke Kenneth Casson Leighton Date: Mon, 3 Jan 2022 14:04:06 +0000 Subject: [PATCH] copy over msr and rename cia to nia in PowerDecoder2 --- src/openpower/decoder/power_decoder2.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/openpower/decoder/power_decoder2.py b/src/openpower/decoder/power_decoder2.py index 47114888..b8c9726e 100644 --- a/src/openpower/decoder/power_decoder2.py +++ b/src/openpower/decoder/power_decoder2.py @@ -1512,7 +1512,8 @@ class PowerDecode2(PowerDecodeSubset): comb += self.do_copy("insn", self.dec.opcode_in, True) comb += self.do_copy("insn_type", MicrOp.OP_FETCH_FAILED, True) comb += self.do_copy("fn_unit", Function.MMU, True) - comb += self.do_copy("nia", self.state.pc, True) # PC + comb += self.do_copy("cia", self.state.pc, True) # PC + comb += self.do_copy("msr", self.state.msr, True) # MSR # special override on internal_op, due to being a "fake" op comb += self.dec.op.internal_op.eq(MicrOp.OP_FETCH_FAILED) -- 2.30.2