From 7bb31c328789ed705c211e1057b1ce94505a62bd Mon Sep 17 00:00:00 2001
From: Noah Boorstin <nboorstin@hmc.edu>
Date: Mon, 22 Mar 2021 16:52:22 -0400
Subject: [PATCH] busybear: finally get the right error

---
 wally-pipelined/testbench/testbench-busybear.sv | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/wally-pipelined/testbench/testbench-busybear.sv b/wally-pipelined/testbench/testbench-busybear.sv
index 46060582..f1315e96 100644
--- a/wally-pipelined/testbench/testbench-busybear.sv
+++ b/wally-pipelined/testbench/testbench-busybear.sv
@@ -190,8 +190,7 @@ module testbench_busybear();
 
   logic [`XLEN-1:0] readAdrExpected;
 
-  //always @(dut.hart.MemRWM[1] or HADDR or dut.HRDATA) begin
-  always @(posedge dut.HREADY) begin
+  always @(dut.HRDATA) begin
     #1;
     if (dut.hart.MemRWM[1] && HADDR != dut.PCF && dut.HRDATA !== {64{1'bx}}) begin
       //$display("%0t", $time);
@@ -205,14 +204,13 @@ module testbench_busybear();
         $display("%0t ps, instr %0d: HADDR does not equal readAdrExpected: %x, %x", $time, instrs, HADDR, readAdrExpected);
         `ERROR
       end
-
-      if (((readMask & HRDATA) !== (readMask & dut.HRDATA)) && (HADDR >= 'h80000000 && HADDR <= 'h87FFFFFF)) begin
+      if ((readMask & HRDATA) !== (readMask & dut.HRDATA)) begin
         $display("warning %0t ps, instr %0d: ExpectedHRDATA does not equal dut.HRDATA: %x, %x from address %x, %x", $time, instrs, HRDATA, dut.HRDATA, HADDR, HSIZE);
         warningCount += 1;
         `ERROR
       end
     //end else if(dut.hart.MemRWM[1]) begin
-      //$display("%x, %x, %x, %t", HADDR, dut.PCF, dut.HRDATA, $time);
+    //  $display("%x, %x, %x, %t", HADDR, dut.PCF, dut.HRDATA, $time);
 
     end