From 28383d2ae09989c32c596e2f5ae7cb15426fab66 Mon Sep 17 00:00:00 2001
From: tmeissner <programming@goodcleanfun.de>
Date: Wed, 26 Aug 2015 21:04:48 +0200
Subject: [PATCH] Add monitor to check master initiated WishBone transfers

The new checker monitor WishBoneBusMonitorP checks that address & data
on the WishBone bus are equal to the ones wihich were given at the local
port of the WishBoneMasterE unit to initiate the transfer.
---
 test/WishBoneT.vhd | 42 ++++++++++++++++++++++++++++++------------
 1 file changed, 30 insertions(+), 12 deletions(-)

diff --git a/test/WishBoneT.vhd b/test/WishBoneT.vhd
index b6aca60..27bbfb3 100644
--- a/test/WishBoneT.vhd
+++ b/test/WishBoneT.vhd
@@ -217,6 +217,25 @@ begin
     );
 
 
+    WishBoneBusMonitorP : process is
+      variable v_master_local_adress : std_logic_vector(C_ADDRESS_WIDTH-1 downto 0);
+      variable v_master_local_data   : std_logic_vector(C_DATA_WIDTH-1 downto 0);
+    begin
+      wait until s_master_local_wen = '1';
+      v_master_local_adress := s_master_local_adress;
+      v_master_local_data   := s_master_local_din;
+      wait until s_wb_cyc = '1';
+      WB_ADDR : assert s_wb_adr = v_master_local_adress
+        report "ERROR: Wishbone address 0x" & to_hstring(s_wb_adr) & " differ from local address 0x" & to_hstring(v_master_local_adress)
+        severity failure;
+      if (s_wb_we = '1') then
+        WB_DATA : assert s_wb_master_data = v_master_local_data
+          report "ERROR: Wishbone data 0x" & to_hstring(s_wb_master_data) & " differ from local data 0x" & to_hstring(v_master_local_data)
+          severity failure;
+      end if;
+    end process WishBoneBusMonitorP;
+
+
    i_WishBoneSlaveE : WishBoneSlaveE
     generic map (
       G_ADR_WIDTH  => C_ADDRESS_WIDTH,
@@ -245,22 +264,21 @@ begin
     );
 
 
-    WbSlaveLocalP : process (s_wb_clk) is
+    WbSlaveLocalP : process is
       variable v_register : t_register := (others => (others => '0'));
     begin
-      if (rising_edge(s_wb_clk)) then
-        if (s_wb_reset = '1') then
-          v_register        := (others => (others => '0'));
-          s_slave_local_din <= (others => '0');
-        else
-          if (s_slave_local_wen = '1') then
-            v_register(to_integer(unsigned(s_slave_local_adress))) := s_slave_local_dout;
-          elsif (s_slave_local_ren = '1') then
-            s_slave_local_din <= v_register(to_integer(unsigned(s_slave_local_adress)));
-          end if;
+      wait until rising_edge(s_wb_clk);
+      if (s_wb_reset = '1') then
+        v_register        := (others => (others => '0'));
+        s_slave_local_din <= (others => '0');
+      else
+        if (s_slave_local_wen = '1') then
+          v_register(to_integer(unsigned(s_slave_local_adress))) := s_slave_local_dout;
+        elsif (s_slave_local_ren = '1') then
+          s_slave_local_din <= v_register(to_integer(unsigned(s_slave_local_adress)));
         end if;
       end if;
     end process WbSlaveLocalP;
 
 
-end architecture sim;
\ No newline at end of file
+end architecture sim;