From 6cd3d2d3efa1a400aa8a473a78221a33acf7a74d Mon Sep 17 00:00:00 2001
From: Olof Kindgren <olof.kindgren@gmail.com>
Date: Thu, 6 Dec 2018 23:47:52 +0100
Subject: [PATCH] Fix rvfi_insn

---
 rtl/serv_top.v | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/rtl/serv_top.v b/rtl/serv_top.v
index bfea1ea..0efd3db 100644
--- a/rtl/serv_top.v
+++ b/rtl/serv_top.v
@@ -283,9 +283,13 @@ module serv_top
 `ifdef RISCV_FORMAL
    reg [31:0]    rs1_fv, rs2_fv, rd_fv;
    reg [31:0]    pc = RESET_PC;
+   reg [31:0]    insn;
    reg           ctrl_pc_en_r = 1'b0;
 
    always @(posedge clk) begin
+      if (i_ibus_ack)
+	insn <= i_ibus_rdt;
+
       ctrl_pc_en_r <= ctrl_pc_en;
       if (rs_en) begin
          rs1_fv <= {rs1,rs1_fv[31:1]};
@@ -299,7 +303,7 @@ module serv_top
          pc <= o_ibus_adr;
          rvfi_valid <= 1'b1;
          rvfi_order <= rvfi_order + 1;
-         rvfi_insn  <= i_ibus_rdt;
+         rvfi_insn  <= insn;
          rvfi_trap <= 1'b0;
          rvfi_halt <= 1'b0;
          rvfi_intr <= 1'b0;