From 278ac5e0eb79bd5aee0434f9bc97fcead2b88109 Mon Sep 17 00:00:00 2001 From: Paul Mackerras Date: Mon, 6 Apr 2020 13:07:00 +1000 Subject: [PATCH] Remove sim_config instruction It's not used any more, and it's not in the ISA. Signed-off-by: Paul Mackerras --- decode1.vhdl | 4 ---- decode_types.vhdl | 2 +- execute1.vhdl | 5 ----- 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/decode1.vhdl b/decode1.vhdl index c35d916..5ee5176 100644 --- a/decode1.vhdl +++ b/decode1.vhdl @@ -345,7 +345,6 @@ architecture behaviour of decode1 is constant attn_instr : decode_rom_t := (ALU, OP_ATTN, NONE, NONE, NONE, NONE, '0', '0', '0', '0', ZERO, '0', NONE, '0', '0', '0', '0', '0', '0', NONE, '0', '1'); constant nop_instr : decode_rom_t := (ALU, OP_NOP, NONE, NONE, NONE, NONE, '0', '0', '0', '0', ZERO, '0', NONE, '0', '0', '0', '0', '0', '0', NONE, '0', '0'); constant sc_instr : decode_rom_t := (ALU, OP_SC, NONE, NONE, NONE, NONE, '0', '0', '0', '0', ZERO, '0', NONE, '0', '0', '0', '0', '0', '0', NONE, '0', '0'); - constant sim_cfg_instr : decode_rom_t := (ALU, OP_SIM_CONFIG,NONE, NONE, NONE, RT, '0', '0', '0', '0', ZERO, '0', NONE, '0', '0', '0', '0', '0', '0', NONE, '0', '1'); begin decode1_0: process(clk) @@ -406,9 +405,6 @@ begin elsif std_match(f_in.insn, "010001--------------0000000---1-") then report "PPC_sc"; v.decode := sc_instr; - elsif std_match(f_in.insn, "000001---------------0000000011-") then - report "PPC_SIM_CONFIG"; - v.decode := sim_cfg_instr; elsif std_match(f_in.insn, "000000---------------0100000000-") then report "PPC_attn"; v.decode := attn_instr; diff --git a/decode_types.vhdl b/decode_types.vhdl index fe30005..07c486a 100644 --- a/decode_types.vhdl +++ b/decode_types.vhdl @@ -17,7 +17,7 @@ package decode_types is OP_RLC, OP_RLCL, OP_RLCR, OP_SC, OP_SETB, OP_SHL, OP_SHR, OP_SYNC, OP_TRAP, - OP_XOR, OP_SIM_CONFIG + OP_XOR ); type input_reg_a_t is (NONE, RA, RA_OR_ZERO, SPR); type input_reg_b_t is (NONE, RB, CONST_UI, CONST_SI, CONST_SI_HI, CONST_UI_HI, CONST_LI, CONST_BD, CONST_DS, CONST_M1, CONST_SH, CONST_SH32, SPR); diff --git a/execute1.vhdl b/execute1.vhdl index d6ba3f6..0aff3df 100644 --- a/execute1.vhdl +++ b/execute1.vhdl @@ -743,11 +743,6 @@ begin set_carry(v.e, rotator_carry, rotator_carry); end if; result_en := '1'; - when OP_SIM_CONFIG => - -- bit 0 was used to select the microwatt console, which - -- we no longer support. - result := x"0000000000000000"; - result_en := '1'; when OP_ISYNC => f_out.redirect <= '1'; -- 2.30.2