colin
/
Hazard3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleanup to avoid negative array index (legal but causes whinging)

This commit is contained in:
Luke Wren 2022-08-20 18:13:45 +01:00
parent 3b7cd9bc96
commit b994674c5a
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hdl/hazard3_csr.v
View File

@ -441,7 +441,7 @@ reg [NUM_IRQS-1:0] eirq_active_above_ppreempt;
always @ (*) begin: eirq_compare always @ (*) begin: eirq_compare
integer i; integer i;
for (i = 0; i < NUM_IRQS; i = i + 1) begin for (i = 0; i < NUM_IRQS; i = i + 1) begin
eirq_active_above_preempt[i] = meipa[i] && meiea[i] && meipra[i * 4 +: 4] >= meicontext_preempt; eirq_active_above_preempt[i] = meipa[i] && meiea[i] && {1'b0, meipra[i * 4 +: 4]} >= meicontext_preempt;
eirq_active_above_ppreempt[i] = meipa[i] && meiea[i] && meipra[i * 4 +: 4] >= meicontext_ppreempt; eirq_active_above_ppreempt[i] = meipa[i] && meiea[i] && meipra[i * 4 +: 4] >= meicontext_ppreempt;
end end
end end

11
hdl/hazard3_frontend.v
View File

@ -105,10 +105,10 @@ reg [1:0] mem_data_predbranch;
// to decode the instruction, but until then can be flushed harmlessly. // to decode the instruction, but until then can be flushed harmlessly.
reg [W_DATA-1:0] fifo_mem [0:FIFO_DEPTH]; reg [W_DATA-1:0] fifo_mem [0:FIFO_DEPTH];
reg [FIFO_DEPTH:0] fifo_err; reg fifo_err [0:FIFO_DEPTH];
reg [1:0] fifo_predbranch [0:FIFO_DEPTH]; reg [1:0] fifo_predbranch [0:FIFO_DEPTH];
reg [1:0] fifo_valid_hw [0:FIFO_DEPTH]; reg [1:0] fifo_valid_hw [0:FIFO_DEPTH];
reg [FIFO_DEPTH:-1] fifo_valid; reg fifo_valid [0:FIFO_DEPTH];
wire [W_DATA-1:0] fifo_rdata = fifo_mem[0]; wire [W_DATA-1:0] fifo_rdata = fifo_mem[0];
wire fifo_full = fifo_valid[FIFO_DEPTH - 1]; wire fifo_full = fifo_valid[FIFO_DEPTH - 1];
@ -126,7 +126,6 @@ always @ (*) begin: boundary_conditions
fifo_err[FIFO_DEPTH] = 1'b0; fifo_err[FIFO_DEPTH] = 1'b0;
fifo_valid_hw[FIFO_DEPTH] = 2'b00; fifo_valid_hw[FIFO_DEPTH] = 2'b00;
fifo_valid[FIFO_DEPTH] = 1'b0; fifo_valid[FIFO_DEPTH] = 1'b0;
fifo_valid[-1] = 1'b1;
for (i = 0; i < FIFO_DEPTH; i = i + 1) begin for (i = 0; i < FIFO_DEPTH; i = i + 1) begin
fifo_valid[i] = |EXTENSION_C ? |fifo_valid_hw[i] : fifo_valid_hw[i][0]; fifo_valid[i] = |EXTENSION_C ? |fifo_valid_hw[i] : fifo_valid_hw[i][0];
end end
@ -151,9 +150,9 @@ always @ (posedge clk or negedge rst_n) begin: fifo_update
fifo_valid_hw[i] <= fifo_valid_hw[i] <=
jump_now ? 2'h0 : jump_now ? 2'h0 :
fifo_valid[i + 1] && fifo_pop ? fifo_valid_hw[i + 1] : fifo_valid[i + 1] && fifo_pop ? fifo_valid_hw[i + 1] :
fifo_valid[i] && fifo_pop && !fifo_push ? 2'h0 : fifo_valid[i] && fifo_pop ? mem_data_hwvld & {2{fifo_push}} :
fifo_valid[i] && fifo_pop && fifo_push ? mem_data_hwvld : fifo_valid[i] ? fifo_valid_hw[i] :
!fifo_valid[i] && fifo_valid[i - 1] && fifo_push && !fifo_pop ? mem_data_hwvld : fifo_valid_hw[i]; fifo_push && !fifo_pop && (i == 0 || fifo_valid[i - |i]) ? mem_data_hwvld : 2'h0;
end end
// Allow DM to inject instructions directly into the lowest-numbered // Allow DM to inject instructions directly into the lowest-numbered
// queue entry. This mux should not extend critical path since it is // queue entry. This mux should not extend critical path since it is