Merge pull request #986 from YoannPruvost/dev_RVFI_mastus_fs_when_frm

Setting correct mstatus fs write mask when csrw to frm and correcting cv.beqimm & cv.bneimm printing in log file

Author: davideschiavone

bhv/cv32e40p_instr_trace.svh

@@ -534,7 +534,7 @@ class instr_trace_t;
     begin
       mnemonic = {compressed ? "c." : "", mnemonic};
       regs_read.push_back('{rs1, rs1_value, 0});
-      str =  $sformatf("%-16s %s, %0d", mnemonic, regAddrToStr(rs1), $signed(imm_sb_type));
+      str =  $sformatf("%-16s %s, %0d, %0d", mnemonic, regAddrToStr(rs1), $signed(imm_s2_type), $signed(imm_sb_type));
     end
   endfunction  // printSBInstr
 

bhv/pipe_freeze_trace.sv

@@ -369,7 +369,10 @@ function compute_csr_we();
         r_pipe_freeze_trace.csr.fflags_we = 1'b1;
         r_pipe_freeze_trace.csr.mstatus_fs_we = 1'b1;
       end
-      CSR_FRM:       r_pipe_freeze_trace.csr.frm_we = 1'b1;
+      CSR_FRM: begin
+        r_pipe_freeze_trace.csr.frm_we = 1'b1;
+        r_pipe_freeze_trace.csr.mstatus_fs_we = 1'b1;
+      end
       CSR_FCSR: begin
         r_pipe_freeze_trace.csr.fcsr_we = 1'b1;
         r_pipe_freeze_trace.csr.mstatus_fs_we = 1'b1;