From: Carl Love <cel@us.ibm.com>
To: Ulrich Weigand <Ulrich.Weigand@de.ibm.com>,
"gdb-patches@sourceware.org" <gdb-patches@sourceware.org>,
Bruno Larsen <blarsen@redhat.com>,
"tdevries@suse.de" <tdevries@suse.de>,
"pedro@palves.net" <pedro@palves.net>
Cc: cel@us.ibm.com
Subject: [PING] Re: [PATCH ] PowerPC: fix for gdb.reverse/finish-precsave.exp and gdb.reverse/finish-reverse.exp
Date: Mon, 27 Feb 2023 08:09:24 -0800 [thread overview]
Message-ID: <304e2d8b461d5540f79af1c87d288ba8551efbde.camel@us.ibm.com> (raw)
In-Reply-To: <46c2c756475ba5923d7eed97996632a08285dd42.camel@us.ibm.com>
Ulrich, Bruno, Tom, Pedro, GDB maintainers:
Wondering if anyone has had a chance to review and test this patch?
Would really like to make sure some can test it on an Intel Generation
5 or newer processor to make sure there are no issues with the tests
gdb.btrace/rn-dl-bind.exp and gdb.btrace/tailcall.exp: reverse-next.
Thanks for the time and effort looking at this patch.
Carl
-------------------------------------------------
On Mon, 2023-02-20 at 12:24 -0800, Carl Love wrote:
> Ulrich, Bruno, GDB maintainers:
>
> Per the comments from Ulrich, I have updated the patch to address the
> comments about the source code and the testcase. I updated the new
> library procedure so it can be called from gdb_step_until. So
> gdb_step_until is now just a variant of the new repeat_cmd_until
> proceedure.
>
> The redundant if test has been removed. It was added to fix a
> regression testing failure I saw on the gdb.btrace/tailcall.exp on
> X86.
> I went back and redid the testing, rebuilding everything from
> scratch.
> I am not able to reproduce the test failure without the redundant
> check. Not sure why I initially saw the regression failure at this
> point? Perhaps I hadn't re-enabled the
> /proc/sys/kernel/perf_event_paranoid value? It must be 2 or lower
> for
> the test to run. Otherwise the test fails. Anyway, the regression
> tests on X86 run without the redundant check are passing on my
> laptop.
>
> I resolved the issues with the testing on X86 to make sure it isn't
> missing failures when testing gdb.reverse/step-indirect-call-
> thunk.exp.
> As mentioned in the previous email, the test does not run on PowerPC
> since the gcc command line options "-mindirect-branch=thunk" and "-
> mfunction-return=thunk" are not supported on PowerPC. I disabled the
> test on PowerPC in the updated patch.
>
> Retested on X86 generation 5 and PowerPC with no regressions found.
>
> Hopefully this version of the patch is acceptable.
>
> Carl
>
> -----------------------------------------------------
>
> PowerPC: fix for gdb.reverse/finish-precsave.exp and
> gdb.reverse/finish-reverse.exp
>
> PPC64 multiple entry points. When executing in reverse the function
> finish_backward sets the break point at the alternate entry point,
> known
> as the global entry point (GEP) in PowerPC. However if the forward
> execution enters via the normal entry point, known as the local entry
> point (LEP) on PowerPC, reverse execution never sees the break point
> at the
> alternate entry point of the function. Reverse execution continues
> until
> the next break point is encountered thus stopping at the wrong place.
>
> This patch adds a new address to struct execution_control_state to
> hold the
> address of the alternate entry point (GEP). The finish_backwards
> function
> is updated, if the stopping point is between the normal entry point
> (LEP)
> and the end of the function, a breakpoint is set at the normal entry
> point.
> If the stopping point is between the entry points, a breakpoint is
> set to
> the alternate entry point.
>
> The patch fixes the behavior of the reverse-finish command on PowerPC
> to
> match the behavior of the command on other platforms, specifically
> X86.
> The patch does not change the behavior of the command on X86.
>
> A new test is added to verify the reverse-finish command on PowerPC
> correctly stops at the instruction where the function call is
> made. A new
> test, finish-reverse-next.exp, is added to verify the correct
> functionality
> of the reverse-finish command. The reverse-finish comand is expected
> to
> stop on the instruction that jumps to the function. Procedure
> proc_step_until from test gdb.reverse/step-indirect-call-thunk.exp is
> moved
> to lib/gdb.exp and renamed repeat_cmd_until.
>
> The patch fixes 11 regression errors in test gdb.reverse/finish-
> precsave.exp
> and 11 regression errors in test gdb.reverse/finish-reverse.exp.
>
> The patch has been tested on Power 10 and X86 processor with no new
> regression failures.
> ---
> gdb/infcmd.c | 47 ++--
> gdb/infrun.c | 24 ++
> .../gdb.reverse/finish-reverse-next.c | 91 +++++++
> .../gdb.reverse/finish-reverse-next.exp | 224
> ++++++++++++++++++
> .../gdb.reverse/step-indirect-call-thunk.exp | 55 ++---
> gdb/testsuite/lib/gdb.exp | 49 +++-
> 6 files changed, 421 insertions(+), 69 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/infcmd.c b/gdb/infcmd.c
> index 77206fcbfe8..0fa5719d38b 100644
> --- a/gdb/infcmd.c
> +++ b/gdb/infcmd.c
> @@ -1728,28 +1728,41 @@ finish_backward (struct finish_command_fsm
> *sm)
> no way that a function up the stack can have a return address
> that's equal to its entry point. */
>
> - if (sal.pc != pc)
> - {
> - frame_info_ptr frame = get_selected_frame (nullptr);
> - struct gdbarch *gdbarch = get_frame_arch (frame);
> + CORE_ADDR alt_entry_point = sal.pc;
> + CORE_ADDR entry_point = alt_entry_point;
> + frame_info_ptr frame = get_selected_frame (nullptr);
> + struct gdbarch *gdbarch = get_frame_arch (frame);
> +
> + if (gdbarch_skip_entrypoint_p (gdbarch))
> + /* Some architectures, like PowerPC use local and global entry
> points.
> + There is only one Entry Point (GEP = LEP) for other
> architectures.
> + The GEP is an alternate entry point. The LEP is the normal
> entry point.
> + The value of entry_point was initialized to the alternate
> entry point
> + (GEP). It will be adjusted to the normal entry point if the
> function
> + has two entry points. */
> + entry_point = gdbarch_skip_entrypoint (gdbarch, sal.pc);
>
> - /* Set a step-resume at the function's entry point. Once
> that's
> - hit, we'll do one more step backwards. */
> + if ((pc < alt_entry_point) || (pc > entry_point))
> + {
> + /* We are in the body of the function. Set a breakpoint to
> backup to
> + the normal entry point. */
> symtab_and_line sr_sal;
> - sr_sal.pc = sal.pc;
> + sr_sal.pc = entry_point;
> 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);
> + insert_step_resume_breakpoint_at_sal (gdbarch, sr_sal,
> + null_frame_id);
> }
> +
> 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 either at one of the entry points or between the entry
> points.
> + If we are not at the alt_entry point, go back to the
> alt_entry_point
> + If we at the normal entry point step back one instruction,
> when we
> + stop we will determine if we entered via the entry point or
> the
> + alternate entry point. If we are at the alternate entry
> point,
> + single step back to the function call. */
> + tp->control.step_range_start = tp->control.step_range_end = 1;
> +
> + proceed ((CORE_ADDR) -1, GDB_SIGNAL_DEFAULT);
> }
>
> /* finish_forward -- helper function for finish_command. FRAME is
> the
> diff --git a/gdb/infrun.c b/gdb/infrun.c
> index 87ab73c47a4..987dbd16ea4 100644
> --- a/gdb/infrun.c
> +++ b/gdb/infrun.c
> @@ -1868,6 +1868,7 @@ struct execution_control_state
>
> struct target_waitstatus ws;
> int stop_func_filled_in = 0;
> + CORE_ADDR stop_func_alt_start = 0;
> CORE_ADDR stop_func_start = 0;
> CORE_ADDR stop_func_end = 0;
> const char *stop_func_name = nullptr;
> @@ -4680,6 +4681,11 @@ fill_in_stop_func (struct gdbarch *gdbarch,
> ecs->stop_func_start
> += gdbarch_deprecated_function_start_offset (gdbarch);
>
> + /* PowerPC functions have a Local Entry Point (LEP) and a
> Global
> + Entry Point (GEP). There is only one Entry Point (GEP =
> LEP) for
> + other architectures. */
> + ecs->stop_func_alt_start = ecs->stop_func_start;
> +
> if (gdbarch_skip_entrypoint_p (gdbarch))
> ecs->stop_func_start
> = gdbarch_skip_entrypoint (gdbarch, ecs-
> >stop_func_start);
> @@ -7269,6 +7275,24 @@ process_event_stop_test (struct
> execution_control_state *ecs)
> }
> }
>
> + if (execution_direction == EXEC_REVERSE
> + && ecs->event_thread->control.proceed_to_finish
> + && ecs->event_thread->stop_pc () >= ecs->stop_func_alt_start
> + && ecs->event_thread->stop_pc () < ecs->stop_func_start)
> + {
> + /* We are executing the reverse-finish command.
> + If the system supports multiple entry points and we are
> finishing a
> + function in reverse. If we are between the entry points
> singe-step
> + back to the alternate entry point. If we are at the alternate
> entry
> + point -- just need to back up by one more single-step, which
> + should take us back to the function call. */
> + ecs->event_thread->control.step_range_start
> + = ecs->event_thread->control.step_range_end = 1;
> + keep_going (ecs);
> + return;
> +
> + }
> +
> if (ecs->event_thread->control.step_range_end == 1)
> {
> /* It is stepi or nexti. We always want to stop stepping
> after
> 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..e95ee8e33a6
> --- /dev/null
> +++ b/gdb/testsuite/gdb.reverse/finish-reverse-next.c
> @@ -0,0 +1,91 @@
> +/* 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 <
> http://www.gnu.org/licenses/>. */
> +
> +/* 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
> +
> + PowerPC supports two entry points to a function. The normal
> entry point
> + is called the local entry point (LEP). The alternate entry point
> is called
> + the global entry point (GEP). The GEP is only used if the table
> of
> + contents (TOC) value stored in register r2 needs to be setup
> prior to
> + execution starting at the LEP. A function call via a function
> pointer
> + will entry via the GEP. A normal function call will enter via
> the LEP.
> +
> + This test has been expanded to include tests to verify the
> reverse-finish
> + command works properly if the function is called via the
> GEP. The original
> + test only verified the reverse-finish command for a normal call
> that used
> + the LEP. */
> +
> +int
> +function2 (int a, int b)
> +{
> + int ret = 0;
> + ret = ret + a + b;
> + return ret;
> +}
> +
> +int
> +function1 (int a, int b) // FUNCTION1
> +{
> + int ret = 0;
> + int (*funp) (int, int) = &function2;
> + /* The assembly code for this function when compiled for PowerPC
> is as
> + follows:
> +
> + 0000000010000758 <function1>:
> + 10000758: 02 10 40 3c lis r2,4098 <- GEP
> + 1000075c: 00 7f 42 38 addi r2,r2,32512
> + 10000760: a6 02 08 7c mflr r0 <- LEP
> + 10000764: 10 00 01 f8 std r0,16(r1)
> + ....
> +
> + When the function is called on PowerPC with function1 (a, b)
> the call
> + enters at the Local Entry Point (LEP). When the function is
> called via
> + a function pointer, the Global Entry Point (GEP) for function1
> is used.
> + The GEP sets up register 2 before reaching the LEP.
> + */
> + ret = funp (a + 1, b + 2);
> + return ret;
> +}
> +
> +int
> +main(int argc, char* argv[])
> +{
> + int a, b;
> + int (*funp) (int, int) = &function1;
> +
> + /* Call function via Local Entry Point (LEP). */
> +
> + a = 1;
> + b = 5;
> +
> + function1 (a, b); // CALL VIA LEP
> +
> + /* Call function via Global Entry Point (GEP). */
> + a = 10;
> + b = 50;
> +
> + funp (a, b); // CALL VIA GEP
> + 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..1f53b649a7d
> --- /dev/null
> +++ b/gdb/testsuite/gdb.reverse/finish-reverse-next.exp
> @@ -0,0 +1,224 @@
> +# 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 <
> http://www.gnu.org/licenses/>. */
> +
> +# 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
> +
> +# PowerPC supports two entry points to a function. The normal entry
> point
> +# is called the local entry point (LEP). The alternate entry point
> is called
> +# the global entry point (GEP). A function call via a function
> pointer
> +# will entry via the GEP. A normal function call will enter via the
> LEP.
> +#
> +# This test has been expanded to include tests to verify the
> reverse-finish
> +# command works properly if the function is called via the GEP. The
> original
> +# test only verified the reverse-finish command for a normal call
> that used
> +# the LEP.
> +
> +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 (LEP) in
> +### function1 when called using the normal entry point (LEP).
> +
> +# Set breakpoint at call to function1 in main.
> +set bp_LEP_test [gdb_get_line_number "CALL VIA LEP" $srcfile]
> +gdb_breakpoint $srcfile:$bp_LEP_test 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_LEP_test\r\n.*"
> +
> +# stepi until we see "{" indicating we entered function1
> +repeat_cmd_until "stepi" "CALL VIA LEP" "{" "stepi into function1
> call" "100"
> +
> +# The reverse-finish command should stop on the function call
> instruction
> +# which is the last instruction in the source code line. A reverse-
> next
> +# instruction should then stop at the first instruction in the same
> source
> +# code line. Another revers-next instruction stops at the previous
> source
> +# code line.
> +gdb_test "reverse-finish" ".*function1 \\(a, b\\); // CALL VIA
> LEP.*" \
> + "reverse-finish function1 LEP call from LEP "
> +gdb_test "reverse-next" ".*function1 \\(a, b\\); // CALL VIA LEP"
> \
> + "reverse next 1 LEP entry point function call from LEP"
> +gdb_test "reverse-next" ".*b = 5;.*" "reverse next 2, at b = 5, call
> from LEP"
> +
> +
> +gdb_test "reverse-continue" ".*" "setup for test 2"
> +
> +# Turn off record to clear logs and turn on again
> +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_LEP_test 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_LEP_test\r\n.*"
> +
> +# do a step instruction to get to the body of the function
> +gdb_test "step" ".*int ret = 0;.*" "step test 1"
> +
> +# The reverse-finish command should stop on the function call
> instruction
> +# which is the last instruction in the source code line. A reverse-
> next
> +# instruction should then stop at the first instruction in the same
> source
> +# code line. Another revers-next instruction stops at the previous
> source
> +# code line.
> +gdb_test "reverse-finish" ".*function1 \\(a, b\\); // CALL VIA
> LEP.*" \
> + "reverse-finish function1 LEP call from function body"
> +gdb_test "reverse-next" ".*function1 \\(a, b\\); // CALL VIA
> LEP.*" \
> + "reverse next 1 LEP from function body"
> +gdb_test "reverse-next" ".*b = 5;.*" \
> + "reverse next 2 at b = 5, from function body"
> +
> +gdb_test "reverse-continue" ".*" "setup for test 3"
> +
> +# Turn off record to clear logs and turn on again
> +gdb_test "record stop" "Process record is stopped.*" \
> + "turn off process record for test2"
> +gdb_test_no_output "record" "turn on process record for test3"
> +
> +
> +### TEST 3: reverse finish from the alternate entry point
> instruction (GEP) in
> +### function1 when called using the alternate entry point (GEP).
> +
> +# Set breakpoint at call to funp in main.
> +set bp_GEP_test [gdb_get_line_number "CALL VIA GEP" $srcfile]
> +gdb_breakpoint $srcfile:$bp_GEP_test temporary
> +
> +# Continue to break point at funp call in main.
> +gdb_continue_to_breakpoint \
> + "stopped at function1 entry point instruction to stepi into
> funp" \
> + ".*$srcfile:$bp_GEP_test\r\n.*"
> +
> +# stepi until we see "{" indicating we entered function.
> +repeat_cmd_until "stepi" "CALL VIA GEP" "{" "stepi into funp call"
> +
> +# The reverse-finish command should stop on the function call
> instruction
> +# which is the last instruction in the source code line. A reverse-
> next
> +# instruction should then stop at the first instruction in the same
> source
> +# code line. Another revers-next instruction stops at the previous
> source
> +# code line.
> +gdb_test "reverse-finish" ".*funp \\(a, b\\);.*" \
> + "function1 GEP call call from GEP"
> +gdb_test "reverse-next" ".*funp \\(a, b\\);.*" \
> + "reverse next 1 GEP entry point function call from GEP"
> +gdb_test "reverse-next" ".*b = 50;.*" "reverse next 2 at b = 50,
> call from GEP"
> +
> +gdb_test "reverse-continue" ".*" "setup for test 4"
> +
> +# Turn off record to clear logs and turn on again
> +gdb_test "record stop" "Process record is stopped.*" \
> + "turn off process record for test3"
> +gdb_test_no_output "record" "turn on process record for test4"
> +
> +### TEST 4: reverse finish from between the GEP and LEP in
> +### function1 when called using the alternate entry point (GEP).
> +
> +# Set breakpoint at call to funp in main.
> +set bp_GEP_test [gdb_get_line_number "CALL VIA GEP" $srcfile]
> +gdb_breakpoint $srcfile:$bp_GEP_test temporary
> +
> +# Continue to break point at funp call in main.
> +gdb_continue_to_breakpoint \
> + "stopped at function1 entry point instruction to stepi into funp
> again" \
> + ".*$srcfile:$bp_GEP_test\r\n.*"
> +
> +# stepi until we see "{" indicating we entered function.
> +repeat_cmd_until "stepi" "CALL VIA GEP" "{" "stepi into funp call
> again"
> +
> +# do one more stepi so we are between the GEP and LEP.
> +gdb_test "stepi" "{" "stepi to between GEP and LEP"
> +
> +# The reverse-finish command should stop on the function call
> instruction
> +# which is the last instruction in the source code line. A reverse-
> next
> +# instruction should then stop at the first instruction in the same
> source
> +# code line. Another revers-next instruction stops at the previous
> source
> +# code line.
> +gdb_test "reverse-finish" ".*funp \\(a, b\\);.*" \
> + "function1 GEP call call from GEP again"
> +gdb_test "reverse-next" ".*funp \\(a, b\\);.*" \
> + "reverse next 1 GEP entry point function call from GEP again"
> +gdb_test "reverse-next" ".*b = 50;.*" \
> + "reverse next 2 at b = 50, call from GEP again"
> +
> +gdb_test "reverse-continue" ".*" "setup for test 5"
> +
> +# Turn off record to clear logs and turn on again
> +gdb_test "record stop" "Process record is stopped.*" \
> + "turn off process record for test4"
> +gdb_test_no_output "record" "turn on process record for test5"
> +
> +
> +### TEST 5: reverse finish from the body of function 1 when calling
> using the
> +### alternate entrypoint (GEP).
> +gdb_breakpoint $srcfile:$bp_GEP_test temporary
> +
> +# Continue to break point at funp call.
> +gdb_continue_to_breakpoint \
> + "at function1 entry point instruction to step to body of funp
> call" \
> + ".*$srcfile:$bp_GEP_test\r\n.*"
> +
> +# Step into body of funp, called via GEP.
> +gdb_test "step" ".*int ret = 0;.*" "step test 2"
> +
> +# The reverse-finish command should stop on the function call
> instruction
> +# which is the last instruction in the source code line. A reverse-
> next
> +# instruction should then stop at the first instruction in the same
> source
> +# code line. Another revers-next instruction stops at the previous
> source
> +# code line.
> +gdb_test "reverse-finish" ".*funp \\(a, b\\);.*" \
> + "reverse-finish function1 GEP call, from function body "
> +gdb_test "reverse-next" ".*funp \\(a, b\\);.*" \
> + "reverse next 1 GEP call from function body"
> +gdb_test "reverse-next" ".*b = 50;.*" \
> + "reverse next 2 at b = 50 from function body"
> diff --git a/gdb/testsuite/gdb.reverse/step-indirect-call-thunk.exp
> b/gdb/testsuite/gdb.reverse/step-indirect-call-thunk.exp
> index 94292d5eb9b..61fb4974b8e 100644
> --- a/gdb/testsuite/gdb.reverse/step-indirect-call-thunk.exp
> +++ b/gdb/testsuite/gdb.reverse/step-indirect-call-thunk.exp
> @@ -17,6 +17,12 @@ require supports_reverse
>
> standard_testfile
>
> +if { [istarget "powerpc*-*-linux*"] } {
> + # GCC for PowerPC on linux does not support the -mindirect-
> branch and
> + # -mfunction-return command line options.
> + return 0
> +}
> +
> set cflags {}
> lappend cflags debug
> lappend cflags additional_flags=-mindirect-branch=thunk
> @@ -36,39 +42,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"
>
> @@ -88,20 +61,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/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
> index faa0ac05a9a..b10555fe5fb 100644
> --- a/gdb/testsuite/lib/gdb.exp
> +++ b/gdb/testsuite/lib/gdb.exp
> @@ -9267,31 +9267,58 @@ gdb_caching_proc arm_cc_for_target {
>
> # Step until the pattern REGEXP is found. Step at most
> # MAX_STEPS times, but stop stepping once REGEXP is found.
> -#
> +# START matches current location
> # If REGEXP is found then a single pass is emitted, otherwise, after
> # MAX_STEPS steps, a single fail is emitted.
> #
> # TEST_NAME is the name used in the pass/fail calls.
>
> -proc gdb_step_until { regexp {test_name ""} {max_steps 10} } {
> +proc gdb_step_until { regexp {test_name ""} {current ""} \
> + { max_steps 10 } } {
> + if { $current == "" } {
> + set current "\}"
> + }
> + if { $test_name == "" } {
> + set test_name "stepping until regexp"
> + }
> +
> + repeat_cmd_until "step" $current $regexp $test_name "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
> +# MAX_STEPS is number of steps attempted before fail is emitted
> +#
> +# 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_name {max_steps
> 100} } {
> + global gdb_prompt
> if { $test_name == "" } {
> set test_name "stepping until regexp"
> }
>
> set count 0
> - gdb_test_multiple "step" "$test_name" {
> - -re "$regexp\r\n$::gdb_prompt $" {
> - pass $test_name
> - }
> - -re ".*$::gdb_prompt $" {
> - if {$count < $max_steps} {
> - incr count
> - send_gdb "step\n"
> + gdb_test_multiple "$command" "$test_name" {
> + -re "$current.*$gdb_prompt $" {
> + incr count
> + if { $count < $max_steps } {
> + send_gdb "$command\n"
> exp_continue
> } else {
> - fail $test_name
> + fail "$test_name"
> }
> }
> + -re "$target.*$gdb_prompt $" {
> + pass "$test_name"
> + }
> }
> }
>
next prev parent reply other threads:[~2023-02-27 16:09 UTC|newest]
Thread overview: 105+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <f594ec0070a6c585e83a6d6c8b29481a86778c0f.camel@us.ibm.com>
[not found] ` <bc6bb459f153c0c5850d4a3e5d80bbf957ec36cc.camel@de.ibm.com>
[not found] ` <8bce850fa1e03e798506dc170d9b57f52034a18a.camel@us.ibm.com>
[not found] ` <cb5875db4e1ac60475877c685e5f172770314523.camel@de.ibm.com>
[not found] ` <adeeeae47c4ca79b32d79aea632ff8b2a24dd93d.camel@us.ibm.com>
[not found] ` <86c5e9c47945894f21b1d8bf6089c730a9f0e1a5.camel@de.ibm.com>
[not found] ` <b1d7ea600d6bb7af487968d938566fae9d5e1745.camel@us.ibm.com>
[not found] ` <5f9047b9582403561d7cce998cab9184167366a1.camel@de.ibm.com>
[not found] ` <e7c8093c350ad475277154014a4f0bb9b472b7af.camel@us.ibm.com>
[not found] ` <f8d6379aff7af076d9edcee7d2981d052b2161ee.camel@de.ibm.com>
[not found] ` <5b50668cbe882c57b8c0e9dcf5be0a253713c4c6.camel@us.ibm.com>
[not found] ` <51c4bfc82ac72e475e10577dc60e4d75fa48767e.camel@de.ibm.com>
[not found] ` <3ea97a8aa9cccb39299adde682f92055d1986ab3.camel@us.ibm.com>
[not found] ` <f5ea8da12631f2496ba0e2263e65a0adc7ac56ca.camel@de.ibm.com>
[not found] ` <53878e37c6e57de1d04d9c9960c5d0a74324ee6e.camel@us.ibm.com>
[not found] ` <a5300b64533fdc753c1d50fa0e6efc21b5457547.camel@de.ibm.com>
[not found] ` <50474aa92ba82eff05cdc8f49001eae56be29670.camel@us.ibm.com>
[not found] ` <f3ef4486c4ba051024602928acdfe5ddf6942b82.camel@de.ibm.com>
[not found] ` <dae6c9790b23a90d5f1494f5b6798346444f257e.camel@us.ibm.com>
[not found] ` <89331c26795e3f7743e1e068dce43b3c2dd53008.camel@us.ibm.com>
[not found] ` <c10a008e441666e4edb0916842d8eefe83f5b2f9.camel@de.ibm.com>
[not found] ` <071f24ecf9b3a2bbbe8fee7db77492eb55c5f3ff.camel@us.ibm.com>
[not found] ` <1d9b21914354bef6a290ac30673741e722e11757.camel@de.ibm.com>
2023-01-11 18:27 ` [PATCH 0/2] " Carl Love
2023-01-11 18:27 ` [PATCH 1/2] " Carl Love
2023-01-12 16:56 ` Tom de Vries
2023-01-12 18:54 ` Carl Love
2023-01-13 13:33 ` Bruno Larsen
2023-01-13 16:43 ` Carl Love
2023-01-13 17:04 ` Bruno Larsen
2023-01-13 19:10 ` Carl Love
2023-01-14 18:08 ` Carl Love
2023-01-16 12:31 ` Bruno Larsen
2023-01-16 16:37 ` [PATCH 0/2 version 2] " Carl Love
2023-01-16 16:37 ` [PATCH 1/2 " Carl Love
2023-01-17 12:35 ` Bruno Larsen
2023-01-20 0:03 ` [PATCH 1/2 version 3] " Carl Love
2023-01-23 19:17 ` Pedro Alves
2023-01-23 21:13 ` Carl Love
2023-01-24 14:08 ` Pedro Alves
2023-01-24 14:23 ` Bruno Larsen
2023-01-24 15:06 ` Pedro Alves
2023-01-24 16:04 ` Bruno Larsen
2023-01-24 19:12 ` Pedro Alves
2023-01-25 9:49 ` Bruno Larsen
2023-01-25 14:11 ` Ulrich Weigand
2023-01-25 16:42 ` Pedro Alves
2023-01-25 17:13 ` Ulrich Weigand
2023-01-25 17:24 ` Pedro Alves
2023-01-25 19:38 ` Carl Love
2023-01-24 15:51 ` Carl Love
2023-01-24 18:37 ` Pedro Alves
2023-01-24 18:25 ` Carl Love
2023-01-24 19:21 ` Pedro Alves
2023-01-24 19:26 ` Pedro Alves
2023-01-31 0:17 ` Reverse-next bug test case Carl Love
2023-02-01 14:37 ` Pedro Alves
2023-02-01 18:40 ` Carl Love
2023-01-24 15:53 ` [PATCH 1/2 version 3] fix for gdb.reverse/finish-precsave.exp and gdb.reverse/finish-reverse.exp Tom de Vries
2023-01-24 18:48 ` Pedro Alves
2023-01-16 16:37 ` [PATCH 2/2 version 2] " Carl Love
2023-01-17 14:29 ` Bruno Larsen
2023-01-17 16:36 ` Carl Love
2023-01-17 16:55 ` Tom de Vries
2023-01-17 17:03 ` Carl Love
2023-01-17 17:14 ` Tom de Vries
2023-01-17 19:31 ` Carl Love
2023-01-18 10:55 ` Tom de Vries
2023-01-18 16:16 ` Carl Love
2023-01-18 22:26 ` Carl Love
2023-01-19 8:04 ` Bruno Larsen
2023-01-19 16:56 ` Carl Love
2023-01-19 23:57 ` Carl Love
2023-01-20 20:04 ` Carl Love
2023-01-23 16:42 ` [PATCH 1/2 version 3] " Carl Love
2023-01-23 16:42 ` [PATCH 2/2 " Carl Love
2023-02-10 20:55 ` [PATCH ] PowerPC: " Carl Love
2023-02-17 12:24 ` Ulrich Weigand
2023-02-20 16:34 ` Carl Love
2023-02-20 16:48 ` Bruno Larsen
2023-02-20 20:24 ` Carl Love
2023-02-27 16:09 ` Carl Love [this message]
2023-02-28 13:39 ` Bruno Larsen
2023-02-28 16:19 ` Carl Love
2023-03-01 13:43 ` Tom de Vries
2023-03-01 16:26 ` Carl Love
2023-03-01 14:03 ` Tom de Vries
2023-03-01 16:43 ` Carl Love
2023-03-01 14:34 ` Tom de Vries
2023-03-01 20:39 ` Carl Love
2023-03-01 20:59 ` [PATCH 0/2 " Carl Love
2023-03-01 20:59 ` [PATCH 1/2] " Carl Love
2023-03-03 11:56 ` Bruno Larsen
2023-03-08 16:19 ` [PING] " Carl Love
2023-03-09 16:09 ` Carl Love
2023-03-09 19:03 ` Tom Tromey
2023-03-09 21:42 ` Carl Love
2023-03-09 21:54 ` [PATCH 1/2 ver 2] " Carl Love
2023-03-10 3:53 ` Tom Tromey
2023-03-01 20:59 ` [PATCH 2/2 ] " Carl Love
2023-03-08 16:19 ` [PING] " Carl Love
2023-03-09 16:09 ` Carl Love
2023-03-13 14:16 ` Ulrich Weigand
2023-03-13 17:31 ` Carl Love
2023-03-13 17:38 ` [PATCH 2/2 ver2] " Carl Love
2023-03-17 17:19 ` Ulrich Weigand
2023-03-17 23:05 ` Tom de Vries
2023-03-20 15:04 ` Carl Love
2023-03-20 23:21 ` Carl Love
2023-03-21 3:17 ` Carl Love
2023-03-21 6:52 ` Ulrich Weigand
2023-03-24 17:23 ` [PATCH 2/2 ] " Simon Marchi
2023-03-24 22:16 ` Carl Love
2023-03-25 12:39 ` Simon Marchi
2023-03-27 23:59 ` Carl Love
2023-03-28 1:19 ` Simon Marchi
2023-03-28 15:17 ` Carl Love
2023-03-28 15:38 ` Simon Marchi
2023-07-20 12:01 ` Bruno Larsen
2023-07-20 14:45 ` Carl Love
2023-07-21 7:24 ` Bruno Larsen
2023-07-31 22:59 ` Carl Love
2023-08-02 9:29 ` Bruno Larsen
2023-08-02 15:11 ` Carl Love
2023-01-13 15:42 ` [PATCH 1/2] " Bruno Larsen
2023-01-11 18:27 ` [PATCH 2/2] " Carl Love
2023-01-13 15:55 ` Bruno Larsen
2023-01-14 18:08 ` Carl Love
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=304e2d8b461d5540f79af1c87d288ba8551efbde.camel@us.ibm.com \
--to=cel@us.ibm.com \
--cc=Ulrich.Weigand@de.ibm.com \
--cc=blarsen@redhat.com \
--cc=gdb-patches@sourceware.org \
--cc=pedro@palves.net \
--cc=tdevries@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).