All tests pass with spike now.

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

diff --git a/debug/testlib.py b/debug/testlib.py
index 0902983c88a41a7c03a986ca86dceea776bbef6a..e7397b2891be119b697e088a3932c6f4a898b9e1 100644 (file)
--- a/debug/testlib.py
+++ b/debug/testlib.py
@@ -16,11 +16,11 @@ def find_file(path):
             return fullpath
     return None
 
             return fullpath
     return None
 

-def compile(*args):
+def compile(args, xlen=32):

     """Compile a single .c file into a binary."""
     dst = os.path.splitext(args[0])[0]
     """Compile a single .c file into a binary."""
     dst = os.path.splitext(args[0])[0]

-    cc = os.path.expandvars("$RISCV/bin/riscv64-unknown-elf-gcc")
-    cmd = [cc, "-g", "-O", "-o", dst]
+    cc = os.path.expandvars("$RISCV/bin/riscv%d-unknown-elf-gcc" % xlen)
+    cmd = [cc, "-g", "-o", dst]

     for arg in args:
         found = find_file(arg)
         if found:
     for arg in args:
         found = find_file(arg)
         if found:


@@ -42,13 +42,17 @@ def unused_port():
     return port
 
 class Spike(object):
     return port
 
 class Spike(object):

-    def __init__(self, binary, halted=False, with_gdb=True, timeout=None):
+    def __init__(self, cmd, binary=None, halted=False, with_gdb=True, timeout=None):

         """Launch spike. Return tuple of its process and the port it's running on."""
         """Launch spike. Return tuple of its process and the port it's running on."""

-        cmd = []
+        if cmd:
+            cmd = shlex.split(cmd)
+        else:
+            cmd = ["spike"]
+        #cmd.append("-l")    #<<<
+

         if timeout:
         if timeout:

-            cmd += ["timeout", str(timeout)]
+            cmd = ["timeout", str(timeout)] + cmd

 
 

-        cmd += [find_file("spike")]

         if halted:
             cmd.append('-H')
         if with_gdb:
         if halted:
             cmd.append('-H')
         if with_gdb:


@@ -58,6 +62,7 @@ class Spike(object):
         if binary:
             cmd.append(binary)
         logfile = open("spike.log", "w")
         if binary:
             cmd.append(binary)
         logfile = open("spike.log", "w")

+        logfile.write("+ %s\n" % " ".join(cmd))

         self.process = subprocess.Popen(cmd, stdin=subprocess.PIPE, stdout=logfile,
                 stderr=logfile)
 
         self.process = subprocess.Popen(cmd, stdin=subprocess.PIPE, stdout=logfile,
                 stderr=logfile)
 


@@ -117,7 +122,9 @@ class Gdb(object):
 
     def c(self, wait=True):
         if wait:
 
     def c(self, wait=True):
         if wait:

-            return self.command("c")
+            output = self.command("c")
+            assert "Continuing" in output
+            return output

         else:
             self.child.sendline("c")
             self.child.expect("Continuing")
         else:
             self.child.sendline("c")
             self.child.expect("Continuing")


@@ -125,6 +132,7 @@ class Gdb(object):
     def interrupt(self):
         self.child.send("\003");
         self.child.expect("\(gdb\)")
     def interrupt(self):
         self.child.send("\003");
         self.child.expect("\(gdb\)")

+        return self.child.before.strip()

 
     def x(self, address, size='w'):
         output = self.command("x/%s %s" % (size, address))
 
     def x(self, address, size='w'):
         output = self.command("x/%s %s" % (size, address))


@@ -132,9 +140,20 @@ class Gdb(object):
         return value
 
     def p(self, obj):
         return value
 
     def p(self, obj):

-        output = self.command("p %s" % obj)
-        value = int(output.split('=')[-1].strip())
+        output = self.command("p/x %s" % obj)
+        value = int(output.split('=')[-1].strip(), 0)

         return value
 
     def stepi(self):
         return self.command("stepi")
         return value
 
     def stepi(self):
         return self.command("stepi")

+
+    def load(self):
+        output = self.command("load")
+        assert "failed" not in  output
+        assert "Transfer rate" in output
+
+    def b(self, location):
+        output = self.command("b %s" % location)
+        assert "not defined" not in output
+        assert "Breakpoint" in output
+        return output