From: Luke Kenneth Casson Leighton <lkcl@lkcl.net>
Date: Fri, 24 Dec 2021 13:44:51 +0000 (+0000)
Subject: clear memory is optional
X-Git-Tag: sv_maxu_works-initial~603
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b8aea4c75dc0f827c6b13441af3111e1138a78aa;p=openpower-isa.git

clear memory is optional
---

diff --git a/src/openpower/test/runner.py b/src/openpower/test/runner.py
index e0e8c9a3..55f2f372 100644
--- a/src/openpower/test/runner.py
+++ b/src/openpower/test/runner.py
@@ -209,9 +209,10 @@ class TestRunnerBase(FHDLTestCase):
                     # overwrite (reset) the wb_get memory dictionary with
                     # the test's memory contents (oh, and put the wb_get
                     # memory back in as well)
-                    if self.rom is not None and test.mem is not None:
-                        self.default_mem.clear()
+                    self.default_mem.clear()
+                    if self.rom is not None:
                         self.default_mem.update(deepcopy(self.rom))
+                    if test.mem is not None:
                         self.default_mem.update(deepcopy(test.mem))
 
                     for runner in state_list: