Toolchain/binutils-gdb
1
0
Fork 0
forked from Imagelibrary/binutils-gdb
Code Pull Requests Activity

Windows gdb: handle_output_debug_string return type

Browse Source 
handle_output_debug_string returns a Windows thread id, so it should
return a DWORD instead of an int.

Change-Id: Icbd071a1a37de8a0fc8918bd13254a8d40311e32
This commit is contained in:
Pedro Alves
2023-05-08 19:40:50 +01:00
parent 446babcd70
commit ea80c32fa7
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gdb/nat/windows-nat.h
View File

@@ -196,7 +196,7 @@ struct windows_process_info
a Cygwin signal. Otherwise just print the string as a warning. a Cygwin signal. Otherwise just print the string as a warning.
This function must be supplied by the embedding application. */ This function must be supplied by the embedding application. */
virtual int handle_output_debug_string (struct target_waitstatus *ourstatus) = 0; virtual DWORD handle_output_debug_string (struct target_waitstatus *ourstatus) = 0;
/* Handle a DLL load event. /* Handle a DLL load event.

16
gdb/windows-nat.c
View File

@@ -93,7 +93,7 @@ struct windows_per_inferior : public windows_process_info
windows_thread_info *find_thread (ptid_t ptid) override; windows_thread_info *find_thread (ptid_t ptid) override;
windows_thread_info *thread_rec (ptid_t ptid, windows_thread_info *thread_rec (ptid_t ptid,
thread_disposition_type disposition) override; thread_disposition_type disposition) override;
int handle_output_debug_string (struct target_waitstatus *ourstatus) override; DWORD handle_output_debug_string (struct target_waitstatus *ourstatus) override;
void handle_load_dll (const char *dll_name, LPVOID base) override; void handle_load_dll (const char *dll_name, LPVOID base) override;
void handle_unload_dll () override; void handle_unload_dll () override;
bool handle_access_violation (const EXCEPTION_RECORD *rec) override; bool handle_access_violation (const EXCEPTION_RECORD *rec) override;
@@ -996,11 +996,11 @@ signal_event_command (const char *args, int from_tty)
/* See nat/windows-nat.h. */ /* See nat/windows-nat.h. */
int DWORD
windows_per_inferior::handle_output_debug_string windows_per_inferior::handle_output_debug_string
(struct target_waitstatus *ourstatus) (struct target_waitstatus *ourstatus)
{ {
int retval = 0; DWORD thread_id = 0;
gdb::unique_xmalloc_ptr<char> s gdb::unique_xmalloc_ptr<char> s
= (target_read_string = (target_read_string
@@ -1041,19 +1041,19 @@ windows_per_inferior::handle_output_debug_string
if (gotasig) if (gotasig)
{ {
ourstatus->set_stopped (gotasig); ourstatus->set_stopped (gotasig);
retval = strtoul (p, &p, 0); thread_id = strtoul (p, &p, 0);
if (!retval) if (thread_id == 0)
retval = current_event.dwThreadId; thread_id = current_event.dwThreadId;
else else
x = (LPCVOID) (uintptr_t) strtoull (p, NULL, 0); x = (LPCVOID) (uintptr_t) strtoull (p, NULL, 0);
} }
DEBUG_EVENTS ("gdb: cygwin signal %d, thread 0x%x, CONTEXT @ %p", DEBUG_EVENTS ("gdb: cygwin signal %d, thread 0x%x, CONTEXT @ %p",
gotasig, retval, x); gotasig, thread_id, x);
} }
#endif #endif
return retval; return thread_id;
} }
static int static int

2
gdbserver/win32-low.cc
View File

@@ -642,7 +642,7 @@ win32_process_target::attach (unsigned long pid)
/* See nat/windows-nat.h. */ /* See nat/windows-nat.h. */
int DWORD
gdbserver_windows_process::handle_output_debug_string gdbserver_windows_process::handle_output_debug_string
(struct target_waitstatus *ourstatus) (struct target_waitstatus *ourstatus)
{ {

2
gdbserver/win32-low.h
View File

@@ -178,7 +178,7 @@ struct gdbserver_windows_process : public windows_nat::windows_process_info
windows_nat::windows_thread_info *thread_rec windows_nat::windows_thread_info *thread_rec
(ptid_t ptid, (ptid_t ptid,
windows_nat::thread_disposition_type disposition) override; windows_nat::thread_disposition_type disposition) override;
int handle_output_debug_string (struct target_waitstatus *ourstatus) override; DWORD handle_output_debug_string (struct target_waitstatus *ourstatus) override;
void handle_load_dll (const char *dll_name, LPVOID base) override; void handle_load_dll (const char *dll_name, LPVOID base) override;
void handle_unload_dll () override; void handle_unload_dll () override;
bool handle_access_violation (const EXCEPTION_RECORD *rec) override; bool handle_access_violation (const EXCEPTION_RECORD *rec) override;