RFVI update in trace_apu_req found by hwloop single-stepping in debug…

… mode.

Signed-off-by: Pascal Gouedo <[email protected]>

bhv/cv32e40p_rvfi.sv

@@ -1115,6 +1115,23 @@ insn_trace_t trace_if, trace_id, trace_ex, trace_ex_next, trace_wb;
     trace_apu_req.m_csr.tinfo_wdata = r_pipe_freeze_trace.csr.tinfo_n;
     trace_apu_req.m_csr.tinfo_wmask = '0;
 
+    trace_apu_req.m_csr.minstret_we    = r_pipe_freeze_trace.csr.mhpmcounter_write_lower[2];
+    trace_apu_req.m_csr.minstret_rdata = r_pipe_freeze_trace.csr.mhpmcounter_q[2];
+    trace_apu_req.m_csr.minstret_rmask = '1;
+    trace_apu_req.m_csr.minstret_wdata = r_pipe_freeze_trace.csr.mhpmcounter_q;
+    trace_apu_req.m_csr.minstret_wmask = r_pipe_freeze_trace.csr.mhpmcounter_write_lower[2] ? '1 : '0;
+
+    trace_apu_req.m_csr.lpcount0_we    = '0;
+    trace_apu_req.m_csr.lpcount0_rdata = r_pipe_freeze_trace.hwloop.counter_q[0];
+    trace_apu_req.m_csr.lpcount0_rmask = '1;
+    trace_apu_req.m_csr.lpcount0_wdata = '0;
+    trace_apu_req.m_csr.lpcount0_wmask = '0;
+
+    trace_apu_req.m_csr.lpcount1_we    = '0;
+    trace_apu_req.m_csr.lpcount1_rdata = r_pipe_freeze_trace.hwloop.counter_q[1];
+    trace_apu_req.m_csr.lpcount1_rmask = '1;
+    trace_apu_req.m_csr.lpcount1_wdata = '0;
+    trace_apu_req.m_csr.lpcount1_wmask = '0;
 
     `CSR_FROM_PIPE(apu_req, frm)
 
@@ -1478,7 +1495,7 @@ insn_trace_t trace_if, trace_id, trace_ex, trace_ex_next, trace_wb;
         trace_ex.m_csr.frm_wmask    = '0;
         trace_ex.m_csr.fcsr_wmask   = '0;
 
-        if (r_pipe_freeze_trace.apu_req) begin
+        if (r_pipe_freeze_trace.apu_req && r_pipe_freeze_trace.apu_gnt) begin
           trace_id.m_is_apu = 1'b1;
           trace_id.m_apu_req_id = cnt_apu_req;
           trace_apu_req = new();