From 7183910c84b986b4091b21084748076c8637f9ce Mon Sep 17 00:00:00 2001
From: Noah Boorstin <nboorstin@hmc.edu>
Date: Fri, 29 Jan 2021 17:46:50 +0000
Subject: [PATCH] update busybear testbench to conform to new structure

---
 wally-pipelined/config/busybear/wally-config.vh |  3 +++
 wally-pipelined/regression/wally-busybear.do    |  2 +-
 wally-pipelined/testbench/testbench-busybear.sv | 17 +++++++++++++++++
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/wally-pipelined/config/busybear/wally-config.vh b/wally-pipelined/config/busybear/wally-config.vh
index 794f6bbed..92e11aacb 100644
--- a/wally-pipelined/config/busybear/wally-config.vh
+++ b/wally-pipelined/config/busybear/wally-config.vh
@@ -57,6 +57,9 @@
 // Address space
 `define RESET_VECTOR 64'h0000000000001000
 
+// Bus Interface
+`define AHBW 64
+
 // Test modes
 
 // Tie GPIO outputs back to inputs
diff --git a/wally-pipelined/regression/wally-busybear.do b/wally-pipelined/regression/wally-busybear.do
index 80d660af6..f1ccea6ae 100644
--- a/wally-pipelined/regression/wally-busybear.do
+++ b/wally-pipelined/regression/wally-busybear.do
@@ -131,6 +131,6 @@ add wave /testbench_busybear/InstrWName
 #set DefaultRadix hexadecimal
 #
 #-- Run the Simulation 
-run 621070
+run 621530
 #run -all
 ##quit
diff --git a/wally-pipelined/testbench/testbench-busybear.sv b/wally-pipelined/testbench/testbench-busybear.sv
index ebb4f1d7d..d47a32bf5 100644
--- a/wally-pipelined/testbench/testbench-busybear.sv
+++ b/wally-pipelined/testbench/testbench-busybear.sv
@@ -16,6 +16,23 @@ module testbench_busybear();
   logic        TimerIntM = 0, SwIntM = 0; // from CLINT
   logic        ExtIntM = 0; // not yet connected
 
+  logic [`AHBW-1:0] HRDATA;
+  logic             HREADY, HRESP;
+  logic [31:0]      HADDR;
+  logic [`AHBW-1:0] HWDATA;
+  logic             HWRITE;
+  logic [2:0]       HSIZE;
+  logic [2:0]       HBURST;
+  logic [3:0]       HPROT;
+  logic [1:0]       HTRANS;
+  logic             HMASTLOCK;
+
+  assign GPIOPinsIn = 0;
+  assign UARTSin = 1;
+  assign HREADY = 1;
+  assign HRESP = 0;
+  assign HRDATA = 0;
+
   // for now, seem to need these to be zero until we get a better idea
   assign InstrAccessFaultF = 0;
   assign DataAccessFaultM = 0;