wu-arch/vortex
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

minor update

Browse Source
This commit is contained in:
Blaise Tine
2020-12-01 10:42:14 -08:00
parent 26b5bd10b3
commit 74c9e9ad1f
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hw/rtl/VX_csr_io_arb.v
View File

@@ -73,7 +73,7 @@ module VX_csr_io_arb #(
.flush (1'b0), .flush (1'b0),
.in ({csr_io_rsp_valid_in[rsp_idx], csr_io_rsp_data_in[rsp_idx]}), .in ({csr_io_rsp_valid_in[rsp_idx], csr_io_rsp_data_in[rsp_idx]}),
.out ({csr_io_rsp_valid_out, csr_io_rsp_data_out}) .out ({csr_io_rsp_valid_out, csr_io_rsp_data_out})
); );
for (genvar i = 0; i < NUM_REQUESTS; i++) begin for (genvar i = 0; i < NUM_REQUESTS; i++) begin
assign csr_io_rsp_ready_in[i] = rsp_1hot[i] && ~stall; assign csr_io_rsp_ready_in[i] = rsp_1hot[i] && ~stall;

10
hw/rtl/VX_csr_unit.v
View File

@@ -63,11 +63,11 @@ module VX_csr_unit #(
.busy (busy) .busy (busy)
); );
wire csr_hazard = (csr_addr_s1 == csr_pipe_req_if.csr_addr) wire write_hazard = (csr_addr_s1 == csr_pipe_req_if.csr_addr)
&& (csr_pipe_rsp_if.wid == csr_pipe_req_if.wid) && (csr_pipe_rsp_if.wid == csr_pipe_req_if.wid)
&& csr_pipe_rsp_if.valid; && csr_pipe_rsp_if.valid;
wire [31:0] csr_read_data_qual = csr_hazard ? csr_updated_data_s1 : csr_read_data; wire [31:0] csr_read_data_qual = write_hazard ? csr_updated_data_s1 : csr_read_data;
reg [31:0] csr_updated_data; reg [31:0] csr_updated_data;
@@ -88,7 +88,7 @@ module VX_csr_unit #(
csr_updated_data = csr_read_data_qual & (32'hFFFFFFFF - csr_pipe_req_if.csr_mask); csr_updated_data = csr_read_data_qual & (32'hFFFFFFFF - csr_pipe_req_if.csr_mask);
csr_we_s0_unqual = (csr_pipe_req_if.csr_mask != 0); csr_we_s0_unqual = (csr_pipe_req_if.csr_mask != 0);
end end
default: csr_updated_data = 32'hdeadbeef; default: csr_updated_data = 'x;
endcase endcase
end end

2
hw/rtl/VX_decode.v
View File

@@ -79,7 +79,7 @@ module VX_decode #(
`INST_L, `INST_L,
`INST_FL: src2_imm = {{20{u_12[11]}}, u_12}; `INST_FL: src2_imm = {{20{u_12[11]}}, u_12};
`INST_B: src2_imm = {{20{instr[31]}}, instr[7], instr[30:25], instr[11:8], 1'b0}; `INST_B: src2_imm = {{20{instr[31]}}, instr[7], instr[30:25], instr[11:8], 1'b0};
default: src2_imm = 32'hdeadbeef; default: src2_imm = 'x;
endcase endcase
end end