Fix single step bug

Fixed a bug where single stepping would resume all threads, which caused the selected thread to change if another thread hit a breakpoint during the single step.
mossvr · Oct 15, 2021 · 17c1fa9 · 17c1fa9
1 parent de63eab
commit 17c1fa9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/source/gdb_stub.c b/source/gdb_stub.c
@@ -482,7 +482,7 @@ static void print_debug_event(debug_event_t* event)
         logf("\t%s\n", exit_type_str[event->exit.type]);
         break;
     case DEBUG_EVENT_EXCEPTION:
-        logf("\t%s\n", exception_type_str[event->exception.type]);
+        logf("\t%s (tid=%lu)\n", exception_type_str[event->exception.type], event->thread_id);
         switch(event->exception.type)
         {
         case DEBUG_EXCEPTION_TRAP:

diff --git a/source/gdb_stub_pkt.c b/source/gdb_stub_pkt.c
@@ -487,7 +487,8 @@ static bool gdb_stub_pkt_step(gdb_stub_t* stub, char* packet, size_t length)
         }
 
         gdb_stub_enable_breakpoints(stub);
-        svcContinueDebugEvent(stub->session, 7, NULL, 0u);
+        u64 tid = stub->thread[idx].tid;
+        svcContinueDebugEvent(stub->session, 3u, &tid, 1u);
     }
 
     return true;