Toolchain/binutils-gdb
1
0
Fork 0
forked from Imagelibrary/binutils-gdb
Code Pull Requests Activity

[gdb] Notice when stepping into different file

Browse Source 
Consider the following test-case:
...
$ cat -n test.c
     1	int var;
     2
     3	int
     4	foo (void)
     5	{
     6	  var = 1;
     7	#include "test.h"
     8	}
     9
    10	int
    11	main ()
    12	{
    13	  return foo ();
    14	}
$ cat -n test.h
     1	  return 1;
$ gcc test.c -g
...

When stepping through the test-case, gdb doesn't make it explicit that line 1
is not in test.c:
...
Temporary breakpoint 1, main () at test.c:13
13	  return foo ();
(gdb) step
foo () at test.c:6
6	  var = 1;
(gdb) n
1	  return 1;
(gdb)
8	}
(gdb)
...
which makes it easy to misinterpret the output.

This is with the default "print frame-info" == auto, with documented
behaviour [1]:
...
stepi will switch between source-line and source-and-location depending on the
program counter.
...

What is actually implemented is that source-line is used unless stepping into
or out of a function.

The problem can be worked around by using
"set print frame-info source-and-location", but that's a bit verbose.

Instead, change the behaviour of "print frame-info" == auto to also use
source-and-location when stepping into another file, which gets us:
...
(gdb) n
foo () at test.h:1
1	  return 1;
...

Tested on x86_64-linux.

Reviewed-By: Kevin Buettner <kevinb@redhat.com>
Reviewed-By: Kévin Le Gouguec <legouguec@adacore.com>

PR gdb/32011
Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=32011

[1] https://sourceware.org/gdb/current/onlinedocs/gdb.html/Print-Settings.html#index-set-print-frame_002dinfo
This commit is contained in:
Tom de Vries
2024-08-05 14:00:42 +02:00
parent 3a83f0342e
commit b464e193d1
4 changed files with 100 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
gdb/infrun.c
View File

@@ -9296,12 +9296,24 @@ print_stop_location (const target_waitstatus &ws)
&& (tp->control.step_start_function
== find_pc_function (tp->stop_pc ())))
{
/* Finished step, just print source line. */
source_flag = SRC_LINE;
symtab_and_line sal = find_frame_sal (get_selected_frame (nullptr));
if (sal.symtab != tp->current_symtab)
{
/* Finished step in same frame but into different file, print
location and source line. */
source_flag = SRC_AND_LOC;
}
else
{
/* Finished step in same frame and same file, just print source
line. */
source_flag = SRC_LINE;
}
}
else
{
/* Print location and source line. */
/* Finished step into different frame, print location and source
line. */
source_flag = SRC_AND_LOC;
}
break;