From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id hhrDDRdS72mZUz4AWB0awg (envelope-from ) for ; Mon, 27 Apr 2026 08:09:59 -0400 Received: by simark.ca (Postfix, from userid 112) id 24D191E067; Mon, 27 Apr 2026 08:09:59 -0400 (EDT) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-25) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-2.3 required=5.0 tests=ARC_SIGNED,ARC_VALID,BAYES_00, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED autolearn=ham autolearn_force=no version=4.0.1 Received: from vm01.sourceware.org (vm01.sourceware.org [38.145.34.32]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id 428581E067 for ; Mon, 27 Apr 2026 08:09:58 -0400 (EDT) Received: from vm01.sourceware.org (localhost [127.0.0.1]) by sourceware.org (Postfix) with ESMTP id 6B7834B99F57 for ; Mon, 27 Apr 2026 12:09:57 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 6B7834B99F57 Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by sourceware.org (Postfix) with ESMTPS id 3FE8C4BAE7DC for ; Mon, 27 Apr 2026 12:09:33 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 3FE8C4BAE7DC Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=palves.net Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 3FE8C4BAE7DC Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=209.85.221.49 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1777291773; cv=none; b=xNsYvlxXbGo+OC5DvbAfXRhzPkCh7cf3dHx1BCT5JUD/aj+weVq+dtDebPEpl20GfUASvaEOMJ3Xn6i/kY8dMc1s4D2Icv5QaI35QrWT47WaSwgXhiz4DfBCggV1pQqIKHnqyreB4rjv6F3Y5TiB+qzFzCa1llela/cqnq//V+4= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1777291773; c=relaxed/simple; bh=Z+KTdwVm4fOIqj8TI38bM/V/lGXPw+/if7EFB8U90Bg=; h=Message-ID:Date:MIME-Version:Subject:To:From; b=klZgMIEiXqPxcVq16xY54o6s6kOEAIUcpJlGnUq34gZWVj4PI/zBIBJKQAO0vLEjh3aQaCgew3EFKlecicVxex3FrHdyvHfWzHkrEF78dxK66s0cMYc3+HAZk2xvq7zbwmgeWcf5YJhurCSzrB+hu+I78QOjJumGgkxhFcW3SD4= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 3FE8C4BAE7DC Received: by mail-wr1-f49.google.com with SMTP id ffacd0b85a97d-43cfde3c3f3so10320167f8f.3 for ; Mon, 27 Apr 2026 05:09:33 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777291772; x=1777896572; h=content-transfer-encoding:in-reply-to:content-language:from :references:cc:to:subject:user-agent:mime-version:date:message-id :x-gm-gg:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=7alN99AE6AskY33+xAGHdjKf6jaieRqNPTbR8pHbXFw=; b=m7ZV7ovgUM1r4W+BuumR1zXG2dBwKhu7dbfH7POR1KMg0oaYAbW4VYJTrxDhvUyHeF xE4FO8NsR0iL355V/tD/ZThZT20gBT6/4L8QQ+U3enEtJR9NAdbjGeKGGwl/AzobNGOS YxfgOuN81nVBNYvbcL+KjOYj7BSpGuLqtZECJkdEnk52ljtEhYUUdTZ0ynyT3jxVQ9Pw 3cdUWyAwnkE2L4GpiR/AJTkqDwFKNppzx+EKVRvDk+1MCy/IkyPgagAp1u58edJWMMi/ 8BdpZoHO+A62rcutlmQVG2/laVIIJPQoibDENVG4g6eQQ2rpuKoyBHmoOwESdsnqqISu Dzog== X-Forwarded-Encrypted: i=1; AFNElJ/sm2ebqQObmjWyHYaEA94Y/3XBuMgdMSKY1sSxvwCt2G7xJs1e9X00/BSinIUXmtZPIROuM7i0xDEagA==@sourceware.org X-Gm-Message-State: AOJu0YxgGbA0rNJTLDJoyghJDKMzaDB+qzEwSeDArgmg4KEZ93NiNk3M V32+A9hSV8ly0ZIo8GEuGb+Lp+7NDwzuTqsy5ND1FTMtilhdMljh7aJt X-Gm-Gg: AeBDievF2Zh9vW/kInzWv5R8KkPO9M9fcYtSnRGDpjPT+Uh5VeqsWMBJcGz6+qCakYE pzJmzIxrexcjoJ34hzqCUI5Eh8debAw+moBqkRLvAdzc5umlhahSPeQHm8nux0dUaqUtSCMm8v/ Rn8zM076tNJdknZmT1k8canowObhWXhkQgDnqJXfYo4rbkCt/JZeNyb0fOQHCcT66Dm31gXJooS g0G8tNpjr9eZN1qhEpIwNZweNvEj3GtaGnKDg4irVv/YMIaOKPZ5g6rGou1QRukhbr5N5mppGkW Lf8F6Gs8tNkBiLafqqnUf5XDlnnAwGNUlLDujUSERp7TAlX1sBuy8yNDfg4EnuUMLDTk0nt/z3j NQqdjUehuuMtqevtyZsdS0PA3oUt9dZcPzMC1sFrVLIVIOz/zrrrwIQaDSnKqqzPot4RbT4a27U nq/9yLwDe/jXRN2M5Z0wSX0OfLuIpDchHlmEWwTdr90a/Z1VTWfFxKmUqoKXRltjm4TxL8+iatB wjv X-Received: by 2002:a05:6000:1acf:b0:43c:f1a5:56f6 with SMTP id ffacd0b85a97d-43fe3e23c0emr64115029f8f.43.1777291771585; Mon, 27 Apr 2026 05:09:31 -0700 (PDT) Received: from ?IPV6:2001:8a0:facb:a800:cdb2:7783:871a:c905? ([2001:8a0:facb:a800:cdb2:7783:871a:c905]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-43fe4e46898sm85345127f8f.27.2026.04.27.05.09.30 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 27 Apr 2026 05:09:30 -0700 (PDT) Message-ID: <055dc14a-18a6-4860-b815-704a1300c3c0@palves.net> Date: Mon, 27 Apr 2026 13:09:28 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: [pushed/ob] Restore windows_nat_target::wait is_sw_breakpoint change To: Hannes Domani , "gdb-patches@sourceware.org" Cc: Tom Tromey References: <20260424204508.1343973-1-pedro@palves.net> <20260424204508.1343973-8-pedro@palves.net> <530961686.4743126.1777207923450@mail.yahoo.com> From: Pedro Alves Content-Language: en-US In-Reply-To: <530961686.4743126.1777207923450@mail.yahoo.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces~public-inbox=simark.ca@sourceware.org Hi! On 2026-04-26 13:52, Hannes Domani wrote: > This reverted the is_sw_breakpoint change done for aarch64 support. Whoops, sorry about that. Lost in rebase conflict resolution. I've pushed the obvious fix below. >From 20699002b9630ed90b2518735c7d945e89445a83 Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Mon, 27 Apr 2026 11:46:21 +0100 Subject: [PATCH] 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 --- 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 (¤t_event + .u.Exception.ExceptionRecord) && windows_process->windows_initialization_done) { th->stopped_at_software_breakpoint = true; base-commit: 831f056f767fe775c8862a09dc3bbe2e69c5e17c -- 2.53.0