From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 27216 invoked by alias); 20 Sep 2013 11:30:50 -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 27021 invoked by uid 89); 20 Sep 2013 11:30:49 -0000 Received: from mga02.intel.com (HELO mga02.intel.com) (134.134.136.20) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 20 Sep 2013 11:30:49 +0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-4.1 required=5.0 tests=AWL,BAYES_00,KHOP_THREADED,RDNS_NONE autolearn=no version=3.3.2 X-HELO: mga02.intel.com Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga101.jf.intel.com with ESMTP; 20 Sep 2013 04:30:44 -0700 X-ExtLoop1: 1 Received: from irvmail001.ir.intel.com ([163.33.26.43]) by orsmga002.jf.intel.com with ESMTP; 20 Sep 2013 04:30: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 r8KBUfGf019062; Fri, 20 Sep 2013 12:30:42 +0100 Received: from ulslx001.iul.intel.com (localhost [127.0.0.1]) by ulslx001.iul.intel.com with ESMTP id r8KBUfis032129; Fri, 20 Sep 2013 13:30:41 +0200 Received: (from mmetzger@localhost) by ulslx001.iul.intel.com with id r8KBUfem032125; Fri, 20 Sep 2013 13:30:41 +0200 From: Markus Metzger To: jan.kratochvil@redhat.com Cc: gdb-patches@sourceware.org, Christian Himpel Subject: [patch v6 08/21] record-btrace: make ranges include begin and end Date: Fri, 20 Sep 2013 11:31:00 -0000 Message-Id: <1379676639-31802-9-git-send-email-markus.t.metzger@intel.com> In-Reply-To: <1379676639-31802-1-git-send-email-markus.t.metzger@intel.com> References: <1379676639-31802-1-git-send-email-markus.t.metzger@intel.com> X-IsSubscribed: yes X-SW-Source: 2013-09/txt/msg00758.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. Reviewed-by: Eli Zaretskii CC: Christian Himpel 2013-09-20 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 | 38 ++++++++++++++----- gdb/target.h | 4 +- gdb/testsuite/gdb.btrace/function_call_history.exp | 5 ++- gdb/testsuite/gdb.btrace/instruction_history.exp | 9 +++-- 5 files changed, 41 insertions(+), 21 deletions(-) diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo index 1b18548..3449d52 100644 --- a/gdb/doc/gdb.texinfo +++ b/gdb/doc/gdb.texinfo @@ -6393,8 +6393,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. @@ -6464,8 +6463,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 9470d85..45d5e4a 100644 --- a/gdb/record-btrace.c +++ b/gdb/record-btrace.c @@ -368,7 +368,7 @@ record_btrace_insn_history_range (ULONGEST from, ULONGEST to, int flags) if (low != from || high != to) error (_("Bad range.")); - if (high <= low) + if (high < low) error (_("Bad range.")); btinfo = require_btrace (); @@ -377,10 +377,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); @@ -396,6 +403,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) { @@ -404,12 +413,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) @@ -619,7 +628,7 @@ record_btrace_call_history_range (ULONGEST from, ULONGEST to, int flags) if (low != from || high != to) error (_("Bad range.")); - if (high <= low) + if (high < low) error (_("Bad range.")); btinfo = require_btrace (); @@ -628,10 +637,17 @@ record_btrace_call_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_call_by_number (&end, btinfo, high); if (found == 0) - btrace_call_end (&end, btinfo); + { + /* Silently truncate the range. */ + btrace_call_end (&end, btinfo); + } + else + { + /* We want both begin and end to be inclusive. */ + btrace_call_next (&end, 1); + } btrace_call_history (uiout, btinfo, &begin, &end, flags); btrace_set_call_history (btinfo, &begin, &end); @@ -647,6 +663,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) { @@ -655,12 +673,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/target.h b/gdb/target.h index 7622465..905c387 100644 --- a/gdb/target.h +++ b/gdb/target.h @@ -864,7 +864,7 @@ struct target_ops void (*to_insn_history_from) (ULONGEST from, int size, int flags); /* Disassemble a section of the recorded execution trace from instruction - BEGIN (inclusive) to instruction END (exclusive). */ + BEGIN (inclusive) to instruction END (inclusive). */ void (*to_insn_history_range) (ULONGEST begin, ULONGEST end, int flags); /* Print a function trace of the recorded execution trace. @@ -879,7 +879,7 @@ struct target_ops void (*to_call_history_from) (ULONGEST begin, int size, int flags); /* Print a function trace of an execution trace section from function BEGIN - (inclusive) to function END (exclusive). */ + (inclusive) to function END (inclusive). */ void (*to_call_history_range) (ULONGEST begin, ULONGEST end, int flags); /* Nonzero if TARGET_OBJECT_LIBRARIES_SVR4 may be read with a diff --git a/gdb/testsuite/gdb.btrace/function_call_history.exp b/gdb/testsuite/gdb.btrace/function_call_history.exp index a5f072c..1dfb5e3 100644 --- a/gdb/testsuite/gdb.btrace/function_call_history.exp +++ b/gdb/testsuite/gdb.btrace/function_call_history.exp @@ -222,9 +222,10 @@ set expected_range "4\tinc\r 10\tinc\r" # show functions in instruction range -gdb_test "record function-call-history 4,11" $expected_range "absolute instruction range" +gdb_test "record function-call-history 4,10" $expected_range "absolute instruction range" gdb_test "record function-call-history 4,+7" $expected_range "relative positive instruction range" -gdb_test "record function-call-history 11,-7" $expected_range "relative negative instruction range" +gdb_test "record function-call-history 10,-7" $expected_range "relative negative instruction range" +gdb_test "record function-call-history 4,4" "4\tinc\r" "single entry" # 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 6878d27..edf529c 100644 --- a/gdb/testsuite/gdb.btrace/instruction_history.exp +++ b/gdb/testsuite/gdb.btrace/instruction_history.exp @@ -65,7 +65,7 @@ if { $traced != 6 } { } # test that we see the expected instructions -gdb_test "record instruction-history 2,7" " +gdb_test "record instruction-history 2,6" " 2\t 0x\[0-9a-f\]+ :\tje 0x\[0-9a-f\]+ \r 3\t 0x\[0-9a-f\]+ :\tdec %eax\r 4\t 0x\[0-9a-f\]+ :\tjmp 0x\[0-9a-f\]+ \r @@ -79,20 +79,23 @@ gdb_test "record instruction-history /f 2,+5" " 5\t 0x\[0-9a-f\]+ <\\+\[0-9\]+>:\tcmp \\\$0x0,%eax\r 6\t 0x\[0-9a-f\]+ <\\+\[0-9\]+>:\tje 0x\[0-9a-f\]+ \r" -gdb_test "record instruction-history /p 7,-5" " +gdb_test "record instruction-history /p 6,-5" " 2\t0x\[0-9a-f\]+ :\tje 0x\[0-9a-f\]+ \r 3\t0x\[0-9a-f\]+ :\tdec %eax\r 4\t0x\[0-9a-f\]+ :\tjmp 0x\[0-9a-f\]+ \r 5\t0x\[0-9a-f\]+ :\tcmp \\\$0x0,%eax\r 6\t0x\[0-9a-f\]+ :\tje 0x\[0-9a-f\]+ \r" -gdb_test "record instruction-history /pf 2,7" " +gdb_test "record instruction-history /pf 2,6" " 2\t0x\[0-9a-f\]+ <\\+\[0-9\]+>:\tje 0x\[0-9a-f\]+ \r 3\t0x\[0-9a-f\]+ <\\+\[0-9\]+>:\tdec %eax\r 4\t0x\[0-9a-f\]+ <\\+\[0-9\]+>:\tjmp 0x\[0-9a-f\]+ \r 5\t0x\[0-9a-f\]+ <\\+\[0-9\]+>:\tcmp \\\$0x0,%eax\r 6\t0x\[0-9a-f\]+ <\\+\[0-9\]+>:\tje 0x\[0-9a-f\]+ \r" +gdb_test "record instruction-history 2,2" " +2\t 0x\[0-9a-f\]+ :\tje 0x\[0-9a-f\]+ \r" + # the following tests are checking the iterators # to avoid lots of regexps, we just check the number of lines that # were printed during command execution. -- 1.7.1