From: Tim Newsome <tim@sifive.com>
Date: Fri, 30 Sep 2016 19:11:03 +0000 (-0700)
Subject: Tolerate remotes that return memory read errors.
X-Git-Url: https://git.libre-soc.org/?p=riscv-tests.git;a=commitdiff_plain;h=ead84fbc720db4c8f42bb6a7ae979dbb4f8f6c5d

Tolerate remotes that return memory read errors.
---

diff --git a/debug/testlib.py b/debug/testlib.py
index 987d71e..8b799e7 100644
--- a/debug/testlib.py
+++ b/debug/testlib.py
@@ -1,4 +1,5 @@
 import os.path
+import re
 import shlex
 import subprocess
 import time
@@ -143,6 +144,11 @@ class Openocd(object):
         except OSError:
             pass
 
+class CannotAccess(Exception):
+    def __init__(self, address):
+        Exception.__init__(self)
+        self.address = address
+
 class Gdb(object):
     def __init__(self,
             cmd=os.path.expandvars("$RISCV/bin/riscv64-unknown-elf-gdb")):
@@ -187,6 +193,9 @@ class Gdb(object):
 
     def p(self, obj):
         output = self.command("p/x %s" % obj)
+        m = re.search("Cannot access memory at address (0x[0-9a-f]+)", output)
+        if m:
+            raise CannotAccess(int(m.group(1), 0))
         value = int(output.split('=')[-1].strip(), 0)
         return value
 
@@ -197,7 +206,6 @@ class Gdb(object):
 
     def stepi(self):
         output = self.command("stepi")
-        assert "Cannot" not in output
         return output
 
     def load(self):