Fix missing config region declarations

This commit is contained in:
Markus Wegmann 2017-01-09 15:17:21 +01:00
parent 1e4223ab84
commit 175366f593
5 changed files with 6 additions and 3 deletions

1
alu.sv
View file

@ -46,6 +46,7 @@ module riscv_alu
input logic [ 4:0] bmask_a_i,
input logic [ 4:0] bmask_b_i,
`endif // BIT_SUPPORT
// CONFIG_REGION: VEC_SUPPORT
`ifdef VEC_SUPPORT
input logic [ 1:0] imm_vec_ext_i,
`endif // VEC_SUPPORT

View file

@ -663,6 +663,7 @@ module riscv_controller
// CONFIG_REGION: MERGE_ID_EX
`ifdef MERGE_ID_EX
// CONFIG_REGION: NO_JUMP_ADDER
`ifdef NO_JUMP_ADDER
WAIT_BRANCH_EX:
begin

View file

@ -164,7 +164,7 @@ module riscv_ex_stage
`ifdef MUL_SUPPORT
assign regfile_alu_wdata_fw_o = mult_en_i ? mult_result : alu_csr_result;
`else
// CONFIG_REGION
// CONFIG_REGION: NO_JUMP_ADDER
`ifdef NO_JUMP_ADDER
assign regfile_alu_wdata_fw_o = jal_in_ex_i ? alu_operand_c_i : alu_csr_result; // Select return address
`else

View file

@ -1174,6 +1174,7 @@ module riscv_id_stage
// Register file control signals
.regfile_mem_we_o ( regfile_we_id ),
.regfile_alu_we_o ( regfile_alu_we_id ),
// CONFIG_REGION: THREE_PORT_REG_FILE
`ifdef THREE_PORT_REG_FILE
.regfile_alu_waddr_sel_o ( regfile_alu_waddr_mux_sel ),
`endif // THREE_PORT_REG_FILE

View file

@ -616,7 +616,7 @@ module riscv_tracer
while(1) begin
instr_ex.get(trace);
// CONFIG_REGION MERGE_ID_EX
// CONFIG_REGION: MERGE_ID_EX
`ifndef MERGE_ID_EX
// wait until we are going to the next stage
do begin
@ -640,7 +640,7 @@ module riscv_tracer
trace.mem_access.push_back(mem_acc);
end
// CONFIG_REGION MERGE_ID_EX
// CONFIG_REGION: MERGE_ID_EX
`ifndef MERGE_ID_EX
end while (!ex_valid && !wb_bypass); // ex branches bypass the WB stage
`endif