From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by sourceware.org (Postfix) with ESMTPS id CDCC53857028 for ; Tue, 18 Jul 2023 11:57:01 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org CDCC53857028 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1689681421; x=1721217421; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=47aLy5G7wu71F1H+enWXTBtGxrkBK1Vaqnjet8YmFGc=; b=S/1gLn0tF38s31u7G18ybmF08AO/BC2brJNDnOl6ecVy7gzv3E7lB0al fief2DIug3AFmXvp0E6FH+HJLa45hTQzTPYvcC+LBpbllqJHnu1P8bjsc qYAhABejfliqbgD/2Rs5PneVnmw1gE/8j+28COKZUHvukK81rQtyeUBo+ qV3sfOTH/IOWN4vUDz96YVTtOgYJQ6cTkDUFT+SmdgiWBpd0+aZvDFdq7 99d48KYmdFBrzPI0r6q05ENmC+74V801stS7pIiWkFhf5MIKkF9C3lELb ZsRIz14p+JgHxEcLzKdVIghpnlUp1OmY+JfiDNGkFPqmkZGN6l52bAy8D Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10774"; a="363650486" X-IronPort-AV: E=Sophos;i="6.01,214,1684825200"; d="scan'208";a="363650486" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Jul 2023 04:57:01 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10774"; a="837260827" X-IronPort-AV: E=Sophos;i="6.01,214,1684825200"; d="scan'208";a="837260827" Received: from unknown (HELO localhost) ([10.216.210.22]) by fmsmga002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Jul 2023 04:57:00 -0700 From: Felix Willgerodt To: gdb-patches@sourceware.org, markus.t.metzger@intel.com, simark@simark.ca Subject: [PATCH v10 04/10] btrace: Handle stepping and goto for auxiliary instructions. Date: Tue, 18 Jul 2023 13:56:31 +0200 Message-Id: <20230718115637.3531-5-felix.willgerodt@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230718115637.3531-1-felix.willgerodt@intel.com> References: <20230718115637.3531-1-felix.willgerodt@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 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,SPF_HELO_NONE,SPF_NONE,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: 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 | 65 +++++++++++++++++++++++++++++++++++++-------- 1 file changed, 54 insertions(+), 11 deletions(-) diff --git a/gdb/record-btrace.c b/gdb/record-btrace.c index 02e71889eaf..c93b3d7c8de 100644 --- a/gdb/record-btrace.c +++ b/gdb/record-btrace.c @@ -2380,9 +2380,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; @@ -2394,8 +2398,23 @@ record_btrace_single_step_forward (struct thread_info *tp) *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) + { + 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); @@ -2426,9 +2445,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; @@ -2438,8 +2460,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. @@ -2861,26 +2897,33 @@ 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 + auxiliary instruction. */ + if (found == 0) + error (_("No such instruction.")); + + const struct btrace_insn *insn = btrace_insn_get (&it); + if (insn == NULL) error (_("No such instruction.")); + if (insn->iclass == BTRACE_INSN_AUX) + error (_("Can't go to an auxiliary instruction.")); record_btrace_set_replay (tp, &it); } -- 2.34.1 Intel Deutschland GmbH Registered Address: Am Campeon 10, 85579 Neubiberg, Germany Tel: +49 89 99 8853-0, www.intel.de Managing Directors: Christin Eisenschmid, Sharon Heck, Tiffany Doon Silva Chairperson of the Supervisory Board: Nicole Lau Registered Office: Munich Commercial Register: Amtsgericht Muenchen HRB 186928