From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id MVKjDHvLy2mzwQAAWB0awg (envelope-from ) for ; Tue, 31 Mar 2026 09:26:19 -0400 Authentication-Results: simark.ca; dkim=pass (1024-bit key; unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=mjqxGPRE; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=sFawwlCb; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=mjqxGPRE; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=sFawwlCb; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id 2F85E1E0BC; Tue, 31 Mar 2026 09:26: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.4 required=5.0 tests=ARC_SIGNED,ARC_VALID,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED,RCVD_IN_MSPIKE_H2,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 740EF1E04F for ; Tue, 31 Mar 2026 09:26:18 -0400 (EDT) Received: from vm01.sourceware.org (localhost [127.0.0.1]) by sourceware.org (Postfix) with ESMTP id EA8084BB58F5 for ; Tue, 31 Mar 2026 13:26:17 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org EA8084BB58F5 Authentication-Results: sourceware.org; dkim=pass (1024-bit key, unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=mjqxGPRE; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=sFawwlCb; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=mjqxGPRE; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=sFawwlCb Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) by sourceware.org (Postfix) with ESMTPS id 98E424BB58F5 for ; Tue, 31 Mar 2026 13:23:49 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 98E424BB58F5 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 98E424BB58F5 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=195.135.223.130 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1774963429; cv=none; b=Ht8k41jlhjm7+WdArPfEWrDMHDfERu3GfHeipIsCM6I0NZQ8D6oROIR7kJ870AfZiz5Y1j5X3mTMF5ejJFtFC82ANVxThyQZY2DKW0xlzBKN9P+LTIMVKFlyEcyPJIq/MCWgoKHYSMaIAKXSJdsyOjVLETTIZlVawZq+sTKpnUs= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1774963429; c=relaxed/simple; bh=U/RY4Dw7ygRaRe5P0JkqcU5GJdNbpcqKOJ8bvDC7V2c=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-ID:MIME-Version; b=lBTfmboRpGFJ6/WXwIWyFJiEEek1mEmJs4ffMyKAuCqNpcucGb3lXWq6NaMQLfdK0H4UGS9NDEtZlahjC9aIx2Is41EZEq/pJjahD8m8gTIOw2Al33Fdj596kgZppIYAaInALaa0ifcDeGd/kp1FdDVmG721qpMcraYKC6bZB+8= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 98E424BB58F5 Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id C34FF4D262 for ; Tue, 31 Mar 2026 13:23:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1774963422; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ic+NrHRUHvD6CcnswjNscQSnIyEXJ5Pw4dXrqAs3kBc=; b=mjqxGPREJf/OKi6U5LCdI4kg8vmUuFAKeumU/kxsU9SSSuf3Cfq299lIFJ691BR4zCcxFR EqmlK4Ct0Gm3yV6J40DBXRwz6OMJ5UrzEwu2zQ5bOY1aaLHHXT5uWouLQ8xYU5fc2mZkpf rworJ0BbvmaO8woIc4sm1JA511neZJk= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1774963422; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ic+NrHRUHvD6CcnswjNscQSnIyEXJ5Pw4dXrqAs3kBc=; b=sFawwlCbMb7jSCpozbq02jZKdP7+WoShVgZyXvm2y0SviYgfVpaq0xe5CoUS9gUuo85Fwq zys3o8TgdO1IobCA== Authentication-Results: smtp-out1.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=mjqxGPRE; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=sFawwlCb DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1774963422; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ic+NrHRUHvD6CcnswjNscQSnIyEXJ5Pw4dXrqAs3kBc=; b=mjqxGPREJf/OKi6U5LCdI4kg8vmUuFAKeumU/kxsU9SSSuf3Cfq299lIFJ691BR4zCcxFR EqmlK4Ct0Gm3yV6J40DBXRwz6OMJ5UrzEwu2zQ5bOY1aaLHHXT5uWouLQ8xYU5fc2mZkpf rworJ0BbvmaO8woIc4sm1JA511neZJk= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1774963422; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ic+NrHRUHvD6CcnswjNscQSnIyEXJ5Pw4dXrqAs3kBc=; b=sFawwlCbMb7jSCpozbq02jZKdP7+WoShVgZyXvm2y0SviYgfVpaq0xe5CoUS9gUuo85Fwq zys3o8TgdO1IobCA== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id AAB184A0B1 for ; Tue, 31 Mar 2026 13:23:42 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id eBx/KN7Ky2moUwAAD6G6ig (envelope-from ) for ; Tue, 31 Mar 2026 13:23:42 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [RFC v2 2/3] [gdb] Add thread_control_state::step_start_function methods Date: Tue, 31 Mar 2026 15:23:41 +0200 Message-ID: <20260331132342.1050954-3-tdevries@suse.de> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260331132342.1050954-1-tdevries@suse.de> References: <20260331132342.1050954-1-tdevries@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Action: no action X-Rspamd-Server: rspamd2.dmz-prg2.suse.org X-Spamd-Result: default: False [-3.01 / 50.00]; BAYES_HAM(-3.00)[99.99%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; ARC_NA(0.00)[]; FUZZY_RATELIMITED(0.00)[rspamd.com]; MIME_TRACE(0.00)[0:+]; RBL_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:104:10:150:64:97:from]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; RCVD_TLS_ALL(0.00)[]; DKIM_TRACE(0.00)[suse.de:+]; RCVD_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:97:from]; TO_DN_NONE(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[gdb-patches@sourceware.org]; DNSWL_BLOCKED(0.00)[2a07:de40:b281:104:10:150:64:97:from,2a07:de40:b281:106:10:150:64:167:received]; RCVD_VIA_SMTP_AUTH(0.00)[]; RECEIVED_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:106:10:150:64:167:received]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:dkim, suse.de:mid, imap1.dmz-prg2.suse.org:helo, imap1.dmz-prg2.suse.org:rdns] X-Rspamd-Queue-Id: C34FF4D262 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 Factor out all uses of thread_control_state::step_start_function into methods, and make the field private. Also add a shorthand thread_info::in_step_start_function, to avoid long lines: ... -ecs->event_thread->control.in_step_start_function (ecs->event_thread->stop_pc ()) +ecs->event_thread->in_step_start_function () ... Tested on x86_64-linux. --- gdb/gdbthread.h | 41 +++++++++++++++++++++++++++++++++++++++-- gdb/infcmd.c | 2 +- gdb/infrun.c | 12 +++++------- 3 files changed, 45 insertions(+), 10 deletions(-) diff --git a/gdb/gdbthread.h b/gdb/gdbthread.h index 68d7aebbbf7..c0a828409a4 100644 --- a/gdb/gdbthread.h +++ b/gdb/gdbthread.h @@ -126,8 +126,35 @@ struct thread_control_state CORE_ADDR step_range_start = 0; /* Inclusive */ CORE_ADDR step_range_end = 0; /* Exclusive */ - /* Function the thread was in as of last it started stepping. */ - struct symbol *step_start_function = nullptr; + /* Set step_start_function according to PC. */ + void set_step_start_function (CORE_ADDR pc) + { + m_step_start_function = find_symbol_for_pc (pc); + } + + /* Reset step_start_function. */ + void reset_step_start_function () + { + m_step_start_function = nullptr; + } + + /* Return true if PC is in step_start_function. */ + bool in_step_start_function (CORE_ADDR pc) + { + return m_step_start_function == find_symbol_for_pc (pc); + } + + /* Return true if step_start_function is set. */ + bool step_start_function_p () + { + return m_step_start_function != nullptr; + } + + /* Return step_start_function. */ + struct symbol *step_start_function () + { + return m_step_start_function; + } /* If GDB issues a target step request, and this is nonzero, the target should single-step this thread once, and then continue @@ -176,6 +203,10 @@ struct thread_control_state /* True if the thread is evaluating a BP condition. */ bool in_cond_eval = false; + +private: + /* Function the thread was in as of last it started stepping. */ + struct symbol *m_step_start_function = nullptr; }; /* Inferior thread specific part of `struct infcall_suspend_state'. */ @@ -348,6 +379,12 @@ class thread_info : public intrusive_list_node, See `struct thread_control_state'. */ thread_control_state control; + /* Return true if stopped in step_start_function. */ + bool in_step_start_function () + { + return stop_pc_p () && control.in_step_start_function (stop_pc ()); + } + /* Save M_SUSPEND to SUSPEND. */ void save_suspend_to (thread_suspend_state &suspend) const diff --git a/gdb/infcmd.c b/gdb/infcmd.c index 2e1a4d592c1..91fde405d7a 100644 --- a/gdb/infcmd.c +++ b/gdb/infcmd.c @@ -899,7 +899,7 @@ set_step_frame (thread_info *tp) set_step_info (tp, frame, sal); CORE_ADDR pc = get_frame_pc (frame); - tp->control.step_start_function = find_symbol_for_pc (pc); + tp->control.set_step_start_function (pc); } /* Step until outside of current statement. */ diff --git a/gdb/infrun.c b/gdb/infrun.c index 9864b5bbdec..d0378d9f7bc 100644 --- a/gdb/infrun.c +++ b/gdb/infrun.c @@ -3086,7 +3086,7 @@ clear_proceed_status_thread (struct thread_info *tp) tp->control.step_frame_id = null_frame_id; tp->control.step_stack_frame_id = null_frame_id; tp->control.step_over_calls = STEP_OVER_UNDEBUGGABLE; - tp->control.step_start_function = nullptr; + tp->control.reset_step_start_function (); tp->stop_requested = false; tp->control.stop_step = 0; @@ -7738,9 +7738,9 @@ process_event_stop_test (struct execution_control_state *ecs) if (execution_direction != EXEC_REVERSE && ecs->event_thread->control.step_over_calls == STEP_OVER_UNDEBUGGABLE && in_solib_dynsym_resolve_code (ecs->event_thread->stop_pc ()) - && (ecs->event_thread->control.step_start_function == nullptr + && (!ecs->event_thread->control.step_start_function_p () || !in_solib_dynsym_resolve_code ( - ecs->event_thread->control.step_start_function->value_block () + ecs->event_thread->control.step_start_function ()->value_block () ->entry_pc ()))) { CORE_ADDR pc_after_resolver = @@ -7864,8 +7864,7 @@ process_event_stop_test (struct execution_control_state *ecs) == ecs->event_thread->control.step_stack_frame_id) && ((ecs->event_thread->control.step_stack_frame_id != outer_frame_id) - || (ecs->event_thread->control.step_start_function - != find_symbol_for_pc (ecs->event_thread->stop_pc ()))))) + || !ecs->event_thread->in_step_start_function ()))) { CORE_ADDR stop_pc = ecs->event_thread->stop_pc (); CORE_ADDR real_stop_pc; @@ -9352,8 +9351,7 @@ print_stop_location (const target_waitstatus &ws) if (tp->control.stop_step && (tp->control.step_frame_id == get_frame_id (get_current_frame ())) - && (tp->control.step_start_function - == find_symbol_for_pc (tp->stop_pc ()))) + && (tp->in_step_start_function ())) { symtab_and_line sal = find_frame_sal (get_selected_frame (nullptr)); if (sal.symtab != tp->current_symtab) -- 2.51.0