From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id eLbiL/syK2g2NyoAWB0awg (envelope-from ) for ; Mon, 19 May 2025 09:32:43 -0400 Received: by simark.ca (Postfix, from userid 112) id C1F9D1E11C; Mon, 19 May 2025 09:32:43 -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 073971E102 for ; Mon, 19 May 2025 09:32:43 -0400 (EDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id AC2F63858410 for ; Mon, 19 May 2025 13:32:42 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org AC2F63858410 Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by sourceware.org (Postfix) with ESMTPS id 607DF385840F for ; Mon, 19 May 2025 13:24:39 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 607DF385840F 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 607DF385840F 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=1747661079; cv=none; b=Ux+mImpocViViMroCLvtYeC+Xhyq1MQEElS+Y7bksYWwD6+9hGGIEjZpJH4IvHwokpkDfJehTtp0UAw4wXdtoyZYCcxc36hz1A8WR93t17VfoYd80WMAxqh2yVe7DlZHsRavm6HbWNCbolpvSkySi5/7AW1TNh44h6/hlXUKI/4= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1747661079; c=relaxed/simple; bh=LFrWchqgTiR6lerHQhHJbmsyiF8ctRSQ1LdTg8GG1gI=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=QCYaBUDpYBvG5kHyrgFHRoF7OSN6fSLFPuuhij3nFJqf7W2ngn+V/Ud95AbGGmJMvy4UlRWBNO4jU/GhXVOWGyGrcUe9NTLvuVwGTkXB+fYizZUd4XDS5YvrtdhKiurkAWQfEJkviccQ1kGj7vBAYhsU22fTMXrrsZvsq02gk0U= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 607DF385840F Received: by mail-wr1-f49.google.com with SMTP id ffacd0b85a97d-3a375e72473so335257f8f.0 for ; Mon, 19 May 2025 06:24:39 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747661078; x=1748265878; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=C5TNYs58f/VjQJEi5I606G+dBx+j6i62exYYG5wB7Jk=; b=URxAqR1IrlPXb5x24F16rg21tPVOIaO/EN9HmdhMtFB3Eug9i4+hqSpYbYBg5Txa9m fKbTreNZ4qXILYBuSrbbbnvnPMD3UZhmHxN7B7N/gCxy6J4FGOZmV9gHEGO6mayshFeE 1vNHiPBAE6YVglrr4CTP6DES7ZKvg9308iwM9HkfxbjRP/j11GDMjcNVgiQjPuOBZLKf FkaIujTBbICg3o43PCdFUY6KGpC8eS+b2wxLjKKNGg6e82y5RlQEPVzlGZ+6/AXs5RwP x/DeQlarZdbiWMH18B5j2S7HvAn+3Bp6GqJjN+v3TDJRCtOLQZwJcWsd1zFgiHhITmFg CE1A== X-Gm-Message-State: AOJu0Yz+/1kqPCm5kQ+SZIYeMd+aEIqG26+CJHGC7l/Z8wIz0NrxcD8E MOF1ig87L5662RJkWFi7AcPSTptx5Opqo6lt9gZfQxCaLnrELruyheFfj738d7Su X-Gm-Gg: ASbGnctirKySXMIydAfcgO5w7Z+tRW1TSdsWivfeKd0mhfEX/94NWohcZyKWol8YYom FFJkIwD1FMZl4SXW5zFkmpcXxcZDi63q9FGuFarO31nxsIIRsENydo7P16rn95NBbs2u5tkLt5i zSXiwYmztNkouwscJVeBSh30H3enip8oEn8bzQiJobHT8F/tcj6kwDuaDVy/M1Yp26n5r9h1EXx WrU7HordMJthH5gXpds72NKFRQ/OXuSx3q2atJJwnVz8Xz6733lMjgpzM0SwJAEwnJxRBxqsnS4 4hruLLJoLD8nSB1MA7d44oIsRool30m9uDAS2qNXeV28S5kErOQ= X-Google-Smtp-Source: AGHT+IFMxttNUzgUAd/V7JhhcRxUBSjmCpedvMxYkDOP8WbbFYg6c9AUFxidiQWZ3FqoC1JZuCjstg== X-Received: by 2002:a5d:6a49:0:b0:3a3:5cca:a551 with SMTP id ffacd0b85a97d-3a35ccaa782mr7647929f8f.54.1747661077876; Mon, 19 May 2025 06:24:37 -0700 (PDT) Received: from localhost ([2001:8a0:4fe9:b400:8d90:6f0d:36bf:32df]) by smtp.gmail.com with UTF8SMTPSA id ffacd0b85a97d-3a35ca4d310sm12955586f8f.17.2025.05.19.06.24.37 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 19 May 2025 06:24:37 -0700 (PDT) From: Pedro Alves To: gdb-patches@sourceware.org Subject: [PATCH v2 28/47] Windows gdb+gdbserver: Make siginfo_er per-thread state Date: Mon, 19 May 2025 14:22:49 +0100 Message-ID: <20250519132308.3553663-29-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 With non-stop mode support, each thread has its own "last event", and so printing $_siginfo should print the siginfo of the selected thread. Likewise, with all-stop and scheduler-locking. This patch reworks the siginfo functions in gdb/windows-nat.c and gdbserver/win32-low.cc to reuse the exception record already saved within each thread's 'last_event' field. Here's an example of what you'll see after the whole non-stop series: (gdb) thread apply all p -pretty -- $_siginfo Thread 3 (Thread 2612.0x1470): $1 = { ExceptionCode = DBG_CONTROL_C, ExceptionFlags = 0, ExceptionRecord = 0x0, ExceptionAddress = 0x7ffd0583e929 , NumberParameters = 0, { ExceptionInformation = {0 }, AccessViolationInformation = { Type = READ_ACCESS_VIOLATION, Address = 0x0 } } } Thread 2 (Thread 2612.0x1704): $2 = { ExceptionCode = SINGLE_STEP, ExceptionFlags = 0, ExceptionRecord = 0x0, ExceptionAddress = 0x7ffd080ad6e4 , NumberParameters = 0, { ExceptionInformation = {0 }, AccessViolationInformation = { Type = READ_ACCESS_VIOLATION, Address = 0x0 } } } Thread 1 (Thread 2612.0x434): $3 = { ExceptionCode = BREAKPOINT, ExceptionFlags = 0, ExceptionRecord = 0x0, ExceptionAddress = 0x7ff6f691174c , NumberParameters = 1, { ExceptionInformation = {0 }, AccessViolationInformation = { Type = READ_ACCESS_VIOLATION, Address = 0x0 } } } (gdb) This was in non-stop mode, and the program originally had two threads. Thread 1 stopped for a breakpoint, then thread 2 was manually interrupted/paused and then single-stepped. And then I typed Ctrl-C in the inferior's terminal, which made Windows inject thread 3 in the inferior, and report a DBG_CONTROL_C exception for it. Change-Id: I5d4f1b62f59e8aef3606642c6524df2362b0fb7d --- gdb/nat/windows-nat.c | 2 -- gdb/nat/windows-nat.h | 3 --- gdb/windows-nat.c | 33 ++++++++++++++++----------------- gdbserver/win32-low.cc | 27 ++++++++++++++------------- 4 files changed, 30 insertions(+), 35 deletions(-) diff --git a/gdb/nat/windows-nat.c b/gdb/nat/windows-nat.c index 864788ec125..6128b83bea4 100644 --- a/gdb/nat/windows-nat.c +++ b/gdb/nat/windows-nat.c @@ -357,8 +357,6 @@ windows_process_info::handle_exception (DEBUG_EVENT ¤t_event, DWORD code = rec->ExceptionCode; handle_exception_result result = HANDLE_EXCEPTION_HANDLED; - memcpy (&siginfo_er, rec, sizeof siginfo_er); - switch (code) { case EXCEPTION_ACCESS_VIOLATION: diff --git a/gdb/nat/windows-nat.h b/gdb/nat/windows-nat.h index 71cb118f5d6..8da9ca6e78f 100644 --- a/gdb/nat/windows-nat.h +++ b/gdb/nat/windows-nat.h @@ -152,9 +152,6 @@ struct windows_process_info DWORD process_id = 0; DWORD main_thread_id = 0; - /* Contents of $_siginfo */ - EXCEPTION_RECORD siginfo_er {}; - #ifdef __x86_64__ /* The target is a WOW64 process */ bool wow64_process = false; diff --git a/gdb/windows-nat.c b/gdb/windows-nat.c index 87cf5e1a4e8..09c2d224fd0 100644 --- a/gdb/windows-nat.c +++ b/gdb/windows-nat.c @@ -2888,7 +2888,6 @@ windows_nat_target::mourn_inferior () CHECK (CloseHandle (windows_process.handle)); windows_process.open_process_used = 0; } - windows_process.siginfo_er.ExceptionCode = 0; inf_child_target::mourn_inferior (); } @@ -3005,8 +3004,15 @@ static enum target_xfer_status windows_xfer_siginfo (gdb_byte *readbuf, ULONGEST offset, ULONGEST len, ULONGEST *xfered_len) { - char *buf = (char *) &windows_process.siginfo_er; - size_t bufsize = sizeof (windows_process.siginfo_er); + windows_thread_info *th = windows_process.find_thread (inferior_ptid); + + if (th->last_event.dwDebugEventCode != EXCEPTION_DEBUG_EVENT) + return TARGET_XFER_E_IO; + + EXCEPTION_RECORD &er = th->last_event.u.Exception.ExceptionRecord; + + char *buf = (char *) &er; + size_t bufsize = sizeof (er); #ifdef __x86_64__ EXCEPTION_RECORD32 er32; @@ -3015,23 +3021,16 @@ windows_xfer_siginfo (gdb_byte *readbuf, ULONGEST offset, ULONGEST len, buf = (char *) &er32; bufsize = sizeof (er32); - er32.ExceptionCode = windows_process.siginfo_er.ExceptionCode; - er32.ExceptionFlags = windows_process.siginfo_er.ExceptionFlags; - er32.ExceptionRecord - = (uintptr_t) windows_process.siginfo_er.ExceptionRecord; - er32.ExceptionAddress - = (uintptr_t) windows_process.siginfo_er.ExceptionAddress; - er32.NumberParameters = windows_process.siginfo_er.NumberParameters; - int i; - for (i = 0; i < EXCEPTION_MAXIMUM_PARAMETERS; i++) - er32.ExceptionInformation[i] - = windows_process.siginfo_er.ExceptionInformation[i]; + er32.ExceptionCode = er.ExceptionCode; + er32.ExceptionFlags = er.ExceptionFlags; + er32.ExceptionRecord = (uintptr_t) er.ExceptionRecord; + er32.ExceptionAddress = (uintptr_t) er.ExceptionAddress; + er32.NumberParameters = er.NumberParameters; + for (int i = 0; i < EXCEPTION_MAXIMUM_PARAMETERS; i++) + er32.ExceptionInformation[i] = er.ExceptionInformation[i]; } #endif - if (windows_process.siginfo_er.ExceptionCode == 0) - return TARGET_XFER_E_IO; - if (readbuf == nullptr) return TARGET_XFER_E_IO; diff --git a/gdbserver/win32-low.cc b/gdbserver/win32-low.cc index c3e35a6f602..c95ec112bf7 100644 --- a/gdbserver/win32-low.cc +++ b/gdbserver/win32-low.cc @@ -654,7 +654,6 @@ win32_clear_process () } for_each_thread (delete_thread_info); - windows_process.siginfo_er.ExceptionCode = 0; } /* Implementation of target_ops::kill. */ @@ -1284,14 +1283,18 @@ win32_process_target::qxfer_siginfo (const char *annex, unsigned const char *writebuf, CORE_ADDR offset, int len) { - if (windows_process.siginfo_er.ExceptionCode == 0) + windows_thread_info *th = windows_process.find_thread (current_thread->id); + + if (th->last_event.dwDebugEventCode != EXCEPTION_DEBUG_EVENT) return -1; if (readbuf == nullptr) return -1; - char *buf = (char *) &windows_process.siginfo_er; - size_t bufsize = sizeof (windows_process.siginfo_er); + EXCEPTION_RECORD &er = th->last_event.u.Exception.ExceptionRecord; + + char *buf = (char *) &er; + size_t bufsize = sizeof (er); #ifdef __x86_64__ EXCEPTION_RECORD32 er32; @@ -1300,17 +1303,15 @@ win32_process_target::qxfer_siginfo (const char *annex, buf = (char *) &er32; bufsize = sizeof (er32); - er32.ExceptionCode = windows_process.siginfo_er.ExceptionCode; - er32.ExceptionFlags = windows_process.siginfo_er.ExceptionFlags; + er32.ExceptionCode = er.ExceptionCode; + er32.ExceptionFlags = er.ExceptionFlags; er32.ExceptionRecord - = (uintptr_t) windows_process.siginfo_er.ExceptionRecord; + = (uintptr_t) er.ExceptionRecord; er32.ExceptionAddress - = (uintptr_t) windows_process.siginfo_er.ExceptionAddress; - er32.NumberParameters = windows_process.siginfo_er.NumberParameters; - int i; - for (i = 0; i < EXCEPTION_MAXIMUM_PARAMETERS; i++) - er32.ExceptionInformation[i] - = windows_process.siginfo_er.ExceptionInformation[i]; + = (uintptr_t) er.ExceptionAddress; + er32.NumberParameters = er.NumberParameters; + for (int i = 0; i < EXCEPTION_MAXIMUM_PARAMETERS; i++) + er32.ExceptionInformation[i] = er.ExceptionInformation[i]; } #endif -- 2.49.0