From af8ca85a5ba04093840e69d4e38e5d6774b28145 Mon Sep 17 00:00:00 2001
From: Ross Thompson <ross1728@gmail.com>
Date: Tue, 13 Jun 2023 15:09:40 -0500
Subject: [PATCH] Now have most of the regression tests running again.

---
 testbench/testbench.sv | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/testbench/testbench.sv b/testbench/testbench.sv
index 4149b44b9..2b3698bc5 100644
--- a/testbench/testbench.sv
+++ b/testbench/testbench.sv
@@ -73,7 +73,7 @@ module testbench;
   logic [P.XLEN-1:0]    PCW;
 
   string  ProgramAddrMapFile, ProgramLabelMapFile;
-  integer ProgramAddrLabelArray [string] = '{ "begin_signature" : 0, "tohost" : 0 };
+  integer ProgramAddrLabelArray [string];
 
   logic DCacheFlushDone, DCacheFlushStart;
   logic riscofTest; 
@@ -558,8 +558,6 @@ module testbench;
     end
   end
   
-
-
   // track the current function or global label
   if (DEBUG == 1 | (`PrintHPMCounters & P.ZICOUNTERS_SUPPORTED)) begin : FunctionName
     FunctionName FunctionName(.reset(reset_ext | TestBenchReset),
@@ -839,8 +837,12 @@ task automatic updateProgramAddrLabelArray;
   integer ProgramLabelMapFP, ProgramAddrMapFP;
   ProgramLabelMapFP = $fopen(ProgramLabelMapFile, "r");
   ProgramAddrMapFP = $fopen(ProgramAddrMapFile, "r");
-  
+
+
   if (ProgramLabelMapFP & ProgramAddrMapFP) begin // check we found both files
+    // *** RT: I'm a bit confused by the required initialization here.
+    ProgramAddrLabelArray["begin_signature"] = 0;
+    ProgramAddrLabelArray["tohost"] = 0;
     while (!$feof(ProgramLabelMapFP)) begin
       string label, adrstr;
       integer returncode;