1
0
mirror of https://github.com/antonblanchard/microwatt.git synced 2026-04-05 04:35:00 +00:00

decode1: Fix decoding of recommended NOP instruction

We were decoding nop with the wrong major opcode.  Fix it.

Signed-off-by: Paul Mackerras <paulus@ozlabs.org>
This commit is contained in:
Paul Mackerras
2020-11-26 22:08:47 +11:00
parent 3361c460b8
commit 55f7d99376

View File

@@ -633,10 +633,7 @@ begin
v.ispr2 := fast_spr_num(SPR_SRR0);
end if;
when 30 =>
v.decode := decode_op_30_array(to_integer(unsigned(f_in.insn(4 downto 1))));
when 48 =>
when 24 =>
-- ori, special-case the standard NOP
if std_match(f_in.insn, "01100000000000000000000000000000") then
report "PPC_nop";
@@ -644,6 +641,9 @@ begin
vi.override_decode := nop_instr;
end if;
when 30 =>
v.decode := decode_op_30_array(to_integer(unsigned(f_in.insn(4 downto 1))));
when 58 =>
v.decode := decode_op_58_array(to_integer(unsigned(f_in.insn(1 downto 0))));