diff options
| author | Hannes Domani <ssbssa@yahoo.de> | 2020-04-09 16:33:20 +0200 |
|---|---|---|
| committer | Hannes Domani <ssbssa@yahoo.de> | 2020-04-10 13:01:31 +0200 |
| commit | 13302e956fb7a0c700f53f16d985c9e6207e331c (patch) | |
| tree | 3fd9fe1b448cd685717fabccbc62e31ca2fd5e1d /gdb/windows-nat.c | |
| parent | a5d214978ffff7d4b3df9b89706c1df4f0ecd64e (diff) | |
| download | gdb-13302e956fb7a0c700f53f16d985c9e6207e331c.zip gdb-13302e956fb7a0c700f53f16d985c9e6207e331c.tar.gz gdb-13302e956fb7a0c700f53f16d985c9e6207e331c.tar.bz2 | |
Fix debugging of WOW64 processes
The new code regarding pending stops only checks for EXCEPTION_BREAKPOINT,
but for WOW64 processes STATUS_WX86_BREAKPOINT is necessary as well.
Also, ignore_first_breakpoint is used now in nat/windows-nat.c as well,
but was not available there.
gdb/ChangeLog:
2020-04-10 Hannes Domani <ssbssa@yahoo.de>
* nat/windows-nat.c (STATUS_WX86_BREAKPOINT, STATUS_WX86_SINGLE_STEP):
Move to...
* nat/windows-nat.h (STATUS_WX86_BREAKPOINT, STATUS_WX86_SINGLE_STEP):
... here.
* windows-nat.c (windows_nat_target::get_windows_debug_event):
Check for STATUS_WX86_BREAKPOINT.
(windows_nat_target::wait): Same.
Diffstat (limited to 'gdb/windows-nat.c')
| -rw-r--r-- | gdb/windows-nat.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/gdb/windows-nat.c b/gdb/windows-nat.c index cdaca8d..881240c 100644 --- a/gdb/windows-nat.c +++ b/gdb/windows-nat.c @@ -235,7 +235,6 @@ static int saw_create; static int open_process_used = 0; #ifdef __x86_64__ static bool wow64_process = false; -static bool ignore_first_breakpoint = false; #endif /* User options. */ @@ -1721,8 +1720,10 @@ windows_nat_target::get_windows_debug_event (int pid, thread_id, desired_stop_thread_id)); if (current_event.dwDebugEventCode == EXCEPTION_DEBUG_EVENT - && (current_event.u.Exception.ExceptionRecord.ExceptionCode - == EXCEPTION_BREAKPOINT) + && ((current_event.u.Exception.ExceptionRecord.ExceptionCode + == EXCEPTION_BREAKPOINT) + || (current_event.u.Exception.ExceptionRecord.ExceptionCode + == STATUS_WX86_BREAKPOINT)) && windows_initialization_done) { ptid_t ptid = ptid_t (current_event.dwProcessId, thread_id, 0); @@ -1801,8 +1802,10 @@ windows_nat_target::wait (ptid_t ptid, struct target_waitstatus *ourstatus, { current_windows_thread->stopped_at_software_breakpoint = false; if (current_event.dwDebugEventCode == EXCEPTION_DEBUG_EVENT - && (current_event.u.Exception.ExceptionRecord.ExceptionCode - == EXCEPTION_BREAKPOINT) + && ((current_event.u.Exception.ExceptionRecord.ExceptionCode + == EXCEPTION_BREAKPOINT) + || (current_event.u.Exception.ExceptionRecord.ExceptionCode + == STATUS_WX86_BREAKPOINT)) && windows_initialization_done) current_windows_thread->stopped_at_software_breakpoint = true; } |