From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 21907 invoked by alias); 8 Mar 2013 09:17:42 -0000 Received: (qmail 21740 invoked by uid 22791); 8 Mar 2013 09:17:40 -0000 X-SWARE-Spam-Status: No, hits=-8.0 required=5.0 tests=AWL,BAYES_00,KHOP_RCVD_UNTRUST,KHOP_SPAMHAUS_DROP,KHOP_THREADED,RCVD_IN_DNSWL_HI,RCVD_IN_HOSTKARMA_W,RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from mga01.intel.com (HELO mga01.intel.com) (192.55.52.88) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Fri, 08 Mar 2013 09:17:31 +0000 Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga101.fm.intel.com with ESMTP; 08 Mar 2013 01:16:20 -0800 X-ExtLoop1: 1 Received: from swsutil001.isw.intel.com ([10.237.237.11]) by fmsmga001.fm.intel.com with ESMTP; 08 Mar 2013 01:16:18 -0800 Received: from ulslx001.iul.intel.com (ulslx001.iul.intel.com [172.28.207.63]) by swsutil001.isw.intel.com (8.13.6/8.13.6/MailSET/Hub) with ESMTP id r289GEua022923; Fri, 8 Mar 2013 09:16:14 GMT Received: from ulslx001.iul.intel.com (localhost [127.0.0.1]) by ulslx001.iul.intel.com with ESMTP id r289GEtR002129; Fri, 8 Mar 2013 10:16:14 +0100 Received: (from mmetzger@localhost) by ulslx001.iul.intel.com with id r289GEvT002125; Fri, 8 Mar 2013 10:16:14 +0100 From: Markus Metzger To: jan.kratochvil@redhat.com Cc: gdb-patches@sourceware.org, markus.t.metzger@gmail.com Subject: [patch v10 18/21] record-btrace, disas: omit pc prefix Date: Fri, 08 Mar 2013 09:19:00 -0000 Message-Id: <1362734168-1725-19-git-send-email-markus.t.metzger@intel.com> In-Reply-To: <1362734168-1725-1-git-send-email-markus.t.metzger@intel.com> References: <1362734168-1725-1-git-send-email-markus.t.metzger@intel.com> X-IsSubscribed: yes Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2013-03/txt/msg00340.txt.bz2 Add a disassembly flag to omit the pc prefix and use it in the "record instruction-history" command of record-btrace. The pc prefix would appear multiple times in the branch trace disassembly, which is more confusing than helpful. Approved by Jan Kratochvil. 2013-03-08 Markus Metzger * record-btrace.c (btrace_insn_history): Omit the pc prefix in the instruction history disassembly. * disasm.c (dump_insns): Omit the pc prefix, if requested. * disasm.h (DISASSEMBLY_OMIT_PC): New. --- gdb/disasm.c | 4 +++- gdb/disasm.h | 1 + gdb/record.c | 4 ++++ 3 files changed, 8 insertions(+), 1 deletions(-) diff --git a/gdb/disasm.c b/gdb/disasm.c index 9d61379..e643c2d 100644 --- a/gdb/disasm.c +++ b/gdb/disasm.c @@ -122,7 +122,9 @@ dump_insns (struct gdbarch *gdbarch, struct ui_out *uiout, num_displayed++; } ui_out_chain = make_cleanup_ui_out_tuple_begin_end (uiout, NULL); - ui_out_text (uiout, pc_prefix (pc)); + + if ((flags & DISASSEMBLY_OMIT_PC) == 0) + ui_out_text (uiout, pc_prefix (pc)); ui_out_field_core_addr (uiout, "address", gdbarch, pc); if (!build_address_symbolic (gdbarch, pc, 0, &name, &offset, &filename, diff --git a/gdb/disasm.h b/gdb/disasm.h index 20ceb2b..3743ccc 100644 --- a/gdb/disasm.h +++ b/gdb/disasm.h @@ -23,6 +23,7 @@ #define DISASSEMBLY_RAW_INSN (0x1 << 1) #define DISASSEMBLY_OMIT_FNAME (0x1 << 2) #define DISASSEMBLY_FILENAME (0x1 << 3) +#define DISASSEMBLY_OMIT_PC (0x1 << 4) struct ui_out; struct ui_file; diff --git a/gdb/record.c b/gdb/record.c index 12ab179..83f4e1b 100644 --- a/gdb/record.c +++ b/gdb/record.c @@ -386,6 +386,9 @@ get_insn_history_modifiers (char **arg) case 'f': modifiers |= DISASSEMBLY_OMIT_FNAME; break; + case 'p': + modifiers |= DISASSEMBLY_OMIT_PC; + break; default: error (_("Invalid modifier: %c."), *args); } @@ -666,6 +669,7 @@ Print disassembled instructions stored in the execution log.\n\ With a /m 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 no argument, disassembles ten more instructions after the previous \ disassembly.\n\ \"record instruction-history -\" disassembles ten instructions before a \ -- 1.7.1