From patchwork Fri Oct 21 11:59:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Willgerodt, Felix" X-Patchwork-Id: 59277 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 D7642385141F for ; Fri, 21 Oct 2022 12:04:14 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D7642385141F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1666353854; bh=PXWEtyhSs+rkxghqgawjftVC6UxSc4Brp0RlP1KhjHY=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=wMiWk9tcd/AZhPmVnwWTN4xYGPb3lTsv3qanzF60QTO1Q4Zb8WxauY08jdfkz14eV upJQeeAEToIe3fYc4ZvZFxf6Mq8aG337XshwsjHKEKzy/WaSTVHg6KWjNjJcqMElzn d7Aki55TvvDMXS71Kvm5z5DeWwvXP7ZIjLX2zTo4= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by sourceware.org (Postfix) with ESMTPS id E0B393854170 for ; Fri, 21 Oct 2022 12:02:35 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org E0B393854170 X-IronPort-AV: E=McAfee;i="6500,9779,10506"; a="333562178" X-IronPort-AV: E=Sophos;i="5.95,200,1661842800"; d="scan'208";a="333562178" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Oct 2022 05:02:29 -0700 X-IronPort-AV: E=McAfee;i="6500,9779,10506"; a="693676840" X-IronPort-AV: E=Sophos;i="5.95,200,1661842800"; d="scan'208";a="693676840" Received: from mulvlfelix.iul.intel.com (HELO localhost) ([172.28.48.92]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Oct 2022 05:02:27 -0700 To: gdb-patches@sourceware.org, markus.t.metzger@intel.com Subject: [PATCH v7 04/10] btrace: Handle stepping and goto for auxiliary instructions. Date: Fri, 21 Oct 2022 13:59:41 +0200 Message-Id: <20221021115947.359223-5-felix.willgerodt@intel.com> X-Mailer: git-send-email 2.34.3 In-Reply-To: <20221021115947.359223-1-felix.willgerodt@intel.com> References: <20221021115947.359223-1-felix.willgerodt@intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-10.4 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP 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.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Felix Willgerodt via Gdb-patches From: "Willgerodt, Felix" Reply-To: Felix Willgerodt Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" Print the auxiliary data when stepping. Don't allow to goto an auxiliary instruction. This patch is in preparation for the new ptwrite feature, which is based on auxiliary instructions. --- gdb/record-btrace.c | 67 ++++++++++++++++++++++++++++++++++++--------- 1 file changed, 54 insertions(+), 13 deletions(-) diff --git a/gdb/record-btrace.c b/gdb/record-btrace.c index cbdb8224ba3..0767dd12fee 100644 --- a/gdb/record-btrace.c +++ b/gdb/record-btrace.c @@ -2373,9 +2373,13 @@ record_btrace_single_step_forward (struct thread_info *tp) return btrace_step_stopped (); /* Skip gaps during replay. If we end up at a gap (at the end of the trace), - jump back to the instruction at which we started. */ + jump back to the instruction at which we started. If we're stepping a + BTRACE_INSN_AUX instruction, print the auxiliary data and skip the + instruction. */ + start = *replay; - do + + for (;;) { unsigned int steps; @@ -2383,12 +2387,27 @@ record_btrace_single_step_forward (struct thread_info *tp) of the execution history. */ steps = btrace_insn_next (replay, 1); if (steps == 0) + { + *replay = start; + return btrace_step_no_history (); + } + + const struct btrace_insn *insn = btrace_insn_get (replay); + if (insn == nullptr) + continue; + + /* If we're stepping a BTRACE_INSN_AUX instruction, print the auxiliary + data and skip the instruction. */ + if (insn->iclass == BTRACE_INSN_AUX) { - *replay = start; - return btrace_step_no_history (); + gdb_printf ("[%s]\n", + btinfo->aux_data.at (insn->aux_data_index).c_str ()); + continue; } + + /* We have an instruction, we are done. */ + break; } - while (btrace_insn_get (replay) == NULL); /* Determine the end of the instruction trace. */ btrace_insn_end (&end, btinfo); @@ -2419,9 +2438,12 @@ record_btrace_single_step_backward (struct thread_info *tp) /* If we can't step any further, we reached the end of the history. Skip gaps during replay. If we end up at a gap (at the beginning of - the trace), jump back to the instruction at which we started. */ + the trace), jump back to the instruction at which we started. + If we're stepping a BTRACE_INSN_AUX instruction, print the auxiliary + data and skip the instruction. */ start = *replay; - do + + for (;;) { unsigned int steps; @@ -2431,8 +2453,22 @@ record_btrace_single_step_backward (struct thread_info *tp) *replay = start; return btrace_step_no_history (); } + + const struct btrace_insn *insn = btrace_insn_get (replay); + if (insn == nullptr) + continue; + + /* Check if we're stepping a BTRACE_INSN_AUX instruction and skip it. */ + if (insn->iclass == BTRACE_INSN_AUX) + { + gdb_printf ("[%s]\n", + btinfo->aux_data.at (insn->aux_data_index).c_str ()); + continue; + } + + /* We have an instruction, we are done. */ + break; } - while (btrace_insn_get (replay) == NULL); /* Check if we're stepping a breakpoint. @@ -2854,25 +2890,30 @@ record_btrace_target::goto_record_end () /* The goto_record method of target record-btrace. */ void -record_btrace_target::goto_record (ULONGEST insn) +record_btrace_target::goto_record (ULONGEST insn_number) { struct thread_info *tp; struct btrace_insn_iterator it; unsigned int number; int found; - number = insn; + number = insn_number; /* Check for wrap-arounds. */ - if (number != insn) + if (number != insn_number) error (_("Instruction number out of range.")); tp = require_btrace_thread (); found = btrace_find_insn_by_number (&it, &tp->btrace, number); - /* Check if the instruction could not be found or is a gap. */ - if (found == 0 || btrace_insn_get (&it) == NULL) + /* Check if the instruction could not be found or is a gap or an + auxilliary instruction. */ + if (found == 0) + error (_("No such instruction.")); + + const struct btrace_insn *insn = btrace_insn_get (&it); + if ((insn == NULL) || (insn->iclass == BTRACE_INSN_AUX)) error (_("No such instruction.")); record_btrace_set_replay (tp, &it);