Move "monitor targets" calls into a central place.

sycuricon · Jul 17, 2023 · f6c33d7 · f6c33d7
1 parent 1754ac4
commit f6c33d7
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/debug/gdbserver.py b/debug/gdbserver.py
@@ -1989,7 +1989,6 @@ def setup(self):
         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 @@ def setup(self):
         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 @@ def setup(self):
         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
@@ -1309,6 +1309,7 @@ def parkOtherHarts(self, symbol=None):
                     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