From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 13985 invoked by alias); 2 May 2013 12:03:47 -0000 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 Received: (qmail 13878 invoked by uid 89); 2 May 2013 12:03:47 -0000 X-Spam-SWARE-Status: No, score=-8.5 required=5.0 tests=AWL,BAYES_00,KHOP_RCVD_UNTRUST,KHOP_THREADED,RCVD_IN_HOSTKARMA_W,RCVD_IN_HOSTKARMA_WL,RP_MATCHES_RCVD autolearn=ham version=3.3.1 Received: from mga14.intel.com (HELO mga14.intel.com) (143.182.124.37) by sourceware.org (qpsmtpd/0.84/v0.84-167-ge50287c) with ESMTP; Thu, 02 May 2013 12:03:46 +0000 Received: from azsmga002.ch.intel.com ([10.2.17.35]) by azsmga102.ch.intel.com with ESMTP; 02 May 2013 05:03:44 -0700 X-ExtLoop1: 1 Received: from irvmail001.ir.intel.com ([163.33.26.43]) by AZSMGA002.ch.intel.com with ESMTP; 02 May 2013 05:03:42 -0700 Received: from ulslx001.iul.intel.com (ulslx001.iul.intel.com [172.28.207.63]) by irvmail001.ir.intel.com (8.14.3/8.13.6/MailSET/Hub) with ESMTP id r42C3d94019533; Thu, 2 May 2013 13:03:40 +0100 Received: from ulslx001.iul.intel.com (localhost [127.0.0.1]) by ulslx001.iul.intel.com with ESMTP id r42C3dVn021514; Thu, 2 May 2013 14:03:39 +0200 Received: (from mmetzger@localhost) by ulslx001.iul.intel.com with id r42C3daA021510; Thu, 2 May 2013 14:03:39 +0200 From: Markus Metzger To: jan.kratochvil@redhat.com Cc: gdb-patches@sourceware.org, Eli Zaretskii , Christian Himpel Subject: [PATCH 06/15] record-btrace: make ranges include begin and end Date: Thu, 02 May 2013 12:03:00 -0000 Message-Id: <1367496216-21217-7-git-send-email-markus.t.metzger@intel.com> In-Reply-To: <1367496216-21217-1-git-send-email-markus.t.metzger@intel.com> References: <1367496216-21217-1-git-send-email-markus.t.metzger@intel.com> X-SW-Source: 2013-05/txt/msg00014.txt.bz2 The "record function-call-history" and "record instruction-history" commands accept a range "begin, end". End is not included in both cases. Include it. CC: Eli Zaretskii CC: Christian Himpel 2013-05-02 Markus Metzger * record-btrace.c (record_btrace_insn_history_range): Include end. (record_btrace_insn_history_from): Adjust range. (record_btrace_call_history_range): Include end. (record_btrace_call_history_from): Adjust range. testsuite/ * gdb.btrace/function_call_history.exp: Update tests. * gdb.btrace/instruction_history.exp: Update tests. doc/ * gdb.texinfo (Process Record and Replay): Update documentation. --- gdb/doc/gdb.texinfo | 6 +--- gdb/record-btrace.c | 29 +++++++++++++++----- gdb/testsuite/gdb.btrace/function_call_history.exp | 4 +- gdb/testsuite/gdb.btrace/instruction_history.exp | 6 ++-- 4 files changed, 29 insertions(+), 16 deletions(-) diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo index 99af587..8175927 100644 --- a/gdb/doc/gdb.texinfo +++ b/gdb/doc/gdb.texinfo @@ -6344,8 +6344,7 @@ Disassembles ten more instructions before the last disassembly. @item record instruction-history @var{begin} @var{end} Disassembles instructions beginning with instruction number -@var{begin} until instruction number @var{end}. The instruction -number @var{end} is not included. +@var{begin} until instruction number @var{end}. @end table This command may not be available for all recording methods. @@ -6415,8 +6414,7 @@ Prints ten more functions before the last ten-line print. @item record function-call-history @var{begin} @var{end} Prints functions beginning with function number @var{begin} until -function number @var{end}. The function number @var{end} is not -included. +function number @var{end}. @end table This command may not be available for all recording methods. diff --git a/gdb/record-btrace.c b/gdb/record-btrace.c index 9d73286..ebb26ad 100644 --- a/gdb/record-btrace.c +++ b/gdb/record-btrace.c @@ -370,10 +370,17 @@ record_btrace_insn_history_range (ULONGEST from, ULONGEST to, int flags) if (found == 0) error (_("Range out of bounds.")); - /* Silently truncate the range, if necessary. */ found = btrace_find_insn_by_number (&end, btinfo, high); if (found == 0) - btrace_insn_end (&end, btinfo); + { + /* Silently truncate the range. */ + btrace_insn_end (&end, btinfo); + } + else + { + /* We want both begin and end to be inclusive. */ + btrace_insn_next (&end, 1); + } btrace_insn_history (uiout, &begin, &end, flags); btrace_set_insn_history (btinfo, &begin, &end); @@ -389,6 +396,8 @@ record_btrace_insn_history_from (ULONGEST from, int size, int flags) ULONGEST begin, end, context; context = abs (size); + if (context == 0) + error (_("Bad record instruction-history-size.")); if (size < 0) { @@ -397,12 +406,12 @@ record_btrace_insn_history_from (ULONGEST from, int size, int flags) if (from < context) begin = 0; else - begin = from - context; + begin = from - context + 1; } else { begin = from; - end = from + context; + end = from + context - 1; /* Check for wrap-around. */ if (end < begin) @@ -672,8 +681,12 @@ record_btrace_call_history_range (ULONGEST from, ULONGEST to, int flags) if (begin == NULL) error (_("Range out of bounds.")); - /* Silently truncate the range, if necessary. */ end = btrace_find_function_by_number (btinfo, high); + /* We want both begin and end to be inclusive. */ + if (end != NULL) + end = end->flow.next; + + /* Silently truncate the range, if necessary. */ if (end == NULL) end = btinfo->end; @@ -691,6 +704,8 @@ record_btrace_call_history_from (ULONGEST from, int size, int flags) ULONGEST begin, end, context; context = abs (size); + if (context == 0) + error (_("Bad record function-call-history-size.")); if (size < 0) { @@ -699,12 +714,12 @@ record_btrace_call_history_from (ULONGEST from, int size, int flags) if (from < context) begin = 0; else - begin = from - context; + begin = from - context + 1; } else { begin = from; - end = from + context; + end = from + context - 1; /* Check for wrap-around. */ if (end < begin) diff --git a/gdb/testsuite/gdb.btrace/function_call_history.exp b/gdb/testsuite/gdb.btrace/function_call_history.exp index e528625..86f2c21 100644 --- a/gdb/testsuite/gdb.btrace/function_call_history.exp +++ b/gdb/testsuite/gdb.btrace/function_call_history.exp @@ -222,9 +222,9 @@ set expected_range "3\tinc\r 9\tinc\r" # show functions in instruction range -gdb_test "record function-call-history 3,10" $expected_range "absolute instruction range" +gdb_test "record function-call-history 3,9" $expected_range "absolute instruction range" gdb_test "record function-call-history 3,+7" $expected_range "relative positive instruction range" -gdb_test "record function-call-history 10,-7" $expected_range "relative negative instruction range" +gdb_test "record function-call-history 9,-7" $expected_range "relative negative instruction range" # set bp after fib recursion and continue set bp_location [gdb_get_line_number "bp.2" $testfile.c] diff --git a/gdb/testsuite/gdb.btrace/instruction_history.exp b/gdb/testsuite/gdb.btrace/instruction_history.exp index c1a61b7..147c2ef 100644 --- a/gdb/testsuite/gdb.btrace/instruction_history.exp +++ b/gdb/testsuite/gdb.btrace/instruction_history.exp @@ -65,7 +65,7 @@ if { $traced != 7 } { } # test that we see the expected instructions -gdb_test "record instruction-history 1,6" " +gdb_test "record instruction-history 1,5" " 1\t 0x\[0-9a-f\]+ :\tje 0x\[0-9a-f\]+ \r 2\t 0x\[0-9a-f\]+ :\tdec %eax\r 3\t 0x\[0-9a-f\]+ :\tjmp 0x\[0-9a-f\]+ \r @@ -79,14 +79,14 @@ gdb_test "record instruction-history /f 1,+5" " 4\t 0x\[0-9a-f\]+ <\\+\[0-9\]+>:\tcmp \\\$0x0,%eax\r 5\t 0x\[0-9a-f\]+ <\\+\[0-9\]+>:\tje 0x\[0-9a-f\]+ \r" -gdb_test "record instruction-history /p 6,-5" " +gdb_test "record instruction-history /p 5,-5" " 1\t0x\[0-9a-f\]+ :\tje 0x\[0-9a-f\]+ \r 2\t0x\[0-9a-f\]+ :\tdec %eax\r 3\t0x\[0-9a-f\]+ :\tjmp 0x\[0-9a-f\]+ \r 4\t0x\[0-9a-f\]+ :\tcmp \\\$0x0,%eax\r 5\t0x\[0-9a-f\]+ :\tje 0x\[0-9a-f\]+ \r" -gdb_test "record instruction-history /pf 1,6" " +gdb_test "record instruction-history /pf 1,5" " 1\t0x\[0-9a-f\]+ <\\+\[0-9\]+>:\tje 0x\[0-9a-f\]+ \r 2\t0x\[0-9a-f\]+ <\\+\[0-9\]+>:\tdec %eax\r 3\t0x\[0-9a-f\]+ <\\+\[0-9\]+>:\tjmp 0x\[0-9a-f\]+ \r -- 1.7.1