github-mirrors/ibex
1
0
Fork 0
mirror of https://github.com/lowRISC/ibex.git synced 2025-04-23 05:17:12 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Potentially fix LS instruction bug introduced with last commit

Browse source
This commit is contained in:
Markus Wegmann 2016-12-02 11:58:25 +01:00
parent 5307658e69
commit 0f74c425ad
2 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
decoder.sv
View file

@ -326,15 +326,15 @@ module riscv_decoder
// pass write data through ALU operand c
alu_op_c_mux_sel_o = OP_C_REGB_OR_FWD;
// CONFIG_REGION: PREPOST_SUPPORT
`ifdef PREPOST_SUPPORT
// post-increment setup
if (instr_rdata_i[6:0] == OPCODE_STORE_POST) begin
// CONFIG_REGION: PREPOST_SUPPORT
`ifdef PREPOST_SUPPORT
prepost_useincr_o = 1'b0;
`endif // PREPOST_SUPPORT
regfile_alu_waddr_sel_o = 1'b0;
regfile_alu_we = 1'b1;
end
`endif // PREPOST_SUPPORT
if (instr_rdata_i[14] == 1'b0) begin
// offset from immediate
@ -372,15 +372,15 @@ module riscv_decoder
alu_op_b_mux_sel_o = OP_B_IMM;
imm_b_mux_sel_o = IMMB_I;
// CONFIG_REGION: PREPOST_SUPPORT
`ifdef PREPOST_SUPPORT
// post-increment setup
if (instr_rdata_i[6:0] == OPCODE_LOAD_POST) begin
// CONFIG_REGION: PREPOST_SUPPORT
`ifdef PREPOST_SUPPORT
prepost_useincr_o = 1'b0;
`endif // PREPOST_SUPPORT
regfile_alu_waddr_sel_o = 1'b0;
regfile_alu_we = 1'b1;
end
`endif // PREPOST_SUPPORT
// sign/zero extension
data_sign_extension_o = ~instr_rdata_i[14];

2
id_stage.sv
View file

@ -1256,6 +1256,8 @@ always_ff @(posedge clk, negedge rst_n)
begin
alu_operand_a_ex_o <= alu_operand_a;
end
`else
alu_operand_a_ex_o <= alu_operand_a;
`endif // PREPOST_SUPPORT
alu_operand_b_ex_o <= alu_operand_b;
regfile_alu_we_ex_o <= regfile_alu_we_id;