From patchwork Fri Oct 21 11:59:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix Willgerodt X-Patchwork-Id: 59278 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 52AE038515F8 for ; Fri, 21 Oct 2022 12:04:19 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 52AE038515F8 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1666353859; bh=1bgyzB/HQD1KxID0m2sJCdIcFSevScKpykgQUFmNFI4=; 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=gS6p65DS/BEo5opSK2wmgoadLI5S2pIhPWxwGZHkj+2xe0h7XX5fJXH7094S5FJjW E9Qsa1g7zJOjopiRCd+qMu2sbv4kC4CVqoT28c9xj6uE7cEvuuZrafrg2R2cKYRn/J 5zHwSgKgqVWZ8EofD8WxOF8y0nSGLwMQqKC/055Y= 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 694733856974 for ; Fri, 21 Oct 2022 12:02:33 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 694733856974 X-IronPort-AV: E=McAfee;i="6500,9779,10506"; a="333562137" X-IronPort-AV: E=Sophos;i="5.95,200,1661842800"; d="scan'208";a="333562137" 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:22 -0700 X-IronPort-AV: E=McAfee;i="6500,9779,10506"; a="693676804" X-IronPort-AV: E=Sophos;i="5.95,200,1661842800"; d="scan'208";a="693676804" 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:21 -0700 To: gdb-patches@sourceware.org, markus.t.metzger@intel.com Subject: [PATCH v7 03/10] btrace: Enable auxiliary instructions in record function-call-history. Date: Fri, 21 Oct 2022 13:59:40 +0200 Message-Id: <20221021115947.359223-4-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: Felix Willgerodt Reply-To: Felix Willgerodt Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" Print the auxiliary data when a btrace_insn of type BTRACE_INSN_AUX is encountered in the function-call-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. --- gdb/btrace.h | 6 +++++- gdb/doc/gdb.texinfo | 5 +++-- gdb/record-btrace.c | 21 +++++++++++++++++++++ gdb/record.c | 5 +++++ gdb/record.h | 5 ++++- 5 files changed, 38 insertions(+), 4 deletions(-) diff --git a/gdb/btrace.h b/gdb/btrace.h index be4ce424ed5..36870d9b2ec 100644 --- a/gdb/btrace.h +++ b/gdb/btrace.h @@ -105,7 +105,11 @@ enum btrace_function_flag /* The 'up' link points to a tail call. This obviously only makes sense if bfun_up_links_to_ret is clear. */ - BFUN_UP_LINKS_TO_TAILCALL = (1 << 1) + BFUN_UP_LINKS_TO_TAILCALL = (1 << 1), + + /* Indicates that at least one auxiliary instruction is in the current + function segment. */ + BFUN_CONTAINS_AUX = (1 << 2) }; DEF_ENUM_FLAGS_TYPE (enum btrace_function_flag, btrace_function_flags); diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo index 00a4d595490..1daecaf643a 100644 --- a/gdb/doc/gdb.texinfo +++ b/gdb/doc/gdb.texinfo @@ -8019,8 +8019,9 @@ that function, the source lines for this instruction sequence (if the @code{/l} modifier is specified), and the instructions numbers that form the sequence (if the @code{/i} modifier is specified). The function names are indented to reflect the call stack depth if the @code{/c} modifier is -specified. The @code{/l}, @code{/i}, and @code{/c} modifiers can be given -together. +specified. Printing auxiliary information is enabled by default and can be +omitted with the @code{/a} modifier. The @code{/l}, @code{/i}, @code{/a}, +and @code{/c} modifiers can be given together. @smallexample (@value{GDBP}) @b{list 1, 10} diff --git a/gdb/record-btrace.c b/gdb/record-btrace.c index 78e6514adf0..cbdb8224ba3 100644 --- a/gdb/record-btrace.c +++ b/gdb/record-btrace.c @@ -1153,6 +1153,23 @@ btrace_get_bfun_name (const struct btrace_function *bfun) return "??"; } +static void +btrace_print_aux_insn (struct ui_out *uiout, + const struct btrace_function *bfun, + const struct btrace_thread_info *btinfo) +{ + for (const btrace_insn &insn : bfun->insn) + { + if (insn.iclass == BTRACE_INSN_AUX) + { + uiout->text ("\t\t["); + uiout->field_fmt ("aux-data", "%s", + btinfo->aux_data.at (insn.aux_data_index).c_str ()); + uiout->text ("]\n"); + } + } +} + /* Disassemble a section of the recorded function trace. */ static void @@ -1228,6 +1245,10 @@ btrace_call_history (struct ui_out *uiout, } uiout->text ("\n"); + + if (((flags & RECORD_DONT_PRINT_AUX) == 0) + && ((bfun->flags & BFUN_CONTAINS_AUX) != 0)) + btrace_print_aux_insn(uiout, bfun, btinfo); } } diff --git a/gdb/record.c b/gdb/record.c index f4402b58144..fa99b97ed26 100644 --- a/gdb/record.c +++ b/gdb/record.c @@ -639,6 +639,9 @@ get_call_history_modifiers (const char **arg) case 'c': modifiers |= RECORD_PRINT_INDENT_CALLS; break; + case 'a': + modifiers |= RECORD_DONT_PRINT_AUX; + break; default: error (_("Invalid modifier: %c."), *args); } @@ -883,6 +886,8 @@ Without modifiers, it prints the function name.\n\ With a /l modifier, the source file and line number range is included.\n\ With a /i modifier, the instruction number range is included.\n\ With a /c modifier, the output is indented based on the call stack depth.\n\ +With a /a modifier, omits output of auxiliary data, which is enabled \ +by default.\n\ With no argument, prints ten more lines after the previous ten-line print.\n\ \"record function-call-history -\" prints ten lines before a previous ten-line \ print.\n\ diff --git a/gdb/record.h b/gdb/record.h index 0fbca9d44ce..d882f313c1d 100644 --- a/gdb/record.h +++ b/gdb/record.h @@ -62,7 +62,10 @@ enum record_print_flag RECORD_PRINT_INSN_RANGE = (1 << 1), /* Indent based on call stack depth (if applicable). */ - RECORD_PRINT_INDENT_CALLS = (1 << 2) + RECORD_PRINT_INDENT_CALLS = (1 << 2), + + /* Deactivate printing auxiliary data (if applicable). */ + RECORD_DONT_PRINT_AUX = (1 << 3) }; DEF_ENUM_FLAGS_TYPE (enum record_print_flag, record_print_flags);