From: Michael Neuling Date: Thu, 14 Jul 2022 00:31:20 +0000 (+1000) Subject: Metavalue cleanup for execute1.vhdl X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e440db13d759584347d54178685823e84bcdb071;p=microwatt.git Metavalue cleanup for execute1.vhdl Signed-off-by: Michael Neuling --- diff --git a/execute1.vhdl b/execute1.vhdl index 43e79b4..d77b16f 100644 --- a/execute1.vhdl +++ b/execute1.vhdl @@ -1170,12 +1170,12 @@ begin when OP_MFMSR => when OP_MFSPR => if e_in.spr_is_ram = '1' then - if e_in.valid = '1' then + if e_in.valid = '1' and not is_X(e_in.insn) then report "MFSPR to SPR " & integer'image(decode_spr_num(e_in.insn)) & "=" & to_hstring(alu_result); end if; elsif e_in.spr_select.valid = '1' then - if e_in.valid = '1' then + if e_in.valid = '1' and not is_X(e_in.insn) then report "MFSPR to slow SPR " & integer'image(decode_spr_num(e_in.insn)); end if; slow_op := '1'; @@ -1192,7 +1192,7 @@ begin else -- mfspr from unimplemented SPRs should be a nop in -- supervisor mode and a program interrupt for user mode - if e_in.valid = '1' then + if e_in.valid = '1' and not is_X(e_in.insn) then report "MFSPR to SPR " & integer'image(decode_spr_num(e_in.insn)) & " invalid"; end if; @@ -1229,7 +1229,7 @@ begin end if; end if; when OP_MTSPR => - if e_in.valid = '1' then + if e_in.valid = '1' and not is_X(e_in.insn) then report "MTSPR to SPR " & integer'image(decode_spr_num(e_in.insn)) & "=" & to_hstring(c_in); end if;