Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

RVFI - Illegal and mstatus #925

Merged
merged 3 commits into from
Dec 22, 2023
Merged

RVFI - Illegal and mstatus #925

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
68497d2
RVFI - Better illegal reporting
Dec 21, 2023
115d5f8
RVFI - better mstatus_fs updates caused by flw
Dec 21, 2023
01d399a
Running verible
Dec 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions bhv/cv32e40p_rvfi.sv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1282,7 +1282,7 @@ insn_trace_t trace_if, trace_id, trace_ex, trace_ex_next, trace_wb;
end
trace_id.init(trace_if);
trace_id.m_trap = ~r_pipe_freeze_trace.minstret;
trace_id.m_is_illegal = r_pipe_freeze_trace.is_illegal;
trace_id.m_is_illegal = trace_id.m_is_illegal | r_pipe_freeze_trace.is_illegal;
s_is_pc_set = 1'b0;
s_is_irq_start = 1'b0;
trace_if.m_valid = 1'b0;
Expand Down Expand Up @@ -1531,7 +1531,7 @@ insn_trace_t trace_if, trace_id, trace_ex, trace_ex_next, trace_wb;
trace_ex.m_got_first_data = 1'b1;
end

if (r_pipe_freeze_trace.csr.fregs_we) begin
if (r_pipe_freeze_trace.csr.fregs_we && !r_pipe_freeze_trace.apu_rvalid) begin //Catching mstatus_fs updates caused by flw
`CSR_FROM_PIPE(ex, mstatus_fs)
trace_ex.m_csr.mstatus_fs_we = 1'b1;
trace_ex.m_csr.mstatus_fs_wmask = '1;
Expand Down Expand Up @@ -1778,15 +1778,20 @@ insn_trace_t trace_if, trace_id, trace_ex, trace_ex_next, trace_wb;
end

//IF_STAGE
if(trace_if.m_valid) begin
if(r_pipe_freeze_trace.is_illegal && r_pipe_freeze_trace.is_decoding) begin
trace_if.m_is_illegal = 1'b1;
end
end

if (r_pipe_freeze_trace.if_valid && r_pipe_freeze_trace.if_ready) begin
if (trace_if.m_valid) begin
if (r_pipe_freeze_trace.id_valid && r_pipe_freeze_trace.id_ready && !trace_id.m_valid && r_pipe_freeze_trace.ebrk_insn_dec) begin
if_to_id();
trace_id.m_is_ebreak = '1; //trace_if.m_is_ebreak;
->e_if_2_id_2;
end else if (r_pipe_freeze_trace.is_illegal && r_pipe_freeze_trace.is_decoding) begin
end else if (trace_if.m_is_illegal) begin
if_to_id();
trace_id.m_is_illegal = 1'b1;
->e_if_2_id_3;
end else if (r_pipe_freeze_trace.ecall_insn_dec) begin
if_to_id();
Expand Down
Loading