From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id qBy/KwcyK2i1NioAWB0awg (envelope-from ) for ; Mon, 19 May 2025 09:28:39 -0400 Received: by simark.ca (Postfix, from userid 112) id AEEA81E11C; Mon, 19 May 2025 09:28:39 -0400 (EDT) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-25) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-9.0 required=5.0 tests=ARC_SIGNED,ARC_VALID,BAYES_00, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE autolearn=ham autolearn_force=no version=4.0.1 Received: from server2.sourceware.org (server2.sourceware.org [8.43.85.97]) (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 22F311E102 for ; Mon, 19 May 2025 09:28:39 -0400 (EDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id C48D93858431 for ; Mon, 19 May 2025 13:28:38 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C48D93858431 Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) by sourceware.org (Postfix) with ESMTPS id 989843858430 for ; Mon, 19 May 2025 13:23:35 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 989843858430 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 989843858430 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=209.85.128.45 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1747661015; cv=none; b=Ojn6loZPCKOJxlG5vKBJIJlCOUKCURKOT5gvjHvbuyWh1Cmoq1RxH1AFNEfYeO7V2p4BEAnEcofwbiTQDM+cyWZuFJdGJcDrUIzJRII3AxPeNc4141qMXU5YcZg2Z87Z6cGBipQ1tTHQvZdYUW9FF59x9uGpUjORRDI2MHChQrA= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1747661015; c=relaxed/simple; bh=QSraw4yeI944fVl8/4KcTlm1/+Km87+k9bEuSG1rL1Y=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=fRxNgbW3FUkO7bpw5WWmdx5RDPaYeO/abFwYKP9zojf6TNLzv57KQCaEvDhIoNmebuQ9NAqY8JoCqve7JdvnCpZ3DiXOdnDldiLfQ+twG5Mpow4T24Qa9d15nrghTzTgKXWoKU6jtgX1nVsjUBC8ktiQaTN5tEltFaCd0LZ0Zg4= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 989843858430 Received: by mail-wm1-f45.google.com with SMTP id 5b1f17b1804b1-442f4a3a4d6so28402945e9.0 for ; Mon, 19 May 2025 06:23:35 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747661014; x=1748265814; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=M5iH6Re+7kwiiScEX8hB0D85+f2bWU9M+4hzH198AC4=; b=e+NaAIpQedlFwh+lSqds8Cif3J/hvAt7Q1NkD1Vf7T8pL14iOEKjRS/rIRwxR2kZmv AgAjyMYyRdVfAxNZCtYD3WAXwUXUyqRkCqSjMCKn7sMQ8g5uBNa/Y18UDPBgAF1DClgN 77yDdbToiL4sFhTspvpzGmPyfTGn2Saf9D6PKdUHxvUQ5T8G+HNKqNx1r100Fu38zS+V fGjIvIZ7F4vB7BGsAKSrjV+lFHw/kS7VhZpENhl4wkXGyQLsA8E9DUM6HVZiQstoVDzD n8e1duG9QJHfJCUXyRo9M9u2QiSCt8W/2nbIITZQBu6H1uDRYVLV0kD2C7YnK16L7n2X NSSA== X-Gm-Message-State: AOJu0YzSFkTJ4Xs99+FbK9ebcIqVUJuhfzFAzMTHUOs4KKTbtJf0yG3K Vx0wJFc1MK40qu8112ZrlAtc9IGxgCy8XFJbD8P64B+kxyvAyZZyNWipvbxc3BZ2 X-Gm-Gg: ASbGnct/RzwVekrdIDPcbwpIL+1Z8e2GDb11/9g/88zWqcGZrf2wpwzRcckU7LR9nRB 49YvVbvy6EWAVT/R5BmO4lHOdoTwY6uWUCYjtnqxqZ3n83j8E1fI/I9QqOaSYr0iojLbSgNCaij j7BQwOpW0l3m5jyqladzKiGFpibWU0lD6nGQTtem7cxM9yvz1lArisG8zg5keiwrmwSQdDhXI8h I2pJXF4no5ODqvwpG2mDbn4lm9yNTjxwHqcstWmeoTMmPmmSul0gmDpuQJo6Zkysc0OD0ng1eoj PN865qD/6fhxLcxl12osRk2N2LGFViF8y5XpAj6ZK7onAQJGBpw= X-Google-Smtp-Source: AGHT+IHG8O8fdW0wAkCA2zvMQoPChApqHjULUpoPRC9ESfXa0FEe5W/MoSxKkNDxiejOWplp7xBAKA== X-Received: by 2002:a05:600c:821b:b0:43b:bfa7:c7d with SMTP id 5b1f17b1804b1-442f84c2008mr151828375e9.2.1747661014192; Mon, 19 May 2025 06:23:34 -0700 (PDT) Received: from localhost ([2001:8a0:4fe9:b400:8d90:6f0d:36bf:32df]) by smtp.gmail.com with UTF8SMTPSA id 5b1f17b1804b1-442f338050csm208315995e9.10.2025.05.19.06.23.33 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 19 May 2025 06:23:33 -0700 (PDT) From: Pedro Alves To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH v2 09/47] Windows gdb: handle_output_debug_string return type Date: Mon, 19 May 2025 14:22:30 +0100 Message-ID: <20250519132308.3553663-10-pedro@palves.net> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250519132308.3553663-1-pedro@palves.net> References: <20250519132308.3553663-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 | 16 ++++++++-------- gdbserver/win32-low.cc | 2 +- gdbserver/win32-low.h | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/gdb/nat/windows-nat.h b/gdb/nat/windows-nat.h index b0e51e93fd0..902508b0aea 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 5b00b341afa..e9389169ab3 100644 --- a/gdb/windows-nat.c +++ b/gdb/windows-nat.c @@ -96,7 +96,7 @@ struct windows_per_inferior : public 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; @@ -983,11 +983,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 @@ -1028,19 +1028,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; } static int diff --git a/gdbserver/win32-low.cc b/gdbserver/win32-low.cc index ea11c3b7795..2bf42f42350 100644 --- a/gdbserver/win32-low.cc +++ b/gdbserver/win32-low.cc @@ -619,7 +619,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 fb757da9718..b12c217c406 100644 --- a/gdbserver/win32-low.h +++ b/gdbserver/win32-low.h @@ -185,7 +185,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.49.0