Fix hwbp test.

[riscv-tests.git] / debug / testlib.py

diff --git a/debug/testlib.py b/debug/testlib.py
index bb604a7dcf4928f55dee37b91642c3c0c3a4faef..53e670ec51c006fa96cbb0ea2f201e5f77fb7f7c 100644 (file)
--- a/debug/testlib.py
+++ b/debug/testlib.py
@@ -42,13 +42,15 @@ def unused_port():
     return port
 
 class Spike(object):
-    def __init__(self, cmd, binary=None, halted=False, with_gdb=True, timeout=None):
+    def __init__(self, cmd, binary=None, halted=False, with_gdb=True, timeout=None,
+            xlen=64):
         """Launch spike. Return tuple of its process and the port it's running on."""
         if cmd:
             cmd = shlex.split(cmd)
         else:
             cmd = ["spike"]
-        #cmd.append("-l")    #<<<
+        if (xlen == 32):
+            cmd += ["--isa", "RV32"]
 
         if timeout:
             cmd = ["timeout", str(timeout)] + cmd
@@ -105,6 +107,7 @@ class Gdb(object):
         self.child = pexpect.spawn(path)
         self.child.logfile = file("gdb.log", "w")
         self.wait()
+        self.command("set confirm off")
         self.command("set width 0")
         self.command("set height 0")
         # Force consistency.
@@ -150,7 +153,7 @@ class Gdb(object):
         return output
 
     def load(self):
-        output = self.command("load", timeout=120)
+        output = self.command("load")
         assert "failed" not in  output
         assert "Transfer rate" in output
 
@@ -159,3 +162,9 @@ class Gdb(object):
         assert "not defined" not in output
         assert "Breakpoint" in output
         return output
+
+    def hbreak(self, location):
+        output = self.command("hbreak %s" % location)
+        assert "not defined" not in output
+        assert "Hardware assisted breakpoint" in output
+        return output