aboutsummaryrefslogtreecommitdiff
path: root/gdbserver
diff options
context:
space:
mode:
authorPedro Alves <pedro@palves.net>2023-05-22 18:17:54 +0100
committerPedro Alves <pedro@palves.net>2024-05-10 11:26:00 +0100
commita0bc4291f1d98739c6b1add026ee55c3f0d72e88 (patch)
treecdda48e6c30514261a87a2bdaff1e88ea4e1837b /gdbserver
parent41f9f2d609d128d6fc1414ad5c0dbcb74b019183 (diff)
downloadfsf-binutils-gdb-a0bc4291f1d98739c6b1add026ee55c3f0d72e88.zip
fsf-binutils-gdb-a0bc4291f1d98739c6b1add026ee55c3f0d72e88.tar.gz
fsf-binutils-gdb-a0bc4291f1d98739c6b1add026ee55c3f0d72e88.tar.bz2
Windows gdb+gdbserver: Share $_siginfo reading code
Both GDB and GDBserver have similar code to read the $_siginfo data. This patch moves the bulk of it to gdb/nat/windows-nat.c so it can be shared. Change-Id: I47fc0d3323be5b6f6fcfe912b768051a41910666
Diffstat (limited to 'gdbserver')
-rw-r--r--gdbserver/win32-low.cc42
1 files changed, 4 insertions, 38 deletions
diff --git a/gdbserver/win32-low.cc b/gdbserver/win32-low.cc
index 985c6a0..4707acc 100644
--- a/gdbserver/win32-low.cc
+++ b/gdbserver/win32-low.cc
@@ -1308,45 +1308,11 @@ win32_process_target::qxfer_siginfo (const char *annex,
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;
-
- EXCEPTION_RECORD &er = th->last_event.u.Exception.ExceptionRecord;
-
- char *buf = (char *) &er;
- size_t bufsize = sizeof (er);
-
-#ifdef __x86_64__
- EXCEPTION_RECORD32 er32;
- if (windows_process.wow64_process)
- {
- buf = (char *) &er32;
- bufsize = sizeof (er32);
-
- er32.ExceptionCode = er.ExceptionCode;
- er32.ExceptionFlags = er.ExceptionFlags;
- er32.ExceptionRecord
- = (uintptr_t) er.ExceptionRecord;
- er32.ExceptionAddress
- = (uintptr_t) er.ExceptionAddress;
- er32.NumberParameters = er.NumberParameters;
- for (int i = 0; i < EXCEPTION_MAXIMUM_PARAMETERS; i++)
- er32.ExceptionInformation[i] = er.ExceptionInformation[i];
- }
-#endif
-
- if (offset > bufsize)
+ ULONGEST xfered_len;
+ if (th->xfer_siginfo (readbuf, offset, len, &xfered_len))
+ return xfered_len;
+ else
return -1;
-
- if (offset + len > bufsize)
- len = bufsize - offset;
-
- memcpy (readbuf, buf + offset, len);
-
- return len;
}
bool