From 55f7d99376725f33cf829067b1475d7741f24f52 Mon Sep 17 00:00:00 2001 From: Paul Mackerras Date: Thu, 26 Nov 2020 22:08:47 +1100 Subject: [PATCH] decode1: Fix decoding of recommended NOP instruction We were decoding nop with the wrong major opcode. Fix it. Signed-off-by: Paul Mackerras --- decode1.vhdl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/decode1.vhdl b/decode1.vhdl index 6624a53..cfcf424 100644 --- a/decode1.vhdl +++ b/decode1.vhdl @@ -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))));