From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id sXy4EJvW62m5UzkAWB0awg (envelope-from ) for ; Fri, 24 Apr 2026 16:46:19 -0400 Received: by simark.ca (Postfix, from userid 112) id 3F0B11E0CA; Fri, 24 Apr 2026 16:46:19 -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 63DC21E093 for ; Fri, 24 Apr 2026 16:46:18 -0400 (EDT) Received: from vm01.sourceware.org (localhost [127.0.0.1]) by sourceware.org (Postfix) with ESMTP id E49684B920EF for ; Fri, 24 Apr 2026 20:46:17 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E49684B920EF Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) by sourceware.org (Postfix) with ESMTPS id 81B454BB5925 for ; Fri, 24 Apr 2026 20:45:17 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 81B454BB5925 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 81B454BB5925 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=209.85.128.42 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1777063517; cv=none; b=JNyDQdUM0khhi7BC/rJ/QiOGSWJczHmufGxlzaPJsYYweuRsbWJB/NeCZgiNz9lIobqL0ix5tH4RWNQ4QrYl/1cmB31skYmqCpMAsZ2oGPHZdcaVEqwp2AI2RIJV4bS2qh/6hy/HfZB5P0Q5e73YcK9kSTrb+229AZ5FRCMCCI4= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1777063517; c=relaxed/simple; bh=NQI9/OnhFrk0LY0E9ZTkcOWQ9MHO3UH/UVeaLQ/L83Q=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=vWNjlt33Klr+4WfUetiSfefrqd7sM3DWy51042ev1eB+qE3XRZ5/qK/Efz2OWO2kDnhEvdjyVtuPlLvGs3iIKQtrwB7QRO75Vv8GLoyS9nJZp9VJ672NV7j35zKYVO3N6qph4y/T5of49sdVH98Z837nRgsjRBISJGGTj/dEzus= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 81B454BB5925 Received: by mail-wm1-f42.google.com with SMTP id 5b1f17b1804b1-4852a9c6309so76937705e9.0 for ; Fri, 24 Apr 2026 13:45:17 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777063516; x=1777668316; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=9GoEdujuQRPPPcdtg9jx906chgcHMqfDca2qf5dO1Rc=; b=IpZ5dSkaCcBo7yEY5j8sbe7KOBY4o3J6mQzQimmUfoKRymuGT/KKFh0HgWZsVFDnll EaBrzHKU2ysonUaww6y/uExFH2kXY399ai2OjWl3i7bTeTRNTlHCb2sDIGHDJUHOzj4h ygE9XTdkCx+iJbraPeTv/nlmAIUsfnj7WYg4t1Ys4Qgk/k/azdsHg51WsdXZVcxx7n0V 3mh7VuyFxwdN3r5Kk/EMPeKG6lZwiRjxkNePsOGmoo61XUMS/OSu4Of6onKfYZNX5GQ6 T7qmjmWPgFmyeL77qmK9fDX9dqTkUfgod8X8PuJKr3098D0AGbuxlire1wyGIxkF39Ui RlSA== X-Gm-Message-State: AOJu0YxhqgaPF9hEsOPPxC3AOzyUYGh8j1VyKSkxe7IKwefeXWkgRNBw bVeaTIxPjpeLGyYfpKok+hf4gKLSuv688Nm7f6II8wMJdOsSVnjEntPaiAXA8t4/ X-Gm-Gg: AeBDiesliVHloVAsPt6Cedtid7/xTiZTF4DpUfmh35BaB9KYbud51VHBRFR+KAWhuLM c7NI4SLF6La0ckxKIGQZZIuaQu7TmA7RILZzY5bMTNBsHOYqJeKmLCuFcYGK89WH6hvMbl5JSiG uLsOQTTbzHEgnCO9adB8L2CACikPrZHN3BsV0KSzaajtrxdhwdoTIAoVYEKKCD6RJKkIh/VKdHf mpJ57scwR6eV4M2NvKDTwF+QSgzFMifcaRao0Nl5/8/h8z8Oiv5GL1iEa6pvRcOD8rfxIVz1ANI UoUdsjv3/1cDwzWUCp/kREjmnYyqR9g3C6C+G7WxD8fJ4nkDlAIG52HmDKA/lRE2cq6mh8UZ5fS kta7OFk4+RDC/X88vxeOmaxNHDiBR9hOyO/O4NTehAsDzXExH006XcM9LXmskkUa/I419ev7ZmV g0wa2jsz1waoqU61JLOXkbYa64vitGRkou X-Received: by 2002:a05:600c:3110:b0:485:3abe:ab86 with SMTP id 5b1f17b1804b1-488fb739ce4mr460651675e9.4.1777063515809; Fri, 24 Apr 2026 13:45:15 -0700 (PDT) Received: from localhost ([2001:8a0:facb:a800:7315:8865:c664:fc06]) by smtp.gmail.com with UTF8SMTPSA id 5b1f17b1804b1-488ffad20f2sm308668085e9.0.2026.04.24.13.45.15 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 24 Apr 2026 13:45:15 -0700 (PDT) From: Pedro Alves To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [pushed 02/28] Windows gdb: handle_output_debug_string return type Date: Fri, 24 Apr 2026 21:44:42 +0100 Message-ID: <20260424204508.1343973-3-pedro@palves.net> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260424204508.1343973-1-pedro@palves.net> References: <20260424204508.1343973-1-pedro@palves.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 handle_output_debug_string returns a Windows thread id, so it should return a DWORD instead of an int. Approved-By: Tom Tromey Change-Id: Icbd071a1a37de8a0fc8918bd13254a8d40311e32 --- gdb/nat/windows-nat.h | 2 +- gdb/windows-nat.c | 14 +++++++------- gdb/windows-nat.h | 2 +- gdbserver/win32-low.cc | 2 +- gdbserver/win32-low.h | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/gdb/nat/windows-nat.h b/gdb/nat/windows-nat.h index 32f055a7a52..97c8c6cc43d 100644 --- a/gdb/nat/windows-nat.h +++ b/gdb/nat/windows-nat.h @@ -202,7 +202,7 @@ struct windows_process_info a Cygwin signal. Otherwise just print the string as a warning. This function must be supplied by the embedding application. */ - virtual int handle_output_debug_string (struct target_waitstatus *ourstatus) = 0; + virtual DWORD handle_output_debug_string (struct target_waitstatus *ourstatus) = 0; /* Handle a DLL load event. diff --git a/gdb/windows-nat.c b/gdb/windows-nat.c index 46385ff87c5..ff23791e5a8 100644 --- a/gdb/windows-nat.c +++ b/gdb/windows-nat.c @@ -627,11 +627,11 @@ signal_event_command (const char *args, int from_tty) /* See nat/windows-nat.h. */ -int +DWORD windows_per_inferior::handle_output_debug_string (struct target_waitstatus *ourstatus) { - int retval = 0; + DWORD thread_id = 0; gdb::unique_xmalloc_ptr s = (target_read_string @@ -672,19 +672,19 @@ windows_per_inferior::handle_output_debug_string if (gotasig) { ourstatus->set_stopped (gotasig); - retval = strtoul (p, &p, 0); - if (!retval) - retval = current_event.dwThreadId; + thread_id = strtoul (p, &p, 0); + if (thread_id == 0) + thread_id = current_event.dwThreadId; else x = (LPCVOID) (uintptr_t) strtoull (p, NULL, 0); } DEBUG_EVENTS ("gdb: cygwin signal %d, thread 0x%x, CONTEXT @ %p", - gotasig, retval, x); + gotasig, thread_id, x); } #endif - return retval; + return thread_id; } /* See nat/windows-nat.h. */ diff --git a/gdb/windows-nat.h b/gdb/windows-nat.h index 10c144bf4c6..a686c5b6679 100644 --- a/gdb/windows-nat.h +++ b/gdb/windows-nat.h @@ -50,7 +50,7 @@ struct windows_per_inferior : public windows_nat::windows_process_info windows_thread_info *find_thread (ptid_t ptid) override; windows_thread_info *thread_rec (ptid_t ptid, thread_disposition_type disposition) override; - int handle_output_debug_string (struct target_waitstatus *ourstatus) override; + DWORD handle_output_debug_string (struct target_waitstatus *ourstatus) override; void handle_load_dll (const char *dll_name, LPVOID base) override; void handle_unload_dll () override; bool handle_access_violation (const EXCEPTION_RECORD *rec) override; diff --git a/gdbserver/win32-low.cc b/gdbserver/win32-low.cc index d2b76b5d6c9..d6d7acf599d 100644 --- a/gdbserver/win32-low.cc +++ b/gdbserver/win32-low.cc @@ -608,7 +608,7 @@ win32_process_target::attach (unsigned long pid) /* See nat/windows-nat.h. */ -int +DWORD gdbserver_windows_process::handle_output_debug_string (struct target_waitstatus *ourstatus) { diff --git a/gdbserver/win32-low.h b/gdbserver/win32-low.h index edd7c757f09..48ad111ad1a 100644 --- a/gdbserver/win32-low.h +++ b/gdbserver/win32-low.h @@ -182,7 +182,7 @@ struct gdbserver_windows_process : public windows_nat::windows_process_info windows_nat::windows_thread_info *thread_rec (ptid_t ptid, windows_nat::thread_disposition_type disposition) override; - int handle_output_debug_string (struct target_waitstatus *ourstatus) override; + DWORD handle_output_debug_string (struct target_waitstatus *ourstatus) override; void handle_load_dll (const char *dll_name, LPVOID base) override; void handle_unload_dll () override; bool handle_access_violation (const EXCEPTION_RECORD *rec) override; -- 2.53.0