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 221263857729 for ; Tue, 18 Jul 2023 11:56:56 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 221263857729 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=1689681417; x=1721217417; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=j/97UBmH4WPFh5qeqYy94RsZjNyXa+8s+0mnTuzu3k4=; b=LxRiHL3d7QhGvEp0LpM6n7BsViwM9kr8DdY9F+1UeM7CJoPreiMqX+Jp dEKloVvjYNMmV6No3bG7kQCXJyKF6D7SDysLeAuoD/s4IbYbMdRhx1U0t b0oB/TBp0u7lRJu6CWm84lKBsx7y7qzbnzYHsaE+UOAdfoYlnB2I+sX7B xtyfM1GEtwd81p7kccbcv10/OjkwOw3wkDlHwjgJcvfkAZ3rT7YH9y22Q yL81DjKSo1Tt0oTVktUtADNxDaZOsiwfUHfy+ZJoioN4M4+6wXa85/159 l+sNR6eqFwB7ET4SPbLIVD5mDnNDsuqbkvz9vbw+4KLE07fxk8lDRyf9P A==; X-IronPort-AV: E=McAfee;i="6600,9927,10774"; a="363650474" X-IronPort-AV: E=Sophos;i="6.01,214,1684825200"; d="scan'208";a="363650474" 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:56:55 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10774"; a="837260809" X-IronPort-AV: E=Sophos;i="6.01,214,1684825200"; d="scan'208";a="837260809" 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:56:54 -0700 From: Felix Willgerodt To: gdb-patches@sourceware.org, markus.t.metzger@intel.com, simark@simark.ca Subject: [PATCH v10 02/10] btrace: Enable auxiliary instructions in record instruction-history. Date: Tue, 18 Jul 2023 13:56:29 +0200 Message-Id: <20230718115637.3531-3-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.3 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 a btrace_insn of type BTRACE_INSN_AUX is encountered in the instruction-history. Printing is active by default, it can be silenced with the /a modifier. This patch is in preparation for the new ptwrite feature, which is based on auxiliary instructions. Reviewed-By: Eli Zaretskii --- gdb/disasm-flags.h | 1 + gdb/doc/gdb.texinfo | 3 +++ gdb/record-btrace.c | 14 ++++++++++++++ gdb/record.c | 5 +++++ 4 files changed, 23 insertions(+) diff --git a/gdb/disasm-flags.h b/gdb/disasm-flags.h index e2e8a7a82e5..08b2d506493 100644 --- a/gdb/disasm-flags.h +++ b/gdb/disasm-flags.h @@ -34,6 +34,7 @@ enum gdb_disassembly_flag : unsigned DISASSEMBLY_SOURCE = (0x1 << 5), DISASSEMBLY_SPECULATIVE = (0x1 << 6), DISASSEMBLY_RAW_BYTES = (0x1 << 7), + DISASSEMBLY_OMIT_AUX_INSN = (0x1 << 8), }; DEF_ENUM_FLAGS_TYPE (enum gdb_disassembly_flag, gdb_disassembly_flags); diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo index b988597cd72..6c812af2b00 100644 --- a/gdb/doc/gdb.texinfo +++ b/gdb/doc/gdb.texinfo @@ -8078,6 +8078,9 @@ To better align the printed instructions when the trace contains instructions from more than one function, the function name may be omitted by specifying the @code{/f} modifier. +Printing auxiliary information is enabled by default and can be +omitted with the @code{/a} modifier. + Speculatively executed instructions are prefixed with @samp{?}. This feature is not available for all recording formats. diff --git a/gdb/record-btrace.c b/gdb/record-btrace.c index 97447d3e8f8..36247d5b31d 100644 --- a/gdb/record-btrace.c +++ b/gdb/record-btrace.c @@ -827,6 +827,20 @@ btrace_insn_history (struct ui_out *uiout, btrace_ui_out_decode_error (uiout, btrace_insn_get_error (&it), conf->format); } + else if (insn->iclass == BTRACE_INSN_AUX) + { + if ((flags & DISASSEMBLY_OMIT_AUX_INSN) != 0) + continue; + + uiout->field_fmt ("insn-number", "%u", btrace_insn_number (&it)); + uiout->text ("\t"); + uiout->spaces (3); + uiout->text ("["); + uiout->field_fmt ("aux-data", "%s", + it.btinfo->aux_data.at + (insn->aux_data_index).c_str ()); + uiout->text ("]\n"); + } else { struct disasm_insn dinsn; diff --git a/gdb/record.c b/gdb/record.c index f7c82665b05..f1f472aa426 100644 --- a/gdb/record.c +++ b/gdb/record.c @@ -487,6 +487,9 @@ get_insn_history_modifiers (const char **arg) switch (*args) { + case 'a': + modifiers |= DISASSEMBLY_OMIT_AUX_INSN; + break; case 'm': case 's': modifiers |= DISASSEMBLY_SOURCE; @@ -857,6 +860,8 @@ With a /m or /s modifier, source lines are included (if available).\n\ With a /r modifier, raw instructions in hex are included.\n\ With a /f modifier, function names are omitted.\n\ With a /p modifier, current position markers are omitted.\n\ +With a /a modifier, omits output of auxiliary data, which is enabled \ +by default.\n\ With no argument, disassembles ten more instructions after the previous \ disassembly.\n\ \"record instruction-history -\" disassembles ten instructions before a \ -- 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