Add abort() for benefit of benchmark code

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

diff --git a/debug/openocd.py b/debug/openocd.py
index 38072106a5f4c264f9b9aaaf9036bb5de716e165..50c6f3c9592914d10cede9d5d907fbc75db99d0c 100755 (executable)
--- a/debug/openocd.py
+++ b/debug/openocd.py
@@ -22,16 +22,26 @@ class OpenOcdTest(testlib.BaseTest):
         self.cli = testlib.OpenocdCli()
         self.cli.command("halt")
 
         self.cli = testlib.OpenocdCli()
         self.cli.command("halt")
 

+    def write_nops(self, count):
+        for address in range(self.target.ram, self.target.ram + 4 * count, 4):
+            # 0x13 is nop
+            self.cli.command("mww 0x%x 0x13" % address)
+

 class RegTest(OpenOcdTest):
     def test(self):
 class RegTest(OpenOcdTest):
     def test(self):

+        self.write_nops(4)
+

         regs = self.cli.reg()
         assertIn("x18", regs)
 
         regs = self.cli.reg()
         assertIn("x18", regs)
 

+        self.cli.command("reg x18 0x11782")
+        self.cli.command("step 0x%x" % self.target.ram)
+
+        assertEqual(self.cli.reg("x18"), 0x11782)
+

 class StepTest(OpenOcdTest):
     def test(self):
 class StepTest(OpenOcdTest):
     def test(self):

-        # 0x13 is nop
-        for address in range(self.target.ram, self.target.ram + 16, 4):
-            self.cli.command("mww 0x%x 0x13" % address)
+        self.write_nops(4)

 
         self.cli.command("step 0x%x" % self.target.ram)
         for i in range(4):
 
         self.cli.command("step 0x%x" % self.target.ram)
         for i in range(4):


@@ -41,9 +51,7 @@ class StepTest(OpenOcdTest):
 
 class ResumeTest(OpenOcdTest):
     def test(self):
 
 class ResumeTest(OpenOcdTest):
     def test(self):

-        # 0x13 is nop
-        for address in range(self.target.ram, self.target.ram + 32, 4):
-            self.cli.command("mww 0x%x 0x13" % address)
+        self.write_nops(16)

 
         self.cli.command("bp 0x%x 4" % (self.target.ram + 12))
         self.cli.command("bp 0x%x 4" % (self.target.ram + 24))
 
         self.cli.command("bp 0x%x 4" % (self.target.ram + 12))
         self.cli.command("bp 0x%x 4" % (self.target.ram + 24))


@@ -71,7 +79,7 @@ def main():
 
     module = sys.modules[__name__]
 
 
     module = sys.modules[__name__]
 

-    return testlib.run_all_tests(module, target, parsed.test, parsed.fail_fast)
+    return testlib.run_all_tests(module, target, parsed)

 
 if __name__ == '__main__':
     sys.exit(main())
 
 if __name__ == '__main__':
     sys.exit(main())