X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=debug%2Fgdbserver.py;h=ca117622921863b35a84c1f4b5fed3c78299085e;hb=1099c0dadd3c315d81ba5ef2e8712b6c08076ae2;hp=8a6e87439a124f9835ba8b81f8cea43ee505276f;hpb=37a93a9f86521aea2758271a1cc87c23bca06f59;p=riscv-tests.git

diff --git a/debug/gdbserver.py b/debug/gdbserver.py
index 8a6e874..ca11762 100755
--- a/debug/gdbserver.py
+++ b/debug/gdbserver.py
@@ -1,15 +1,16 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 
 import os
 import sys
 import argparse
-import testlib
 import unittest
 import tempfile
 import time
 import random
 import binascii
 
+import testlib
+
 
 MSTATUS_UIE = 0x00000001
 MSTATUS_SIE = 0x00000002
@@ -41,16 +42,18 @@ def gdb(
     if parsed.gdb:
         gdb = testlib.Gdb(parsed.gdb)
     else:
-        gdb =  testlib.Gdb()
+        gdb = testlib.Gdb()
 
-    if (binary):
-        gdb.command("file %s" % self.binary)
-    if (target):
+    if binary:
+        gdb.command("file %s" % binary)
+    if target:
         gdb.command("set arch riscv:rv%d" % target.xlen)
         gdb.command("set remotetimeout %d" % target.timeout_sec)
-    if (port):
+    if port:
         gdb.command("target extended-remote localhost:%d" % port)
 
+    gdb.p("$priv=3")
+
     return gdb
 
         
@@ -224,9 +227,8 @@ class DebugTest(DeleteServer):
     def test_function_call(self):
         self.gdb.b("main:start")
         self.gdb.c()
-        text = "Howdy, Earth!"
-        gdb_length = self.gdb.p('strlen("%s")' % text)
-        self.assertEqual(gdb_length, len(text))
+        self.assertEqual(self.gdb.p('fib(6)'), 8)
+        self.assertEqual(self.gdb.p('fib(7)'), 13)
         self.exit()
 
     def test_change_string(self):
@@ -238,6 +240,8 @@ class DebugTest(DeleteServer):
 
     def test_turbostep(self):
         """Single step a bunch of times."""
+        self.gdb.b("main:start")
+        self.gdb.c()
         self.gdb.command("p i=0");
         last_pc = None
         advances = 0
@@ -314,6 +318,27 @@ class DebugTest(DeleteServer):
         # tests may fail.
         self.gdb.command("D")
 
+    def test_address_trigger(self):
+        self.gdb.b("main:start")
+        self.gdb.c()
+        self.gdb.command("watch fox[13]");
+
+        output = self.gdb.c()
+        self.assertNotIn("Could not insert", output)
+        self.assertIn("rot13", output)
+        output = self.gdb.command("up")
+        self.assertIn("in main", output)
+        self.assertEqual(self.gdb.p_string("fox"),
+                "Gur dhvpx oebjn fox jumps of the lazy dog.")
+
+        output = self.gdb.c()
+        self.assertNotIn("Could not insert", output)
+        self.assertIn("rot13", output)
+        output = self.gdb.command("up")
+        self.assertIn("in main", output)
+        self.assertEqual(self.gdb.p_string("fox"),
+                "The quick browa sbk whzcf bs gur ynml qbt.")
+
     def test_registers(self):
         # Get to a point in the code where some registers have actually been
         # used.
@@ -389,8 +414,8 @@ class RegsTest(DeleteServer):
 
         self.gdb.p("$pc=write_regs")
         for i, r in enumerate(regs):
-            self.gdb.command("p $%s=%d" % (r, (0xdeadbeef<<i)+17))
-        self.gdb.command("p $x1=data")
+            self.gdb.p("$%s=%d" % (r, (0xdeadbeef<<i)+17))
+        self.gdb.p("$x1=data")
         self.gdb.command("b all_done")
         output = self.gdb.c()
         self.assertIn("Breakpoint ", output)
@@ -527,9 +552,10 @@ class Target(object):
         raise NotImplementedError
 
     def compile(self, *sources):
-        binary_name = "%s_%s" % (
+        binary_name = "%s_%s-%d" % (
                 self.name,
-                os.path.basename(os.path.splitext(sources[0])[0]))
+                os.path.basename(os.path.splitext(sources[0])[0]),
+                self.xlen)
         if parsed.isolate:
             self.temporary_binary = tempfile.NamedTemporaryFile(
                     prefix=binary_name + "_")
@@ -548,7 +574,7 @@ class SpikeTarget(Target):
     directory = "spike"
     ram = 0x80010000
     ram_size = 5 * 1024 * 1024
-    instruction_hardware_breakpoint_count = 0
+    instruction_hardware_breakpoint_count = 4
     reset_vector = 0x1000
 
 class Spike64Target(SpikeTarget):
@@ -644,16 +670,28 @@ def main():
             help="The command to use to start the debug server.")
     parser.add_argument("--gdb",
             help="The command to use to start gdb.")
+
+    xlen_group = parser.add_mutually_exclusive_group()
+    xlen_group.add_argument("--32", action="store_const", const=32, dest="xlen",
+            help="Force the target to be 32-bit.")
+    xlen_group.add_argument("--64", action="store_const", const=64, dest="xlen",
+            help="Force the target to be 64-bit.")
+
     parser.add_argument("--isolate", action="store_true",
             help="Try to run in such a way that multiple instances can run at "
             "the same time. This may make it harder to debug a failure if it "
             "does occur.")
+
     parser.add_argument("unittest", nargs="*")
     global parsed
     parsed = parser.parse_args()
 
     global target
     target = parsed.target()
+
+    if parsed.xlen:
+        target.xlen = parsed.xlen
+
     unittest.main(argv=[sys.argv[0]] + parsed.unittest)
 
 # TROUBLESHOOTING TIPS