mockturtle-debug: do not stop all cpus

Disassert reset of the cpu only when needed. Stop the cpu after the gdb connection.

mockturtle-debug: do not stop all cpus
Disassert reset of the cpu only when needed. Stop the cpu after the gdb connection.
0aed2e03 · Tristan Gingold · 9f444af5 · 0aed2e03
Commit 0aed2e03 authored Sep 05, 2018 by Tristan Gingold
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 7 deletions

mockturtle-debug.py software/tools/mockturtle-debug.py +11 -7

No files found.
--- a/software/tools/mockturtle-debug.py
+++ b/software/tools/mockturtle-debug.py
@@ -620,6 +620,7 @@ class GdbServer(object):
        sys.stdout.write("Waiting for connection on port {}\n".format(gdb_port))
        self.conn, client_addr = sock.accept()
        sys.stdout.write("connection from {}\n".format(client_addr))
+        self.force_debug()
        while True:
            # Wait for a packet
            packet = ""
@@ -659,7 +660,6 @@ class GdbServer(object):
                            packet = ''

    def run(self):
-        self.force_debug()
        sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
        sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
        sock.bind(('', gdb_port))
@@ -670,12 +670,16 @@ class GdbServer(object):


 def cmd_gdb(csr):
-    # Set force
-    csr.writel(CSR_DBG_FORCE, 0xf)
-    # Clear reset
-    csr.writel(CSR_RESET, 0)
-    # Disable force
-    csr.writel(CSR_DBG_FORCE, 0)
+    rst = csr.readl(CSR_RESET)
+    cpu_bit = 1 << flag_cpu
+    if (rst & cpu_bit) != 0:
+        sys.stdout.write("Put cpu #{} out of reset\n".format(flag_cpu))
+        # Set force
+        csr.writel(CSR_DBG_FORCE, cpu_bit)
+        # Clear reset
+        csr.writel(CSR_RESET, rst & ~cpu_bit)
+        # Disable force
+        csr.writel(CSR_DBG_FORCE, 0)

    csr.writel(CSR_CORESEL, flag_cpu);