From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 32626 invoked by alias); 9 Jul 2015 06:09:00 -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 32533 invoked by uid 89); 9 Jul 2015 06:09:00 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.3 required=5.0 tests=AWL,BAYES_00,KAM_LAZY_DOMAIN_SECURITY,RP_MATCHES_RCVD autolearn=no version=3.3.2 X-HELO: mga01.intel.com Received: from mga01.intel.com (HELO mga01.intel.com) (192.55.52.88) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 09 Jul 2015 06:08:59 +0000 Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga101.fm.intel.com with ESMTP; 08 Jul 2015 23:08:55 -0700 X-ExtLoop1: 1 Received: from irvmail001.ir.intel.com ([163.33.26.43]) by fmsmga001.fm.intel.com with ESMTP; 08 Jul 2015 23:08:54 -0700 Received: from ulvlx001.iul.intel.com (ulvlx001.iul.intel.com [172.28.207.17]) by irvmail001.ir.intel.com (8.14.3/8.13.6/MailSET/Hub) with ESMTP id t6968rqg008657; Thu, 9 Jul 2015 07:08:53 +0100 Received: from ulvlx001.iul.intel.com (localhost [127.0.0.1]) by ulvlx001.iul.intel.com with ESMTP id t6968rSB009207; Thu, 9 Jul 2015 08:08:53 +0200 Received: (from mmetzger@localhost) by ulvlx001.iul.intel.com with œ id t6968qbC009203; Thu, 9 Jul 2015 08:08:53 +0200 From: Markus Metzger To: palves@redhat.com Cc: gdb-patches@sourceware.org Subject: [PATCH v2 1/2] record: set stop_pc in "record goto" command Date: Thu, 09 Jul 2015 06:09:00 -0000 Message-Id: <1436422132-8936-1-git-send-email-markus.t.metzger@intel.com> X-IsSubscribed: yes X-SW-Source: 2015-07/txt/msg00270.txt.bz2 When navigating in the recorded execution trace via "record goto", we do not set stop_pc. This may trigger an internal error in infrun.c when stepping from that location. Set it. (gdb) rec full (gdb) c Continuing. Breakpoint 1, foo (void) at foo.c:42 42 x = y (gdb) rn foo (void) at foo.c:41 41 y = x (gdb) rec go end Go forward to insn number 98724 at foo.c:42 42 x = y (gdb) n infrun.c:2382: internal-error: resume: Assertion `sig != GDB_SIGNAL_0' failed. A problem internal to GDB has been detected, further debugging may prove unreliable. Quit this debugging session? (y or n) 2015-07-09 Markus Metzger gdb/ * record-btrace.c (record_btrace_goto_begin, record_btrace_goto_end) record_btrace_goto): Move call to print_stack_frame ... (record_btrace_set_replay): ... here. Set stop_pc. * record-full.c (record_full_goto_entry): Set stop_pc. testsuite/ * gdb.btrace/record_goto-step.exp: New. --- gdb/record-btrace.c | 9 ++---- gdb/record-full.c | 1 + gdb/testsuite/gdb.btrace/record_goto-step.exp | 46 +++++++++++++++++++++++++++ 3 files changed, 50 insertions(+), 6 deletions(-) create mode 100644 gdb/testsuite/gdb.btrace/record_goto-step.exp diff --git a/gdb/record-btrace.c b/gdb/record-btrace.c index 969e01b..6f4ee66 100644 --- a/gdb/record-btrace.c +++ b/gdb/record-btrace.c @@ -2212,6 +2212,9 @@ record_btrace_set_replay (struct thread_info *tp, /* Start anew from the new replay position. */ record_btrace_clear_histories (btinfo); + + stop_pc = regcache_read_pc (get_current_regcache ()); + print_stack_frame (get_selected_frame (NULL), 1, SRC_AND_LOC, 1); } /* The to_goto_record_begin method of target record-btrace. */ @@ -2226,8 +2229,6 @@ record_btrace_goto_begin (struct target_ops *self) btrace_insn_begin (&begin, &tp->btrace); record_btrace_set_replay (tp, &begin); - - print_stack_frame (get_selected_frame (NULL), 1, SRC_AND_LOC, 1); } /* The to_goto_record_end method of target record-btrace. */ @@ -2240,8 +2241,6 @@ record_btrace_goto_end (struct target_ops *ops) tp = require_btrace_thread (); record_btrace_set_replay (tp, NULL); - - print_stack_frame (get_selected_frame (NULL), 1, SRC_AND_LOC, 1); } /* The to_goto_record method of target record-btrace. */ @@ -2267,8 +2266,6 @@ record_btrace_goto (struct target_ops *self, ULONGEST insn) error (_("No such instruction.")); record_btrace_set_replay (tp, &it); - - print_stack_frame (get_selected_frame (NULL), 1, SRC_AND_LOC, 1); } /* The to_execution_direction target method. */ diff --git a/gdb/record-full.c b/gdb/record-full.c index 43e8be2..1520811 100644 --- a/gdb/record-full.c +++ b/gdb/record-full.c @@ -1869,6 +1869,7 @@ record_full_goto_entry (struct record_full_entry *p) registers_changed (); reinit_frame_cache (); + stop_pc = regcache_read_pc (get_current_regcache ()); print_stack_frame (get_selected_frame (NULL), 1, SRC_AND_LOC, 1); } diff --git a/gdb/testsuite/gdb.btrace/record_goto-step.exp b/gdb/testsuite/gdb.btrace/record_goto-step.exp new file mode 100644 index 0000000..bbf0b77 --- /dev/null +++ b/gdb/testsuite/gdb.btrace/record_goto-step.exp @@ -0,0 +1,46 @@ +# This testcase is part of GDB, the GNU debugger. +# +# Copyright 2013-2015 Free Software Foundation, Inc. +# +# Contributed by Intel Corp. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# check for btrace support +if { [skip_btrace_tests] } { return -1 } + +standard_testfile record_goto.c + +# start inferior +if [prepare_for_testing record_goto-step.exp $testfile $srcfile] { + return -1 +} + +if ![runto_main] { + return -1 +} + +set bp [gdb_get_line_number "fun4.3" $srcfile] +gdb_breakpoint $srcfile:$bp + +# record the execution until we hit a breakpoint +gdb_test_no_output "record btrace" +gdb_continue_to_breakpoint "cont to $bp" ".*$srcfile:$bp.*" + +# reverse-step, then jump to the end of the trace +gdb_test "reverse-next" ".*fun4\.2.*" +gdb_test "record goto end" ".*fun4\.3.*" + +# test that we can continue stepping +gdb_test "next" ".*fun4\.4.*" -- 1.8.3.1