RE: [PATCH v2 08/11] Move software breakpoint recognition code into x86-windows-nat.c

["Schimpe, Christina" <christina.schimpe@intel.com>]

> -----Original Message-----
> From: Hannes Domani <ssbssa@yahoo.de>
> Sent: Samstag, 17. Januar 2026 14:36
> To: gdb-patches@sourceware.org
> Cc: Tom Tromey <tom@tromey.com>
> Subject: [PATCH v2 08/11] Move software breakpoint recognition code into
> x86-windows-nat.c
> 
> Approved-By: Tom Tromey <tom@tromey.com>
> ---
> Changes in v2:
>   - changed EXCEPTION_RECORD to ER in comment
> ---
>  gdb/windows-nat.c     | 11 +++--------
>  gdb/windows-nat.h     |  3 +++
>  gdb/x86-windows-nat.c | 11 +++++++++++
>  3 files changed, 17 insertions(+), 8 deletions(-)
> 
> diff --git a/gdb/windows-nat.c b/gdb/windows-nat.c index
> f9d07336cca..3ed34087bf9 100644
> --- a/gdb/windows-nat.c
> +++ b/gdb/windows-nat.c
> @@ -1147,10 +1147,7 @@
> windows_nat_target::get_windows_debug_event
>  		    thread_id, windows_process->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
> -		  == STATUS_WX86_BREAKPOINT))
> +	  && is_sw_breakpoint (&current_event-
> >u.Exception.ExceptionRecord)
>  	  && windows_process->windows_initialization_done)
>  	{
>  	  ptid_t ptid = ptid_t (current_event->dwProcessId, thread_id, 0); @@
> -1201,10 +1198,8 @@ windows_nat_target::wait (ptid_t ptid, struct
> target_waitstatus *ourstatus,
>  		  th->stopped_at_software_breakpoint = false;
>  		  if (windows_process->current_event.dwDebugEventCode
>  		      == EXCEPTION_DEBUG_EVENT
> -		      && ((windows_process-
> >current_event.u.Exception.ExceptionRecord.ExceptionCode
> -			   == EXCEPTION_BREAKPOINT)
> -			  || (windows_process-
> >current_event.u.Exception.ExceptionRecord.ExceptionCode
> -			      == STATUS_WX86_BREAKPOINT))
> +		      && is_sw_breakpoint (&windows_process->current_event
> +					   .u.Exception.ExceptionRecord)
>  		      && windows_process->windows_initialization_done)
>  		    {
>  		      th->stopped_at_software_breakpoint = true; diff --git
> a/gdb/windows-nat.h b/gdb/windows-nat.h index
> df872907535..9257211dfd2 100644
> --- a/gdb/windows-nat.h
> +++ b/gdb/windows-nat.h
> @@ -215,6 +215,9 @@ struct windows_nat_target : public inf_child_target
>    virtual void store_one_register (const struct regcache *regcache,
>  				   windows_thread_info *th, int r) = 0;
> 
> +  /* Determine if ER contains a software-breakpoint.  */  virtual bool
> + is_sw_breakpoint (EXCEPTION_RECORD *er) = 0;

Nit: Shouldn't this better be "const EXCEPTION_RECORD *er" ?

Otherwise, this LGTM.

Reviewed-By: Christina Schimpe <christina.schimpe@intel.com>

Christina
Intel Deutschland GmbH
Registered Address: Dornacher Straße 1, 85622 Feldkirchen, Germany
Tel: +49 89 991 430, www.intel.de
Managing Directors: Harry Demas, Jeffrey Schneiderman, Yin Chong Sorrell
Chairperson of the Supervisory Board: Nicole Lau
Registered Seat: Munich
Commercial Register: Amtsgericht München HRB 186928