ISACOV: FIX openhwgroup#1582

Signed-off-by: Ayoub Jalali <[email protected]>

lib/uvm_agents/uvma_isacov/uvma_isacov_instr.sv

@@ -333,11 +333,6 @@ function void uvma_isacov_instr_c::set_valid_flags();
     return;
   end
 
-  if (itype == CSRI_TYPE) begin
-    rd_valid = 1;
-    return;
-  end
-
 endfunction : set_valid_flags
 
 
@@ -392,7 +387,7 @@ function  int  uvma_isacov_instr_c::get_field_imm();
   if (this.itype == CIW_TYPE) begin
     return (dasm_rvc_addi4spn_imm(instr) >> 2);  // Shift 2 because [9:2] to [7:0]
   end
-  if (this.itype == CS_TYPE) begin
+  if (this.itype == CL_TYPE) begin
     return (dasm_rvc_lw_imm(instr) >> 2);  // Shift 2 because [6:2] to [4:0]
   end
   if (this.itype == CB_TYPE) begin
@@ -433,13 +428,7 @@ function  int  uvma_isacov_instr_c::get_field_rd();
   // TODO:ropeders is CA handled properly?
   // TODO:ropeders call dpi_dasm from here, instead of elsewhere?
 
-  if (itype inside {CA_TYPE, CB_TYPE}) begin
-    return rd[2:0];
-  end else if (itype inside {CIW_TYPE, CL_TYPE}) begin
-    return rs2[2:0];
-  end else begin
-    return rd;
-  end
+  return (itype inside {CA_TYPE, CL_TYPE, CIW_TYPE, CB_TYPE}) ? rd[2:0] : rd;
 
 endfunction : get_field_rd
 

lib/uvm_agents/uvma_isacov/uvma_isacov_mon.sv

@@ -165,8 +165,8 @@ function void uvma_isacov_mon_c::write_rvfi_instr(uvma_rvfi_instr_seq_item_c#(IL
   if (mon_trn.instr.ext == C_EXT) begin
     mon_trn.instr.rs1     = dasm_rvc_rs1(instr);
     mon_trn.instr.rs2     = dasm_rvc_rs2(instr);
-    mon_trn.instr.rd      = dasm_rd(instr);
-    mon_trn.instr.c_rdrs1 = dasm_rd(instr);
+    mon_trn.instr.rd      = dasm_rvc_rd(instr);
+    mon_trn.instr.c_rdrs1 = dasm_rvc_rd(instr);
     mon_trn.instr.c_rs1s  = dasm_rvc_rs1s(instr);
     mon_trn.instr.c_rs2s  = dasm_rvc_rs2s(instr);
   end