From patchwork Tue May 7 23:42:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pedro Alves X-Patchwork-Id: 89695 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 60D493844778 for ; Tue, 7 May 2024 23:46:56 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) by sourceware.org (Postfix) with ESMTPS id 2EB103858D35 for ; Tue, 7 May 2024 23:44:11 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 2EB103858D35 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 2EB103858D35 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=209.85.221.47 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1715125455; cv=none; b=nQNe5zjmrQUB2Rpgv4Ndl3G6gebM8eQ0BJgwtA4qIR2/4kBX9PzXJMeJWXAVCtj7T0WWv2RXKAQ7/mrW7wf6QNJ25+TT3efqPax3pDb1YBvnWrfo9gAOl77Bfma10mtyZqwZeIWigAYAouiDizOe9NSPL7L2QDnZDDSOA5K+QrY= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1715125455; c=relaxed/simple; bh=OdkeH56zsv+sxT2+kJqisSqAzZa8KRXA+Qz+RfcOWLo=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=cDPTVJjfiMpuT6Fw8Fi7lppUO8UiS4n/uVRN3haHJT0itlktA+gh/efyaG1wGMPOnK3HoUvBLEnY2QdVWZKY86B8TTAlv0jLlpAVWZHkO6HxOM91Q6vVLA/R3tfYT9paNGLiDSIesgskeU8p7aPSoWfu3WlhpI6MVqJ+F7JTW6A= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-wr1-f47.google.com with SMTP id ffacd0b85a97d-34ddc9fe497so2153456f8f.3 for ; Tue, 07 May 2024 16:44:11 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715125450; x=1715730250; 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=bSgYk1t8kD3qGIEEuqpnwuRSY1TJ4piG3RR9UyOowtw=; b=vGz0kNbuEouavqld7VPnHoB2oVlc1rZ73NsedUuVzCk91C+ZddCMV2Jbn4cLurlkny VY18KNtRDcKidBVKuNYFD200YG/bCw22Ykr1esc8YDBugs9JMdI5Iu0csmBofReJHov7 N8R8BVvFUT3r7zZR1poGTvZERJASpc5xfXqPySucUMBy+bxa3O30E0F5Kvp4EztTHW48 94w33DCf30HGhBUOHHsAU/oVBflupIjd+zPG5UUwolCP2/7A2PqJl3ATKCyVJlYahv3o YrG5u7MfznrSDzK3HTEfR7lMfx1WQRheNTwtTsqUuDDj4p2iu6XaxVnaWzMxy9w/9cp9 Z2/A== X-Gm-Message-State: AOJu0YwZ9105aqN20DeF+U0tuTb2NWv6IUqYDX2QWjiKcSNdoLPfkJLR +tEAXNF35+nWgM81/NBKMGNtP+F+Ve+0vA+UigXQmQYA7N4iAkWKkX1Vf7eD X-Google-Smtp-Source: AGHT+IGxBssY4m8Qsb4bhCkeZv+gJ8uJq1wldfMInO3zMi0pgIf7qL0jidRHZnwzo+AnwzlBN/W4fg== X-Received: by 2002:adf:9bc9:0:b0:34d:a31e:3070 with SMTP id ffacd0b85a97d-34fca433fd0mr972457f8f.8.1715125449808; Tue, 07 May 2024 16:44:09 -0700 (PDT) Received: from localhost ([2001:8a0:f908:4900:2dd1:1a0d:2b75:dc42]) by smtp.gmail.com with UTF8SMTPSA id h3-20020a5d4303000000b0034f145b60ebsm6577523wrq.3.2024.05.07.16.44.09 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 07 May 2024 16:44:09 -0700 (PDT) From: Pedro Alves To: gdb-patches@sourceware.org Subject: [PATCH 23/34] Windows gdb+gdbserver: Make siginfo_er per-thread state Date: Wed, 8 May 2024 00:42:22 +0100 Message-ID: <20240507234233.371123-24-pedro@palves.net> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240507234233.371123-1-pedro@palves.net> References: <20240507234233.371123-1-pedro@palves.net> MIME-Version: 1.0 X-Spam-Status: No, score=-10.8 required=5.0 tests=BAYES_00, FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM, GIT_PATCH_0, HEADER_FROM_DIFFERENT_DOMAINS, KAM_DMARC_STATUS, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS, TXREP, T_FILL_THIS_FORM_SHORT autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org 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+patchwork=sourceware.org@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 | 28 +++++++++++++++------------- 4 files changed, 31 insertions(+), 35 deletions(-) diff --git a/gdb/nat/windows-nat.c b/gdb/nat/windows-nat.c index 57604312ccb..d43d549cb0d 100644 --- a/gdb/nat/windows-nat.c +++ b/gdb/nat/windows-nat.c @@ -367,8 +367,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 aab76d66ec8..86ad8d02e3c 100644 --- a/gdb/nat/windows-nat.h +++ b/gdb/nat/windows-nat.h @@ -146,9 +146,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 dd59bd2d383..510820d862d 100644 --- a/gdb/windows-nat.c +++ b/gdb/windows-nat.c @@ -2992,7 +2992,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 (); } @@ -3109,8 +3108,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; @@ -3119,23 +3125,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 40575e36501..55600910ffe 100644 --- a/gdbserver/win32-low.cc +++ b/gdbserver/win32-low.cc @@ -675,7 +675,6 @@ win32_clear_inferiors (void) } for_each_thread (delete_thread_info); - windows_process.siginfo_er.ExceptionCode = 0; clear_inferiors (); } @@ -1306,14 +1305,19 @@ 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_ptid ()); + + 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; @@ -1322,17 +1326,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