From a24af433c1228d117b235d5162dbe981ae9e2983 Mon Sep 17 00:00:00 2001
From: Jessica Clarke <jrtc27@jrtc27.com>
Date: Fri, 13 Sep 2024 23:18:11 +0100
Subject: [PATCH] vcu118-run.py: Make sure to switch to thread before setting
 PC

Fixes: 2a62a6ca7a3a ("vcu118-run.py: Adapt to accommodate GDB/cheri-14")
---
 vcu118-run.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/vcu118-run.py b/vcu118-run.py
index 1dff503fe..23bc3bc65 100755
--- a/vcu118-run.py
+++ b/vcu118-run.py
@@ -376,6 +376,7 @@ def load_and_start_kernel(
     if num_cores > 1:
         args += ["-ex", "set $entry_point = $pc"]  # Record the entry point to the bios
         for core in range(1, num_cores):
+            args += ["-ex", f"thread {core + 1:d}"]  # switch to thread (core + 1) (GDB counts from 1)
             args += ["-ex", "set $pc=$entry_point"]  # set every other core to the start of the bios
         args += ["-ex", "thread 1"]  # switch back to core 0
     if extra_gdb_commands is not None: