Restore windows_nat_target::wait is_sw_breakpoint change

Hannes noticed that commit db040a86c8 ("Windows gdb: Simplify
windows_nat_target::wait") inadvertently reverted the earlier
is_sw_breakpoint change in windows_nat_target::wait from 6fc89bae17
("Move software breakpoint recognition code into x86-windows-nat.c")
for Aarch64 support.  This commit restores it.

Change-Id: Ice2181bf4a6c8dcefd127a85ebfc660a3f430517
commit-id:546f39de

diff --git a/gdb/windows-nat.c b/gdb/windows-nat.c
index 17166fdcfad1c787d62aac81a0a81e9e9f8768db..1dfe2df389d92c5c76f0a52f892c68fa0d69c1db 100644 (file)
--- a/gdb/windows-nat.c
+++ b/gdb/windows-nat.c
@@ -1216,10 +1216,8 @@ windows_nat_target::wait (ptid_t ptid, struct target_waitstatus *ourstatus,
              th->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
-                         == STATUS_WX86_BREAKPOINT))
+                 && is_sw_breakpoint (&current_event
+                                      .u.Exception.ExceptionRecord)
                  && windows_process->windows_initialization_done)
                {
                  th->stopped_at_software_breakpoint = true;