github-mirrors/ibex
1
0
Fork 0
mirror of https://github.com/lowRISC/ibex.git synced 2025-04-20 11:57:12 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

RVFI: re-add accidentally removed rvfi_intr signal

Browse source 
This signal is now set during the first instruction after the PC has
been set to enter a trap handler.
This commit is contained in:
Pirmin Vogel 2019-07-25 10:08:08 +01:00
parent 511b205226
commit 1aa276dbc0
2 changed files with 32 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

30
rtl/ibex_core.sv
View file

@ -85,6 +85,7 @@ module ibex_core #(
output logic [31:0] rvfi_insn_uncompressed,
output logic rvfi_trap,
output logic rvfi_halt,
output logic rvfi_intr,
output logic [ 1:0] rvfi_mode,
output logic [ 4:0] rvfi_rs1_addr,
output logic [ 4:0] rvfi_rs2_addr,
@ -224,6 +225,9 @@ module ibex_core #(
// RISC-V Formal Interface signals
`ifdef RVFI
logic rvfi_intr_d;
logic rvfi_set_trap_pc_d;
logic rvfi_set_trap_pc_q;
logic [31:0] rvfi_insn_id;
logic [4:0] rvfi_rs1_addr_id;
logic [4:0] rvfi_rs2_addr_id;
@ -619,6 +623,7 @@ module ibex_core #(
if (!rst_ni) begin
rvfi_halt <= '0;
rvfi_trap <= '0;
rvfi_intr <= '0;
rvfi_order <= '0;
rvfi_insn <= '0;
rvfi_insn_uncompressed <= '0;
@ -640,6 +645,7 @@ module ibex_core #(
end else begin
rvfi_halt <= '0;
rvfi_trap <= illegal_insn_id;
rvfi_intr <= rvfi_intr_d;
rvfi_order <= rvfi_order + rvfi_valid;
rvfi_insn <= rvfi_insn_id;
rvfi_insn_uncompressed <= instr_rdata_id;
@ -771,6 +777,30 @@ module ibex_core #(
end
end
// generate rvfi_intr_d
assign rvfi_intr_d = rvfi_set_trap_pc_q & rvfi_insn_new_d;
always_comb begin
rvfi_set_trap_pc_d = rvfi_set_trap_pc_q;
if (pc_set && pc_mux_id == PC_EXC &&
(exc_pc_mux_id == EXC_PC_EXC || exc_pc_mux_id == EXC_PC_IRQ)) begin
// PC is set to enter a trap handler
rvfi_set_trap_pc_d = 1'b1;
end else if (rvfi_set_trap_pc_q && instr_ret) begin
// first instruction has been executed after PC is set to trap handler
rvfi_set_trap_pc_d = 1'b0;
end
end
always_ff @(posedge clk or negedge rst_ni) begin
if (!rst_ni) begin
rvfi_set_trap_pc_q <= 1'b0;
end else begin
rvfi_set_trap_pc_q <= rvfi_set_trap_pc_d;
end
end
`endif
endmodule

2
rtl/ibex_core_tracing.sv
View file

@ -71,6 +71,7 @@ module ibex_core_tracing #(
logic [31:0] rvfi_insn_uncompressed;
logic rvfi_trap;
logic rvfi_halt;
logic rvfi_intr;
logic [ 1:0] rvfi_mode;
logic [ 4:0] rvfi_rs1_addr;
logic [ 4:0] rvfi_rs2_addr;
@ -133,6 +134,7 @@ module ibex_core_tracing #(
.rvfi_insn_uncompressed,
.rvfi_trap,
.rvfi_halt,
.rvfi_intr,
.rvfi_mode,
.rvfi_rs1_addr,
.rvfi_rs2_addr,