From 91564c7ab1bb42ed9897a49adc89f402d9e458e9 Mon Sep 17 00:00:00 2001
From: Noah Boorstin <nboorstin@hmc.edu>
Date: Tue, 26 Jan 2021 12:34:12 -0500
Subject: [PATCH] show instruction assembly in waveform

---
 wally-pipelined/regression/wally-busybear.do    | 3 ++-
 wally-pipelined/testbench/testbench-busybear.sv | 5 ++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/wally-pipelined/regression/wally-busybear.do b/wally-pipelined/regression/wally-busybear.do
index 58ae5c177..430f38108 100644
--- a/wally-pipelined/regression/wally-busybear.do
+++ b/wally-pipelined/regression/wally-busybear.do
@@ -40,6 +40,7 @@ view wave
 add wave /testbench_busybear/clk
 add wave /testbench_busybear/reset
 add wave -divider
+add wave -hex /testbench_busybear/PCtext
 add wave -hex /testbench_busybear/pcExpected
 add wave -hex /testbench_busybear/dut/dp/PCF
 add wave -hex /testbench_busybear/dut/dp/InstrF
@@ -129,6 +130,6 @@ add wave /testbench_busybear/InstrWName
 #set DefaultRadix hexadecimal
 #
 #-- Run the Simulation 
-run 800
+run 900
 #run -all
 ##quit
diff --git a/wally-pipelined/testbench/testbench-busybear.sv b/wally-pipelined/testbench/testbench-busybear.sv
index 08222a03b..87840ad9e 100644
--- a/wally-pipelined/testbench/testbench-busybear.sv
+++ b/wally-pipelined/testbench/testbench-busybear.sv
@@ -125,7 +125,8 @@ module testbench_busybear();
     speculative = 0;
   end
   logic [63:0] lastInstrF, lastPC, lastPC2;
-
+  
+  string PCtext, PCtext2;
   integer instrs;
   initial begin
     instrs = 0;
@@ -140,6 +141,8 @@ module testbench_busybear();
     else begin
     //if (~speculative) begin
       // first read instruction
+      scan_file_PC = $fscanf(data_file_PC, "%s %s\n", PCtext, PCtext2);
+      PCtext = {PCtext, " ", PCtext2};
       scan_file_PC = $fscanf(data_file_PC, "%x\n", InstrF);
       // then expected PC value
       scan_file_PC = $fscanf(data_file_PC, "%x\n", pcExpected);