IPCores/lm32_cpu / file diff

     1.1 --- a/lm32_cpu.v	Tue Apr 06 18:27:55 2010 +0100
     1.2 +++ b/lm32_cpu.v	Fri Aug 13 01:15:02 2010 +0100
     1.3 @@ -536,7 +536,6 @@
     1.4  `endif
     1.5  wire direction_d;                               // Which direction to shift in
     1.6  reg direction_x;                                        
     1.7 -reg direction_m;
     1.8  wire [`LM32_WORD_RNG] shifter_result_m;         // Result of shifter
     1.9  `endif
    1.10  `ifdef CFG_MC_BARREL_SHIFT_ENABLED
    1.11 @@ -789,7 +788,6 @@
    1.12      .i_dat_i                (I_DAT_I),
    1.13      .i_ack_i                (I_ACK_I),
    1.14      .i_err_i                (I_ERR_I),
    1.15 -    .i_rty_i                (I_RTY_I),
    1.16  `endif
    1.17  `ifdef CFG_HW_DEBUG_ENABLED
    1.18      .jtag_read_enable       (jtag_read_enable),
    1.19 @@ -932,7 +930,6 @@
    1.20      .stall_a                (stall_a),
    1.21      .stall_x                (stall_x),
    1.22      .stall_m                (stall_m),
    1.23 -    .kill_x                 (kill_x),
    1.24      .kill_m                 (kill_m),
    1.25      .exception_m            (exception_m),
    1.26      .store_operand_x        (store_operand_x),
    1.27 @@ -957,7 +954,6 @@
    1.28      .d_dat_i                (D_DAT_I),
    1.29      .d_ack_i                (D_ACK_I),
    1.30      .d_err_i                (D_ERR_I),
    1.31 -    .d_rty_i                (D_RTY_I),
    1.32      // ----- Outputs -------
    1.33      // To pipeline
    1.34  `ifdef CFG_DCACHE_ENABLED
    1.35 @@ -2264,8 +2260,8 @@
    1.36  `endif
    1.37  `ifdef CFG_SIGN_EXTEND_ENABLED
    1.38          x_result_sel_sext_x <= `FALSE;
    1.39 -`endif    
    1.40 -        x_result_sel_logic_x <= `FALSE;
    1.41 +`endif  
    1.42 +	x_result_sel_logic_x <= `FALSE;
    1.43  `ifdef CFG_USER_ENABLED
    1.44          x_result_sel_user_x <= `FALSE;
    1.45  `endif
    1.46 @@ -2331,9 +2327,6 @@
    1.47          exception_m <= `FALSE;
    1.48          load_m <= `FALSE;
    1.49          store_m <= `FALSE;
    1.50 -`ifdef CFG_PL_BARREL_SHIFT_ENABLED
    1.51 -        direction_m <= `FALSE;
    1.52 -`endif
    1.53          write_enable_m <= `FALSE;            
    1.54          write_idx_m <= {`LM32_REG_IDX_WIDTH{1'b0}};
    1.55          condition_met_m <= `FALSE;
    1.56 @@ -2384,7 +2377,7 @@
    1.57  `ifdef CFG_SIGN_EXTEND_ENABLED
    1.58              x_result_sel_sext_x <= x_result_sel_sext_d;
    1.59  `endif    
    1.60 -            x_result_sel_logic_x <= x_result_sel_logic_d;
    1.61 +	    x_result_sel_logic_x <= x_result_sel_logic_d;
    1.62  `ifdef CFG_USER_ENABLED
    1.63              x_result_sel_user_x <= x_result_sel_user_d;
    1.64  `endif
    1.65 @@ -2458,7 +2451,6 @@
    1.66              end
    1.67              m_bypass_enable_m <= m_bypass_enable_x;
    1.68  `ifdef CFG_PL_BARREL_SHIFT_ENABLED
    1.69 -            direction_m <= direction_x;
    1.70  `endif
    1.71              load_m <= load_x;
    1.72              store_m <= store_x;