aboutsummaryrefslogtreecommitdiff
path: root/gdbserver
diff options
context:
space:
mode:
authorPedro Alves <pedro@palves.net>2023-05-22 17:33:16 +0100
committerPedro Alves <pedro@palves.net>2024-05-10 11:26:00 +0100
commit0c6b04823623a6bd121f8c4b80087fe204742b0b (patch)
treea31f72ff847a0305ce76e268846a29ecd9c53062 /gdbserver
parentf5e5342583c72869461b6f87563c9fc28e06a15a (diff)
downloadbinutils-0c6b04823623a6bd121f8c4b80087fe204742b0b.zip
binutils-0c6b04823623a6bd121f8c4b80087fe204742b0b.tar.gz
binutils-0c6b04823623a6bd121f8c4b80087fe204742b0b.tar.bz2
Windows gdb+gdbserver: Make siginfo_er per-thread state
With non-stop mode support, each thread has its own "last event", and so printing $_siginfo should print the siginfo of the selected thread. Likewise, with all-stop and scheduler-locking. This patch reworks the siginfo functions in gdb/windows-nat.c and gdbserver/win32-low.cc to reuse the exception record already saved within each thread's 'last_event' field. Here's an example of what you'll see after the whole non-stop series: (gdb) thread apply all p -pretty -- $_siginfo Thread 3 (Thread 2612.0x1470): $1 = { ExceptionCode = DBG_CONTROL_C, ExceptionFlags = 0, ExceptionRecord = 0x0, ExceptionAddress = 0x7ffd0583e929 <KERNELBASE!EncodeRemotePointer+8249>, NumberParameters = 0, { ExceptionInformation = {0 <repeats 15 times>}, AccessViolationInformation = { Type = READ_ACCESS_VIOLATION, Address = 0x0 } } } Thread 2 (Thread 2612.0x1704): $2 = { ExceptionCode = SINGLE_STEP, ExceptionFlags = 0, ExceptionRecord = 0x0, ExceptionAddress = 0x7ffd080ad6e4 <ntdll!ZwDelayExecution+20>, NumberParameters = 0, { ExceptionInformation = {0 <repeats 15 times>}, AccessViolationInformation = { Type = READ_ACCESS_VIOLATION, Address = 0x0 } } } Thread 1 (Thread 2612.0x434): $3 = { ExceptionCode = BREAKPOINT, ExceptionFlags = 0, ExceptionRecord = 0x0, ExceptionAddress = 0x7ff6f691174c <main+185>, NumberParameters = 1, { ExceptionInformation = {0 <repeats 15 times>}, AccessViolationInformation = { Type = READ_ACCESS_VIOLATION, Address = 0x0 } } } (gdb) This was in non-stop mode, and the program originally had two threads. Thread 1 stopped for a breakpoint, then thread 2 was manually interrupted/paused and then single-stepped. And then I typed Ctrl-C in the inferior's terminal, which made Windows inject thread 3 in the inferior, and report a DBG_CONTROL_C exception for it. Change-Id: I5d4f1b62f59e8aef3606642c6524df2362b0fb7d
Diffstat (limited to 'gdbserver')
-rw-r--r--gdbserver/win32-low.cc28
1 files changed, 15 insertions, 13 deletions
diff --git a/gdbserver/win32-low.cc b/gdbserver/win32-low.cc
index 40575e3..5560091 100644
--- a/gdbserver/win32-low.cc
+++ b/gdbserver/win32-low.cc
@@ -675,7 +675,6 @@ win32_clear_inferiors (void)
}
for_each_thread (delete_thread_info);
- windows_process.siginfo_er.ExceptionCode = 0;
clear_inferiors ();
}
@@ -1306,14 +1305,19 @@ win32_process_target::qxfer_siginfo (const char *annex,
unsigned const char *writebuf,
CORE_ADDR offset, int len)
{
- if (windows_process.siginfo_er.ExceptionCode == 0)
+ windows_thread_info *th
+ = windows_process.find_thread (current_thread_ptid ());
+
+ if (th->last_event.dwDebugEventCode != EXCEPTION_DEBUG_EVENT)
return -1;
if (readbuf == nullptr)
return -1;
- char *buf = (char *) &windows_process.siginfo_er;
- size_t bufsize = sizeof (windows_process.siginfo_er);
+ EXCEPTION_RECORD &er = th->last_event.u.Exception.ExceptionRecord;
+
+ char *buf = (char *) &er;
+ size_t bufsize = sizeof (er);
#ifdef __x86_64__
EXCEPTION_RECORD32 er32;
@@ -1322,17 +1326,15 @@ win32_process_target::qxfer_siginfo (const char *annex,
buf = (char *) &er32;
bufsize = sizeof (er32);
- er32.ExceptionCode = windows_process.siginfo_er.ExceptionCode;
- er32.ExceptionFlags = windows_process.siginfo_er.ExceptionFlags;
+ er32.ExceptionCode = er.ExceptionCode;
+ er32.ExceptionFlags = er.ExceptionFlags;
er32.ExceptionRecord
- = (uintptr_t) windows_process.siginfo_er.ExceptionRecord;
+ = (uintptr_t) er.ExceptionRecord;
er32.ExceptionAddress
- = (uintptr_t) windows_process.siginfo_er.ExceptionAddress;
- er32.NumberParameters = windows_process.siginfo_er.NumberParameters;
- int i;
- for (i = 0; i < EXCEPTION_MAXIMUM_PARAMETERS; i++)
- er32.ExceptionInformation[i]
- = windows_process.siginfo_er.ExceptionInformation[i];
+ = (uintptr_t) er.ExceptionAddress;
+ er32.NumberParameters = er.NumberParameters;
+ for (int i = 0; i < EXCEPTION_MAXIMUM_PARAMETERS; i++)
+ er32.ExceptionInformation[i] = er.ExceptionInformation[i];
}
#endif