[binutils-gdb] Restore windows_nat_target::wait is_sw_breakpoint change

Pedro Alves via Gdb-cvs <[email protected]>
Newsgroups gmane.comp.gdb.cvs
Message-ID <[email protected]>
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=20699002b9630ed90b2518735c7d945e89445a83

commit 20699002b9630ed90b2518735c7d945e89445a83
Author: Pedro Alves <[email protected]>
Date:   Mon Apr 27 11:46:21 2026 +0100

    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:
---
 gdb/windows-nat.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/gdb/windows-nat.c b/gdb/windows-nat.c
index 17166fdcfad..1dfe2df389d 100644
--- 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;
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.