aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Newsome <tim@sifive.com>2023-06-23 17:05:39 -0700
committerTim Newsome <tim@sifive.com>2023-07-17 09:34:55 -0700
commitf6c33d7d1986da701a2d97c179d1b22b462f7e8d (patch)
tree29f3dabfafbdff4630bd2cca047a5ab1c5502034
parent1754ac49dc90ee99a8452aeca5fe218b54e03f18 (diff)
downloadriscv-tests-f6c33d7d1986da701a2d97c179d1b22b462f7e8d.zip
riscv-tests-f6c33d7d1986da701a2d97c179d1b22b462f7e8d.tar.gz
riscv-tests-f6c33d7d1986da701a2d97c179d1b22b462f7e8d.tar.bz2
Move "monitor targets" calls into a central place.
-rwxr-xr-xdebug/gdbserver.py3
-rw-r--r--debug/testlib.py1
2 files changed, 1 insertions, 3 deletions
diff --git a/debug/gdbserver.py b/debug/gdbserver.py
index 46d65df..e5d3707 100755
--- a/debug/gdbserver.py
+++ b/debug/gdbserver.py
@@ -1989,7 +1989,6 @@ class EtriggerTest(DebugTest):
self.gdb.b("handle_trap")
def test(self):
- self.gdb.command(f"monitor targets {self.hart.id}")
# Set trigger on Load access fault
self.gdb.command("monitor riscv etrigger set m 0x20")
# Set fox to a null pointer so we'll get a load access exception later.
@@ -2009,7 +2008,6 @@ class IcountTest(DebugTest):
DebugTest.setup(self)
self.gdb.b("main")
self.gdb.c()
- self.gdb.command(f"monitor targets {self.hart.id}")
def test(self):
# Execute 2 instructions.
@@ -2039,7 +2037,6 @@ class ItriggerTest(GdbSingleHartTest):
self.gdb.load()
def test(self):
- self.gdb.command(f"monitor targets {self.hart.id}")
output = self.gdb.command("monitor riscv itrigger set 0x80")
assertIn("Doesn't make sense", output)
output = self.gdb.command("monitor riscv itrigger set m 0")
diff --git a/debug/testlib.py b/debug/testlib.py
index 8962ae3..688829d 100644
--- a/debug/testlib.py
+++ b/debug/testlib.py
@@ -1309,6 +1309,7 @@ class GdbTest(BaseTest):
self.gdb.p(f"$pc={symbol}")
self.gdb.select_hart(self.hart)
+ self.gdb.command(f"monitor targets {self.hart.id}")
def disable_pmp(self):
# Disable physical memory protection by allowing U mode access to all