From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 20192 invoked by alias); 27 Nov 2012 10:49:33 -0000 Received: (qmail 20182 invoked by uid 22791); 27 Nov 2012 10:49:32 -0000 X-SWARE-Spam-Status: No, hits=-8.0 required=5.0 tests=AWL,BAYES_00,KHOP_RCVD_UNTRUST,KHOP_THREADED,RCVD_IN_DNSWL_HI,RCVD_IN_HOSTKARMA_W,RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from mga03.intel.com (HELO mga03.intel.com) (143.182.124.21) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Tue, 27 Nov 2012 10:49:26 +0000 Received: from azsmga001.ch.intel.com ([10.2.17.19]) by azsmga101.ch.intel.com with ESMTP; 27 Nov 2012 02:49:25 -0800 X-ExtLoop1: 1 Received: from swsutil001.isw.intel.com ([10.237.237.11]) by azsmga001.ch.intel.com with ESMTP; 27 Nov 2012 02:49:23 -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 qARAnM2i002394; Tue, 27 Nov 2012 10:49:22 GMT Received: from ulslx001.iul.intel.com (localhost [127.0.0.1]) by ulslx001.iul.intel.com with ESMTP id qARAnLB1015131; Tue, 27 Nov 2012 11:49:21 +0100 Received: (from mmetzger@localhost) by ulslx001.iul.intel.com with id qARAnL93015127; Tue, 27 Nov 2012 11:49:21 +0100 From: markus.t.metzger@intel.com To: gdb-patches@sourceware.org Cc: markus.t.metzger@gmail.com, jan.kratochvil@redhat.com, palves@redhat.com, tromey@redhat.com, kettenis@gnu.org, Markus Metzger Subject: [patch v4 01/13] disas: add precise instructions flag Date: Tue, 27 Nov 2012 10:49:00 -0000 Message-Id: <1354013351-14791-2-git-send-email-markus.t.metzger@intel.com> In-Reply-To: <1354013351-14791-1-git-send-email-markus.t.metzger@intel.com> References: <1354013351-14791-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: 2012-11/txt/msg00703.txt.bz2 From: Markus Metzger When disassembling an address range with interleaved sources, the addresses that are being disassembled may not exactly match the specified range. Addresses may be: - added after the specified range - omitted at the beginning of the specified range Add a new disassembly flag that fixes the above two cases. 2012-11-27 Markus Metzger * disasm.h: Add new flag DISASSEMBLY_PRECISE_INSN. * disasm.c (do_mixed_source_and_assembly): Adjust mle boundaries. --- gdb/disasm.c | 26 ++++++++++++++++++++++---- gdb/disasm.h | 9 +++++---- 2 files changed, 27 insertions(+), 8 deletions(-) diff --git a/gdb/disasm.c b/gdb/disasm.c index 25d87d7..2120add 100644 --- a/gdb/disasm.c +++ b/gdb/disasm.c @@ -221,13 +221,22 @@ do_mixed_source_and_assembly (struct gdbarch *gdbarch, struct ui_out *uiout, /* First, skip all the preceding functions. */ - for (i = 0; i < nlines - 1 && le[i].pc < low; i++); + /* If we want precise instructions, we only skip the line entries for which + the pc range between this and the next entry precedes the requested + instruction range. */ + if (flags & DISASSEMBLY_PRECISE_INSN) + for (i = 0; i < nlines - 2 && le[i + 1].pc <= low; i++); + else + for (i = 0; i < nlines - 1 && le[i].pc < low; i++); /* Now, copy all entries before the end of this function. */ for (; i < nlines - 1 && le[i].pc < high; i++) { - if (le[i].line == le[i + 1].line && le[i].pc == le[i + 1].pc) + CORE_ADDR start = le[i].pc; + CORE_ADDR end = le[i + 1].pc; + + if (le[i].line == le[i + 1].line && start == end) continue; /* Ignore duplicates. */ /* Skip any end-of-function markers. */ @@ -237,8 +246,17 @@ do_mixed_source_and_assembly (struct gdbarch *gdbarch, struct ui_out *uiout, mle[newlines].line = le[i].line; if (le[i].line > le[i + 1].line) out_of_order = 1; - mle[newlines].start_pc = le[i].pc; - mle[newlines].end_pc = le[i + 1].pc; + + /* If we want precise instructions, adjust the line ranges to only contain + instructions in the requested range. */ + if (flags & DISASSEMBLY_PRECISE_INSN) + { + end = min (end, high); + start = max (start, low); + } + + mle[newlines].start_pc = start; + mle[newlines].end_pc = end; newlines++; } diff --git a/gdb/disasm.h b/gdb/disasm.h index a254642..a033b72 100644 --- a/gdb/disasm.h +++ b/gdb/disasm.h @@ -19,10 +19,11 @@ #ifndef DISASM_H #define DISASM_H -#define DISASSEMBLY_SOURCE (0x1 << 0) -#define DISASSEMBLY_RAW_INSN (0x1 << 1) -#define DISASSEMBLY_OMIT_FNAME (0x1 << 2) -#define DISASSEMBLY_FILENAME (0x1 << 3) +#define DISASSEMBLY_SOURCE (0x1 << 0) +#define DISASSEMBLY_RAW_INSN (0x1 << 1) +#define DISASSEMBLY_OMIT_FNAME (0x1 << 2) +#define DISASSEMBLY_FILENAME (0x1 << 3) +#define DISASSEMBLY_PRECISE_INSN (0x1 << 4) struct ui_out; struct ui_file; -- 1.7.1