From a4bac85ece4b69831d34e21bc0c825227a64343f Mon Sep 17 00:00:00 2001
From: Noah Boorstin <nboorstin@hmc.edu>
Date: Thu, 28 Jan 2021 14:47:40 -0500
Subject: [PATCH] busybear: ret is only 1 word

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

diff --git a/wally-pipelined/regression/wally-busybear.do b/wally-pipelined/regression/wally-busybear.do
index 7ef5dcca..39268b3d 100644
--- a/wally-pipelined/regression/wally-busybear.do
+++ b/wally-pipelined/regression/wally-busybear.do
@@ -130,6 +130,6 @@ add wave /testbench_busybear/InstrWName
 #set DefaultRadix hexadecimal
 #
 #-- Run the Simulation 
-run 2630
+run 2640
 #run -all
 ##quit
diff --git a/wally-pipelined/testbench/testbench-busybear.sv b/wally-pipelined/testbench/testbench-busybear.sv
index 000293bf..3951afa5 100644
--- a/wally-pipelined/testbench/testbench-busybear.sv
+++ b/wally-pipelined/testbench/testbench-busybear.sv
@@ -158,8 +158,11 @@ module testbench_busybear();
         $stop;
       end
       // 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, "%s\n", PCtext);
+      if (PCtext != "ret") begin
+        scan_file_PC = $fscanf(data_file_PC, "%s\n", PCtext2);
+        PCtext = {PCtext, " ", PCtext2};
+      end
       scan_file_PC = $fscanf(data_file_PC, "%x\n", InstrF);
       // then expected PC value
       scan_file_PC = $fscanf(data_file_PC, "%x\n", pcExpected);