diff options
| author | Jordan Carlin <jordanmcarlin@gmail.com> | 2024-07-29 04:48:49 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-29 12:48:49 +0100 |
| commit | 2078d872071e6f3a92e4a225c445c163b5aaccac (patch) | |
| tree | ae62b80f96357081ad908ef52f82a267efbc3411 /model/rvfi_dii.sail | |
| parent | 7de3d707b4aee615a565ec1b30c0ae847f176c2f (diff) | |
| download | sail-riscv-2078d872071e6f3a92e4a225c445c163b5aaccac.zip sail-riscv-2078d872071e6f3a92e4a225c445c163b5aaccac.tar.gz sail-riscv-2078d872071e6f3a92e4a225c445c163b5aaccac.tar.bz2 | |
Update bitfield syntax in RVFI files
There was some usage of the old bitfield syntax in the RVFI files that had been missed. This updates it to the new syntax to avoid the deprecation warning.
Diffstat (limited to 'model/rvfi_dii.sail')
| -rw-r--r-- | model/rvfi_dii.sail | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/model/rvfi_dii.sail b/model/rvfi_dii.sail index d1ad480..261f192 100644 --- a/model/rvfi_dii.sail +++ b/model/rvfi_dii.sail @@ -219,7 +219,7 @@ function rvfi_zero_exec_packet () = { val rvfi_halt_exec_packet : unit -> unit function rvfi_halt_exec_packet () = - rvfi_inst_data->rvfi_halt() = 0x01 + rvfi_inst_data[rvfi_halt] = 0x01 val rvfi_get_v2_support_packet : unit -> bits(704) function rvfi_get_v2_support_packet () = { @@ -246,11 +246,11 @@ function rvfi_get_exec_packet_v1 () = { let v1_packet = update_rvfi_pc_rdata(v1_packet, rvfi_pc_data[rvfi_pc_rdata]); let v1_packet = update_rvfi_rd_addr(v1_packet, rvfi_int_data[rvfi_rd_addr]); - let v1_packet = update_rvfi_rs2_addr(v1_packet, rvfi_int_data.rvfi_rs2_addr()); - let v1_packet = update_rvfi_rs1_addr(v1_packet, rvfi_int_data.rvfi_rs1_addr()); + let v1_packet = update_rvfi_rs2_addr(v1_packet, rvfi_int_data[rvfi_rs2_addr]); + let v1_packet = update_rvfi_rs1_addr(v1_packet, rvfi_int_data[rvfi_rs1_addr]); let v1_packet = update_rvfi_rd_wdata(v1_packet, rvfi_int_data[rvfi_rd_wdata]); - let v1_packet = update_rvfi_rs2_data(v1_packet, rvfi_int_data.rvfi_rs2_rdata()); - let v1_packet = update_rvfi_rs1_data(v1_packet, rvfi_int_data.rvfi_rs1_rdata()); + let v1_packet = update_rvfi_rs2_data(v1_packet, rvfi_int_data[rvfi_rs2_rdata]); + let v1_packet = update_rvfi_rs1_data(v1_packet, rvfi_int_data[rvfi_rs1_rdata]); let v1_packet = update_rvfi_mem_wmask(v1_packet, truncate(rvfi_mem_data[rvfi_mem_wmask], 8)); let v1_packet = update_rvfi_mem_rmask(v1_packet, truncate(rvfi_mem_data[rvfi_mem_rmask], 8)); @@ -310,16 +310,16 @@ function print_rvfi_exec () = { print_bits("rvfi_halt : ", rvfi_inst_data[rvfi_halt]); print_bits("rvfi_trap : ", rvfi_inst_data[rvfi_trap]); print_bits("rvfi_rd_addr : ", rvfi_int_data[rvfi_rd_addr]); - print_bits("rvfi_rs2_addr : ", rvfi_int_data.rvfi_rs2_addr()); - print_bits("rvfi_rs1_addr : ", rvfi_int_data.rvfi_rs1_addr()); + print_bits("rvfi_rs2_addr : ", rvfi_int_data[rvfi_rs2_addr]); + print_bits("rvfi_rs1_addr : ", rvfi_int_data[rvfi_rs1_addr]); print_bits("rvfi_mem_wmask: ", rvfi_mem_data[rvfi_mem_wmask]); print_bits("rvfi_mem_rmask: ", rvfi_mem_data[rvfi_mem_rmask]); print_bits("rvfi_mem_wdata: ", rvfi_mem_data[rvfi_mem_wdata]); print_bits("rvfi_mem_rdata: ", rvfi_mem_data[rvfi_mem_rdata]); print_bits("rvfi_mem_addr : ", rvfi_mem_data[rvfi_mem_addr]); print_bits("rvfi_rd_wdata : ", rvfi_int_data[rvfi_rd_wdata]); - print_bits("rvfi_rs2_data : ", rvfi_int_data.rvfi_rs2_rdata()); - print_bits("rvfi_rs1_data : ", rvfi_int_data.rvfi_rs1_rdata()); + print_bits("rvfi_rs2_data : ", rvfi_int_data[rvfi_rs2_rdata]); + print_bits("rvfi_rs1_data : ", rvfi_int_data[rvfi_rs1_rdata]); print_bits("rvfi_insn : ", rvfi_inst_data[rvfi_insn]); print_bits("rvfi_pc_wdata : ", rvfi_pc_data[rvfi_pc_wdata]); print_bits("rvfi_pc_rdata : ", rvfi_pc_data[rvfi_pc_rdata]); |