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.

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

Add missing RVFI signals to picorv32_axi and picorv32_wb #226

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
40 changes: 40 additions & 0 deletions picorv32.v
Original file line number Diff line number Diff line change
Expand Up @@ -2584,6 +2584,8 @@ module picorv32_axi #(
output rvfi_trap,
output rvfi_halt,
output rvfi_intr,
output [ 1:0] rvfi_mode,
output [ 1:0] rvfi_ixl,
output [ 4:0] rvfi_rs1_addr,
output [ 4:0] rvfi_rs2_addr,
output [31:0] rvfi_rs1_rdata,
Expand All @@ -2597,6 +2599,14 @@ module picorv32_axi #(
output [ 3:0] rvfi_mem_wmask,
output [31:0] rvfi_mem_rdata,
output [31:0] rvfi_mem_wdata,
output reg [63:0] rvfi_csr_mcycle_rmask,
output reg [63:0] rvfi_csr_mcycle_wmask,
output reg [63:0] rvfi_csr_mcycle_rdata,
output reg [63:0] rvfi_csr_mcycle_wdata,
output reg [63:0] rvfi_csr_minstret_rmask,
output reg [63:0] rvfi_csr_minstret_wmask,
output reg [63:0] rvfi_csr_minstret_rdata,
output reg [63:0] rvfi_csr_minstret_wdata,
`endif

// Trace Interface
Expand Down Expand Up @@ -2698,6 +2708,8 @@ module picorv32_axi #(
.rvfi_trap (rvfi_trap ),
.rvfi_halt (rvfi_halt ),
.rvfi_intr (rvfi_intr ),
.rvfi_mode (rvfi_mode ),
.rvfi_ixl (rvfi_ixl ),
.rvfi_rs1_addr (rvfi_rs1_addr ),
.rvfi_rs2_addr (rvfi_rs2_addr ),
.rvfi_rs1_rdata(rvfi_rs1_rdata),
Expand All @@ -2711,6 +2723,14 @@ module picorv32_axi #(
.rvfi_mem_wmask(rvfi_mem_wmask),
.rvfi_mem_rdata(rvfi_mem_rdata),
.rvfi_mem_wdata(rvfi_mem_wdata),
.rvfi_csr_mcycle_rmask (rvfi_csr_mcycle_rmask),
.rvfi_csr_mcycle_wmask (rvfi_csr_mcycle_wmask),
.rvfi_csr_mcycle_rdata (rvfi_csr_mcycle_rdata),
.rvfi_csr_mcycle_wdata (rvfi_csr_mcycle_wdata),
.rvfi_csr_minstret_rmask(rvfi_csr_minstret_rmask),
.rvfi_csr_minstret_wmask(rvfi_csr_minstret_wmask),
.rvfi_csr_minstret_rdata(rvfi_csr_minstret_rdata),
.rvfi_csr_minstret_wdata(rvfi_csr_minstret_wdata),
`endif

.trace_valid(trace_valid),
Expand Down Expand Up @@ -2870,6 +2890,8 @@ module picorv32_wb #(
output rvfi_trap,
output rvfi_halt,
output rvfi_intr,
output reg [ 1:0] rvfi_mode,
output reg [ 1:0] rvfi_ixl,
output [ 4:0] rvfi_rs1_addr,
output [ 4:0] rvfi_rs2_addr,
output [31:0] rvfi_rs1_rdata,
Expand All @@ -2883,6 +2905,14 @@ module picorv32_wb #(
output [ 3:0] rvfi_mem_wmask,
output [31:0] rvfi_mem_rdata,
output [31:0] rvfi_mem_wdata,
output reg [63:0] rvfi_csr_mcycle_rmask,
output reg [63:0] rvfi_csr_mcycle_wmask,
output reg [63:0] rvfi_csr_mcycle_rdata,
output reg [63:0] rvfi_csr_mcycle_wdata,
output reg [63:0] rvfi_csr_minstret_rmask,
output reg [63:0] rvfi_csr_minstret_wmask,
output reg [63:0] rvfi_csr_minstret_rdata,
output reg [63:0] rvfi_csr_minstret_wdata,
`endif

// Trace Interface
Expand Down Expand Up @@ -2962,6 +2992,8 @@ module picorv32_wb #(
.rvfi_trap (rvfi_trap ),
.rvfi_halt (rvfi_halt ),
.rvfi_intr (rvfi_intr ),
.rvfi_mode (rvfi_mode ),
.rvfi_ixl (rvfi_ixl ),
.rvfi_rs1_addr (rvfi_rs1_addr ),
.rvfi_rs2_addr (rvfi_rs2_addr ),
.rvfi_rs1_rdata(rvfi_rs1_rdata),
Expand All @@ -2975,6 +3007,14 @@ module picorv32_wb #(
.rvfi_mem_wmask(rvfi_mem_wmask),
.rvfi_mem_rdata(rvfi_mem_rdata),
.rvfi_mem_wdata(rvfi_mem_wdata),
.rvfi_csr_mcycle_rmask(rvfi_csr_mcycle_rmask),
.rvfi_csr_mcycle_wmask(rvfi_csr_mcycle_wmask),
.rvfi_csr_mcycle_rdata(rvfi_csr_mcycle_rdata),
.rvfi_csr_mcycle_wdata(rvfi_csr_mcycle_wdata),
.rvfi_csr_minstret_rmask(rvfi_csr_minstret_rmask),
.rvfi_csr_minstret_wmask(rvfi_csr_minstret_wmask),
.rvfi_csr_minstret_rdata(rvfi_csr_minstret_rdata),
.rvfi_csr_minstret_wdata(rvfi_csr_minstret_wdata),
`endif

.trace_valid(trace_valid),
Expand Down