From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) by sourceware.org (Postfix) with ESMTPS id 3C5603858D32 for ; Mon, 23 Jan 2023 16:43:00 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 3C5603858D32 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=us.ibm.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=us.ibm.com Received: from pps.filterd (m0098421.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 30NFRjsu007357; Mon, 23 Jan 2023 16:42:59 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=message-id : subject : from : to : cc : date : in-reply-to : references : content-type : content-transfer-encoding : mime-version; s=pp1; bh=DD8YkJSYL968Bf2HFAlncVZkOSnKiR7JgzOZVgMYAkg=; b=qFecxa727ETn8BNkm/JUnHz5kx8H5s47tRLnqFcqj8fLoWGEWU9eSQdJ7JqcuFSXsgcq 82pdPfhJqZLOV6nVPYd3bOF6RJE81JrGVVZfawGMLORDlHb0EADjFt09PB8J/2O253ub 2QMzssb61V6mdCEMe0yYlRX3v2/3vT62ekxRtjPsP6Z151hRx61TkiMuskmlAjk4W5iF N5RiKjJ6MMmybUqzay+E322cnO5YdZ84RfnoDa6xpm1g7qoYIsw+7UY6ktdXk1ACFOtu sgpKS3G0gGxPUfzSEduXPQMaVjJSoZ/uJFuzU9svXd+Eloi0/CfTYojkgn1zz6APgeMx 6g== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3n9t3df0hj-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 23 Jan 2023 16:42:59 +0000 Received: from m0098421.ppops.net (m0098421.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 30NG2d5D021866; Mon, 23 Jan 2023 16:42:59 GMT Received: from ppma03dal.us.ibm.com (b.bd.3ea9.ip4.static.sl-reverse.com [169.62.189.11]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3n9t3df0h9-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 23 Jan 2023 16:42:59 +0000 Received: from pps.filterd (ppma03dal.us.ibm.com [127.0.0.1]) by ppma03dal.us.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 30NF04kP006941; Mon, 23 Jan 2023 16:42:58 GMT Received: from smtprelay03.wdc07v.mail.ibm.com ([9.208.129.113]) by ppma03dal.us.ibm.com (PPS) with ESMTPS id 3n87p70pxq-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 23 Jan 2023 16:42:58 +0000 Received: from smtpav03.dal12v.mail.ibm.com (smtpav03.dal12v.mail.ibm.com [10.241.53.102]) by smtprelay03.wdc07v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 30NGguID12321310 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 23 Jan 2023 16:42:57 GMT Received: from smtpav03.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 7F7EA58064; Mon, 23 Jan 2023 16:42:56 +0000 (GMT) Received: from smtpav03.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 0800A58056; Mon, 23 Jan 2023 16:42:56 +0000 (GMT) Received: from li-e362e14c-2378-11b2-a85c-87d605f3c641.ibm.com (unknown [9.163.12.142]) by smtpav03.dal12v.mail.ibm.com (Postfix) with ESMTP; Mon, 23 Jan 2023 16:42:55 +0000 (GMT) Message-ID: Subject: Re: [PATCH 1/2 version 3] fix for gdb.reverse/finish-precsave.exp and gdb.reverse/finish-reverse.exp From: Carl Love To: Bruno Larsen , Tom de Vries , Ulrich Weigand , gdb-patches@sourceware.org Cc: cel@us.ibm.com Date: Mon, 23 Jan 2023 08:42:55 -0800 In-Reply-To: <71aa635593df0677811afb85409aa190bcfa4f6a.camel@us.ibm.com> References: <071f24ecf9b3a2bbbe8fee7db77492eb55c5f3ff.camel@us.ibm.com> <1d9b21914354bef6a290ac30673741e722e11757.camel@de.ibm.com> <3e3c9c40f07ab01c79fe10915e76ffa187c42ad9.camel@us.ibm.com> <122f5d2d3db9ef1979b0f8da927d005f32bba82c.camel@us.ibm.com> <011768e8-2b76-f8ed-1174-fbaa020b15e7@redhat.com> <78b464a1-e32e-c3da-85e4-7bfc322cc29f@redhat.com> <7848e9858b54e33e399b871774ffc0b5058c1736.camel@us.ibm.com> <65d44121-65f7-a212-79ec-07ce53c15ecb@suse.de> <9fe94c0979cb40979b0dea7693a901c2d9f66164.camel@us.ibm.com> <59417813-eb4a-baf8-4e5d-e225d6732f71@suse.de> <7a494157-494f-6adf-d533-bf373b0f054f@redhat.com> <71aa635593df0677811afb85409aa190bcfa4f6a.camel@us.ibm.com> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.28.5 (3.28.5-18.el8) X-TM-AS-GCONF: 00 X-Proofpoint-GUID: sU8_PPcZkn2_5n1TZJpy08CILkr2pH-J X-Proofpoint-ORIG-GUID: ftcnCgJrf2mmUMhi7xqwNZm_AWNwbTBK Content-Transfer-Encoding: 7bit X-Proofpoint-UnRewURL: 0 URL was un-rewritten MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.930,Hydra:6.0.562,FMLib:17.11.122.1 definitions=2023-01-23_11,2023-01-23_01,2022-06-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxlogscore=999 clxscore=1015 impostorscore=0 bulkscore=0 lowpriorityscore=0 suspectscore=0 phishscore=0 adultscore=0 mlxscore=0 priorityscore=1501 spamscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2212070000 definitions=main-2301230154 X-Spam-Status: No, score=-11.4 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,GIT_PATCH_0,KAM_SHORT,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: Bruno, Tom, Ulrich, GDB developers: Fixed the regression failure in gdb.btrace/tailcall.exp. The function call set_step_info() sets the following values: tp->control.step_frame_id = get_frame_id (frame); tp->control.step_stack_frame_id = get_stack_frame_id (frame); tp->current_symtab = sal.symtab; tp->current_line = sal.line; The regression failure was due to the function updating the value of tp->control.step_stack_frame_id. So, the function call was replaced with the three lines of code to update step_frame_id, current_symtab, current_line. This was done in both places where set_step_info() was being called. The gdb.btrace tests require a 5th generation Intel processor to run. I have run the regression tests on my X86 laptop with a 5th generation processor as well as the IBM X86 system, with a pre 5th generation processor and on PowerPC with no regressions. I do not see the issue with test gdb.btrace/rn-dl-bind.exp Tom reported. Please let me know if this version of the patch is acceptable. Thanks. Carl ---------------- X86: reverse-finish fix PR record/29927 - reverse-finish requires two reverse next instructions to reach previous source line Currently on X86, when executing the finish command in reverse, gdb does a single step from the first instruction in the callee to get back to the caller. GDB stops on the last instruction in the source code line where the call was made. When stopped at the last instruction of the source code line, a reverse next or step command will stop at the first instruction of the same source code line thus requiring two step/next commands to reach the previous source code line. It should only require one step/next command to reach the previous source code line. By contrast, a reverse next or step command from the first line in a function stops at the first instruction in the source code line where the call was made. This patch fixes the reverse finish command so it will stop at the first instruction of the source line where the function call was made. The behavior on X86 for the reverse-finish command now matches doing a reverse-next from the beginning of the function. The proceed_to_finish flag in struct thread_control_state is no longer used. This patch removes the declaration, initialization and setting of the flag. This patch requires a number of regression tests to be updated. Test gdb.mi/mi-reverse.exp no longer needs to execute two steps to get to the previous line. The gdb output for tests gdb.reverse/until-precsave.exp and gdb.reverse/until-reverse.exp changed slightly. The expected result in tests gdb.reverse/amd64-failcall-reverse.exp and gdb.reverse/singlejmp-reverse.exp are updated to the correct expected result. Test gdb.reverse/singlejmp-reverse.exp no longer fails on "no more reverse-execution history". The reverse-next command should step all the way back thru a function call. For example: a = foo (); b = 1; <- issuing reverse-next here should stop at the previous line. Test gdb.reverse/amd64-tailcall-reverse.exp expected the reverse-next command to stop at a function call in foo (). That is not the correct behavior. GDB now step to the previous line as expected. The expected output for the test is updated to the correct behavior. This patch adds a new test gdb.reverse/finish-reverse-next.exp to test the reverse-finish command when returning from the entry point and from the body of the function. The step_until proceedure in test gdb.reverse/step-indirect-call-thunk.exp was moved to lib/gdb.exp and renamed cmd_until. The patch has been tested on X86 and PowerPC to verify no additional regression failures occured. Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=29927 --- gdb/gdbthread.h | 4 - gdb/infcall.c | 3 - gdb/infcmd.c | 37 +++---- gdb/infrun.c | 45 ++++---- gdb/testsuite/gdb.mi/mi-reverse.exp | 9 +- .../gdb.reverse/amd64-tailcall-reverse.exp | 3 +- .../gdb.reverse/finish-reverse-next.c | 48 ++++++++ .../gdb.reverse/finish-reverse-next.exp | 104 ++++++++++++++++++ .../gdb.reverse/singlejmp-reverse.exp | 3 - .../gdb.reverse/step-indirect-call-thunk.exp | 49 ++------- gdb/testsuite/gdb.reverse/until-precsave.exp | 2 +- gdb/testsuite/gdb.reverse/until-reverse.exp | 2 +- gdb/testsuite/lib/gdb.exp | 33 ++++++ 13 files changed, 237 insertions(+), 105 deletions(-) create mode 100644 gdb/testsuite/gdb.reverse/finish-reverse-next.c create mode 100644 gdb/testsuite/gdb.reverse/finish-reverse-next.exp diff --git a/gdb/gdbthread.h b/gdb/gdbthread.h index 11d69fceab0..e4edff2d621 100644 --- a/gdb/gdbthread.h +++ b/gdb/gdbthread.h @@ -150,10 +150,6 @@ struct thread_control_state the finished single step. */ int trap_expected = 0; - /* Nonzero if the thread is being proceeded for a "finish" command - or a similar situation when return value should be printed. */ - int proceed_to_finish = 0; - /* Nonzero if the thread is being proceeded for an inferior function call. */ int in_infcall = 0; diff --git a/gdb/infcall.c b/gdb/infcall.c index e09904f9a35..116605c43ef 100644 --- a/gdb/infcall.c +++ b/gdb/infcall.c @@ -625,9 +625,6 @@ run_inferior_call (std::unique_ptr sm, disable_watchpoints_before_interactive_call_start (); - /* We want to print return value, please... */ - call_thread->control.proceed_to_finish = 1; - try { /* Infcalls run synchronously, in the foreground. */ diff --git a/gdb/infcmd.c b/gdb/infcmd.c index 0497ad05091..5d3221e8b90 100644 --- a/gdb/infcmd.c +++ b/gdb/infcmd.c @@ -1721,19 +1721,10 @@ finish_backward (struct finish_command_fsm *sm) sal = find_pc_line (func_addr, 0); - tp->control.proceed_to_finish = 1; - /* Special case: if we're sitting at the function entry point, - then all we need to do is take a reverse singlestep. We - don't need to set a breakpoint, and indeed it would do us - no good to do so. - - Note that this can only happen at frame #0, since there's - no way that a function up the stack can have a return address - that's equal to its entry point. */ + frame_info_ptr frame = get_selected_frame (nullptr); if (sal.pc != pc) { - frame_info_ptr frame = get_selected_frame (nullptr); struct gdbarch *gdbarch = get_frame_arch (frame); /* Set a step-resume at the function's entry point. Once that's @@ -1743,16 +1734,27 @@ finish_backward (struct finish_command_fsm *sm) sr_sal.pspace = get_frame_program_space (frame); insert_step_resume_breakpoint_at_sal (gdbarch, sr_sal, null_frame_id); - - proceed ((CORE_ADDR) -1, GDB_SIGNAL_DEFAULT); } else { - /* We're almost there -- we just need to back up by one more - single-step. */ - tp->control.step_range_start = tp->control.step_range_end = 1; - proceed ((CORE_ADDR) -1, GDB_SIGNAL_DEFAULT); + /* We are exactly at the function entry point. Note that this + can only happen at frame #0. + + When setting a step range, need to setup the current_symtab and + current_line. Do not change the step_stack_frame_id as this + will cause the reverse-next command to stop in the wrong spot. */ + struct symtab_and_line stop_pc_sal; + stop_pc_sal = find_pc_line (pc, 0); + tp->control.step_frame_id = get_frame_id (frame); + tp->current_symtab = stop_pc_sal.symtab; + tp->current_line = stop_pc_sal.line; + + /* Return using a step range so we will keep stepping back + to the first instruction in the source code line. */ + tp->control.step_range_start = sal.pc; + tp->control.step_range_end = sal.pc; } + proceed ((CORE_ADDR) -1, GDB_SIGNAL_DEFAULT); } /* finish_forward -- helper function for finish_command. FRAME is the @@ -1778,9 +1780,6 @@ finish_forward (struct finish_command_fsm *sm, frame_info_ptr frame) set_longjmp_breakpoint (tp, frame_id); - /* We want to print return value, please... */ - tp->control.proceed_to_finish = 1; - proceed ((CORE_ADDR) -1, GDB_SIGNAL_DEFAULT); } diff --git a/gdb/infrun.c b/gdb/infrun.c index 181d961d80d..183110a049a 100644 --- a/gdb/infrun.c +++ b/gdb/infrun.c @@ -2748,8 +2748,6 @@ clear_proceed_status_thread (struct thread_info *tp) tp->control.stop_step = 0; - tp->control.proceed_to_finish = 0; - tp->control.stepping_command = 0; /* Discard any remaining commands or status from previous stop. */ @@ -6737,31 +6735,30 @@ process_event_stop_test (struct execution_control_state *ecs) case BPSTAT_WHAT_STEP_RESUME: infrun_debug_printf ("BPSTAT_WHAT_STEP_RESUME"); - delete_step_resume_breakpoint (ecs->event_thread); - if (ecs->event_thread->control.proceed_to_finish - && execution_direction == EXEC_REVERSE) - { - struct thread_info *tp = ecs->event_thread; - - /* We are finishing a function in reverse, and just hit the - step-resume breakpoint at the start address of the - function, and we're almost there -- just need to back up - by one more single-step, which should take us back to the - function call. */ - tp->control.step_range_start = tp->control.step_range_end = 1; - keep_going (ecs); - return; - } fill_in_stop_func (gdbarch, ecs); - if (ecs->event_thread->stop_pc () == ecs->stop_func_start - && execution_direction == EXEC_REVERSE) + + if (execution_direction == EXEC_REVERSE) { - /* We are stepping over a function call in reverse, and just - hit the step-resume breakpoint at the start address of - the function. Go back to single-stepping, which should - take us back to the function call. */ - ecs->event_thread->stepping_over_breakpoint = 1; + struct thread_info *tp = ecs->event_thread; + /* We are finishing a function in reverse or stepping over a function + call in reverse, and just hit the step-resume breakpoint at the + start address of the function, and we're almost there -- just need + to back up to the function call. */ + + stop_pc_sal = find_pc_line (ecs->event_thread->stop_pc (), 0); + + /* When setting a step range, need to setup the current_symtab and + current_line. Do not change the step_stack_frame_id as this + will cause the reverse-next command to stop in the wrong spot. */ + tp->control.step_frame_id = get_frame_id (frame); + tp->current_symtab = stop_pc_sal.symtab; + tp->current_line = stop_pc_sal.line; + + /* Return using a step range so we will keep stepping back to the + first instruction in the source code line. */ + tp->control.step_range_start = ecs->stop_func_start; + tp->control.step_range_end = ecs->stop_func_start; keep_going (ecs); return; } diff --git a/gdb/testsuite/gdb.mi/mi-reverse.exp b/gdb/testsuite/gdb.mi/mi-reverse.exp index d631beb17c8..30635ab1754 100644 --- a/gdb/testsuite/gdb.mi/mi-reverse.exp +++ b/gdb/testsuite/gdb.mi/mi-reverse.exp @@ -97,15 +97,10 @@ proc test_controlled_execution_reverse {} { "basics.c" $line_main_callme_1 "" \ "reverse finish from callme" - # Test exec-reverse-next - # It takes two steps to get back to the previous line, - # as the first step moves us to the start of the current line, - # and the one after that moves back to the previous line. - - mi_execute_to "exec-next --reverse 2" \ + mi_execute_to "exec-next --reverse" \ "end-stepping-range" "main" "" \ "basics.c" $line_main_hello "" \ - "reverse next to get over the call to do_nothing" + "reverse next to get over the call to do_nothing" # Test exec-reverse-step diff --git a/gdb/testsuite/gdb.reverse/amd64-tailcall-reverse.exp b/gdb/testsuite/gdb.reverse/amd64-tailcall-reverse.exp index 52a87faabf7..7d441dbb7a9 100644 --- a/gdb/testsuite/gdb.reverse/amd64-tailcall-reverse.exp +++ b/gdb/testsuite/gdb.reverse/amd64-tailcall-reverse.exp @@ -44,6 +44,5 @@ if [supports_process_record] { gdb_test "next" {f \(\);} "next to f" gdb_test "next" {v = 3;} "next to v = 3" -# FAIL was: -# 29 g (); +# Reverse step back to f (). gdb_test "reverse-next" {f \(\);} diff --git a/gdb/testsuite/gdb.reverse/finish-reverse-next.c b/gdb/testsuite/gdb.reverse/finish-reverse-next.c new file mode 100644 index 00000000000..f90ecbb93cb --- /dev/null +++ b/gdb/testsuite/gdb.reverse/finish-reverse-next.c @@ -0,0 +1,48 @@ +/* This testcase is part of GDB, the GNU debugger. + + Copyright 2012-2023 Free Software Foundation, Inc. + + 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 . */ + +/* The reverse finish command should return from a function and stop on + the first instruction of the source line where the function call is made. + Specifically, the behavior should match doing a reverse next from the + first instruction in the function. GDB should only require one reverse + step or next statement to reach the previous source code line. + + This test verifies the fix for gdb bugzilla: + + https://sourceware.org/bugzilla/show_bug.cgi?id=29927 +*/ + +int +function1 (int a, int b) // FUNCTION1 +{ + int ret = 0; + + ret = a + b; + return ret; +} + +int +main(int argc, char* argv[]) +{ + int a, b; + + a = 1; + b = 5; + + function1 (a, b); // CALL FUNCTION + return 0; +} diff --git a/gdb/testsuite/gdb.reverse/finish-reverse-next.exp b/gdb/testsuite/gdb.reverse/finish-reverse-next.exp new file mode 100644 index 00000000000..63305c109e1 --- /dev/null +++ b/gdb/testsuite/gdb.reverse/finish-reverse-next.exp @@ -0,0 +1,104 @@ +# Copyright 2008-2023 Free Software Foundation, Inc. + +# 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 . */ + +# This file is part of the GDB testsuite. It tests reverse stepping. +# Lots of code borrowed from "step-test.exp". + +# The reverse finish command should return from a function and stop on +# the first instruction of the source line where the function call is made. +# Specifically, the behavior should match doing a reverse next from the +# first instruction in the function. GDB should only take one reverse step +# or next statement to reach the previous source code line. + +# This testcase verifies the reverse-finish command stops at the first +# instruction in the source code line where the function was called. There +# are two scenarios that must be checked: +# 1) gdb is at the entry point instruction for the function +# 2) gdb is in the body of the function. + +# This test verifies the fix for gdb bugzilla: +# https://sourceware.org/bugzilla/show_bug.cgi?id=29927 + +if ![supports_reverse] { + return +} + +standard_testfile + +if { [prepare_for_testing "failed to prepare" $testfile $srcfile] } { + return -1 +} + +runto_main +set target_remote [gdb_is_target_remote] + +if [supports_process_record] { + # Activate process record/replay. + gdb_test_no_output "record" "turn on process record for test1" +} + + +### TEST 1: reverse finish from the entry point instruction in +### function1. + +# Set breakpoint at call to function1 in main. +set bp_FUNCTION [gdb_get_line_number "CALL FUNCTION" $srcfile] +gdb_breakpoint $srcfile:$bp_FUNCTION temporary + +# Continue to break point at function1 call in main. +gdb_continue_to_breakpoint \ + "stopped at function1 entry point instruction to stepi into function" \ + ".*$srcfile:$bp_FUNCTION\r\n.*" + +# stepi until we see "{" indicating we entered function1 +repeat_cmd_until "stepi" "CALL FUNCTION" "{" "stepi into function1 call" + +gdb_test "reverse-finish" ".*function1 \\(a, b\\); // CALL FUNCTION.*" \ + "reverse-finish function1 " + +# Check to make sure we stopped at the first instruction in the source code +# line. It should only take one reverse next command to get to the previous +# source line. If GDB stops at the last instruction in the source code line +# it will take two reverse next instructions to get to the previous source +# line. +gdb_test "reverse-next" ".*b = 5;.*" "reverse next at b = 5, call from function" + +# Clear the recorded log. +gdb_test "record stop" "Process record is stopped.*" \ + "turn off process record for test1" +gdb_test_no_output "record" "turn on process record for test2" + + +### TEST 2: reverse finish from the body of function1. + +# Set breakpoint at call to function1 in main. +gdb_breakpoint $srcfile:$bp_FUNCTION temporary + +# Continue to break point at function1 call in main. +gdb_continue_to_breakpoint \ + "at function1 entry point instruction to step to body of function" \ + ".*$srcfile:$bp_FUNCTION\r\n.*" + +# do a step instruction to get to the body of the function +gdb_test "step" ".*int ret = 0;.*" "step test 1" + +gdb_test "reverse-finish" ".*function1 \\(a, b\\); // CALL FUNCTION.*" \ + "reverse-finish function1 call from function body" + +# Check to make sure we stopped at the first instruction in the source code +# line. It should only take one reverse next command to get to the previous +# source line. +gdb_test "reverse-next" ".*b = 5;.*" \ + "reverse next at b = 5, from function body" diff --git a/gdb/testsuite/gdb.reverse/singlejmp-reverse.exp b/gdb/testsuite/gdb.reverse/singlejmp-reverse.exp index 1ca7c2ce559..e94bcdbe52e 100644 --- a/gdb/testsuite/gdb.reverse/singlejmp-reverse.exp +++ b/gdb/testsuite/gdb.reverse/singlejmp-reverse.exp @@ -56,7 +56,4 @@ gdb_test "next" {v = 3;} "next to v = 3" # { gdb_test "reverse-step" {nodebug \(\);} -# FAIL was: -# No more reverse-execution history. -# { gdb_test "reverse-next" {f \(\);} diff --git a/gdb/testsuite/gdb.reverse/step-indirect-call-thunk.exp b/gdb/testsuite/gdb.reverse/step-indirect-call-thunk.exp index ad637899e5b..b82e5663bd5 100644 --- a/gdb/testsuite/gdb.reverse/step-indirect-call-thunk.exp +++ b/gdb/testsuite/gdb.reverse/step-indirect-call-thunk.exp @@ -39,39 +39,6 @@ if { ![runto_main] } { return -1 } -# Do repeated stepping COMMANDs in order to reach TARGET from CURRENT -# -# COMMAND is a stepping command -# CURRENT is a string matching the current location -# TARGET is a string matching the target location -# TEST is the test name -# -# The function issues repeated COMMANDs as long as the location matches -# CURRENT up to a maximum of 100 steps. -# -# TEST passes if the resulting location matches TARGET and fails -# otherwise. -# -proc step_until { command current target test } { - global gdb_prompt - - set count 0 - gdb_test_multiple "$command" "$test" { - -re "$current.*$gdb_prompt $" { - incr count - if { $count < 100 } { - send_gdb "$command\n" - exp_continue - } else { - fail "$test" - } - } - -re "$target.*$gdb_prompt $" { - pass "$test" - } - } -} - gdb_test_no_output "record" gdb_test "next" ".*" "record trace" @@ -91,20 +58,20 @@ gdb_test "reverse-next" "apply\.2.*" \ "reverse-step through thunks and over inc" # We can use instruction stepping to step into thunks. -step_until "stepi" "apply\.2" "indirect_thunk" "stepi into call thunk" -step_until "stepi" "indirect_thunk" "inc" \ +repeat_cmd_until "stepi" "apply\.2" "indirect_thunk" "stepi into call thunk" +repeat_cmd_until "stepi" "indirect_thunk" "inc" \ "stepi out of call thunk into inc" set alphanum_re "\[a-zA-Z0-9\]" set pic_thunk_re "__$alphanum_re*\\.get_pc_thunk\\.$alphanum_re* \\(\\)" -step_until "stepi" "(inc|$pic_thunk_re)" "return_thunk" "stepi into return thunk" -step_until "stepi" "return_thunk" "apply" \ +repeat_cmd_until "stepi" "(inc|$pic_thunk_re)" "return_thunk" "stepi into return thunk" +repeat_cmd_until "stepi" "return_thunk" "apply" \ "stepi out of return thunk back into apply" -step_until "reverse-stepi" "apply" "return_thunk" \ +repeat_cmd_until "reverse-stepi" "apply" "return_thunk" \ "reverse-stepi into return thunk" -step_until "reverse-stepi" "return_thunk" "inc" \ +repeat_cmd_until "reverse-stepi" "return_thunk" "inc" \ "reverse-stepi out of return thunk into inc" -step_until "reverse-stepi" "(inc|$pic_thunk_re)" "indirect_thunk" \ +repeat_cmd_until "reverse-stepi" "(inc|$pic_thunk_re)" "indirect_thunk" \ "reverse-stepi into call thunk" -step_until "reverse-stepi" "indirect_thunk" "apply" \ +repeat_cmd_until "reverse-stepi" "indirect_thunk" "apply" \ "reverse-stepi out of call thunk into apply" diff --git a/gdb/testsuite/gdb.reverse/until-precsave.exp b/gdb/testsuite/gdb.reverse/until-precsave.exp index 0c2d7537cd6..777aec94ac1 100644 --- a/gdb/testsuite/gdb.reverse/until-precsave.exp +++ b/gdb/testsuite/gdb.reverse/until-precsave.exp @@ -142,7 +142,7 @@ gdb_test "advance marker2" \ # Finish out to main scope (backward) gdb_test "finish" \ - " in main .*$srcfile:$bp_location20.*" \ + "main .*$srcfile:$bp_location20.*" \ "reverse-finish from marker2" # Advance backward to last line of factorial (outer invocation) diff --git a/gdb/testsuite/gdb.reverse/until-reverse.exp b/gdb/testsuite/gdb.reverse/until-reverse.exp index 23fc881dbf2..3a05953329f 100644 --- a/gdb/testsuite/gdb.reverse/until-reverse.exp +++ b/gdb/testsuite/gdb.reverse/until-reverse.exp @@ -113,7 +113,7 @@ gdb_test "advance marker2" \ # Finish out to main scope (backward) gdb_test "finish" \ - " in main .*$srcfile:$bp_location20.*" \ + "main .*$srcfile:$bp_location20.*" \ "reverse-finish from marker2" # Advance backward to last line of factorial (outer invocation) diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index c41d4698d66..234c21a04ea 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -9301,6 +9301,39 @@ proc gdb_step_until { regexp {test_name ""} {max_steps 10} } { } } +# Do repeated stepping COMMANDs in order to reach TARGET from CURRENT +# +# COMMAND is a stepping command +# CURRENT is a string matching the current location +# TARGET is a string matching the target location +# TEST is the test name +# +# The function issues repeated COMMANDs as long as the location matches +# CURRENT up to a maximum of 100 steps. +# +# TEST passes if the resulting location matches TARGET and fails +# otherwise. + +proc repeat_cmd_until { command current target test } { + global gdb_prompt + + set count 0 + gdb_test_multiple "$command" "$test" { + -re "$current.*$gdb_prompt $" { + incr count + if { $count < 100 } { + send_gdb "$command\n" + exp_continue + } else { + fail "$test" + } + } + -re "$target.*$gdb_prompt $" { + pass "$test" + } + } +} + # Check if the compiler emits epilogue information associated # with the closing brace or with the last statement line. # -- 2.37.2