1999-09-22 11:28:34 +08:00
|
|
|
/* List lines of source files for GDB, the GNU debugger.
|
2020-01-01 14:20:01 +08:00
|
|
|
Copyright (C) 1999-2020 Free Software Foundation, Inc.
|
1999-09-22 11:28:34 +08:00
|
|
|
|
|
|
|
This file is part of GDB.
|
|
|
|
|
|
|
|
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
|
2007-08-24 02:08:50 +08:00
|
|
|
the Free Software Foundation; either version 3 of the License, or
|
1999-09-22 11:28:34 +08:00
|
|
|
(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
|
2007-08-24 02:08:50 +08:00
|
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
1999-09-22 11:28:34 +08:00
|
|
|
|
|
|
|
#ifndef SOURCE_H
|
|
|
|
#define SOURCE_H
|
|
|
|
|
Rename common to gdbsupport
This is the next patch in the ongoing series to move gdbsever to the
top level.
This patch just renames the "common" directory. The idea is to do
this move in two parts: first rename the directory (this patch), then
move the directory to the top. This approach makes the patches a bit
more tractable.
I chose the name "gdbsupport" for the directory. However, as this
patch was largely written by sed, we could pick a new name without too
much difficulty.
Tested by the buildbot.
gdb/ChangeLog
2019-07-09 Tom Tromey <tom@tromey.com>
* contrib/ari/gdb_ari.sh: Change common to gdbsupport.
* configure: Rebuild.
* configure.ac: Change common to gdbsupport.
* gdbsupport: Rename from common.
* acinclude.m4: Change common to gdbsupport.
* Makefile.in (CONFIG_SRC_SUBDIR, COMMON_SFILES)
(HFILES_NO_SRCDIR, stamp-version, ALLDEPFILES): Change common to
gdbsupport.
* aarch64-tdep.c, ada-lang.c, ada-lang.h, agent.c, alloc.c,
amd64-darwin-tdep.c, amd64-dicos-tdep.c, amd64-fbsd-nat.c,
amd64-fbsd-tdep.c, amd64-linux-nat.c, amd64-linux-tdep.c,
amd64-nbsd-tdep.c, amd64-obsd-tdep.c, amd64-sol2-tdep.c,
amd64-tdep.c, amd64-windows-tdep.c, arch-utils.c,
arch/aarch64-insn.c, arch/aarch64.c, arch/aarch64.h, arch/amd64.c,
arch/amd64.h, arch/arm-get-next-pcs.c, arch/arm-linux.c,
arch/arm.c, arch/i386.c, arch/i386.h, arch/ppc-linux-common.c,
arch/riscv.c, arch/riscv.h, arch/tic6x.c, arm-tdep.c, auto-load.c,
auxv.c, ax-gdb.c, ax-general.c, ax.h, breakpoint.c, breakpoint.h,
btrace.c, btrace.h, build-id.c, build-id.h, c-lang.h, charset.c,
charset.h, cli/cli-cmds.c, cli/cli-cmds.h, cli/cli-decode.c,
cli/cli-dump.c, cli/cli-option.h, cli/cli-script.c,
coff-pe-read.c, command.h, compile/compile-c-support.c,
compile/compile-c.h, compile/compile-cplus-symbols.c,
compile/compile-cplus-types.c, compile/compile-cplus.h,
compile/compile-loc2c.c, compile/compile.c, completer.c,
completer.h, contrib/ari/gdb_ari.sh, corefile.c, corelow.c,
cp-support.c, cp-support.h, cp-valprint.c, csky-tdep.c, ctf.c,
darwin-nat.c, debug.c, defs.h, disasm-selftests.c, disasm.c,
disasm.h, dtrace-probe.c, dwarf-index-cache.c,
dwarf-index-cache.h, dwarf-index-write.c, dwarf2-frame.c,
dwarf2expr.c, dwarf2loc.c, dwarf2read.c, event-loop.c,
event-top.c, exceptions.c, exec.c, extension.h, fbsd-nat.c,
features/aarch64-core.c, features/aarch64-fpu.c,
features/aarch64-pauth.c, features/aarch64-sve.c,
features/i386/32bit-avx.c, features/i386/32bit-avx512.c,
features/i386/32bit-core.c, features/i386/32bit-linux.c,
features/i386/32bit-mpx.c, features/i386/32bit-pkeys.c,
features/i386/32bit-segments.c, features/i386/32bit-sse.c,
features/i386/64bit-avx.c, features/i386/64bit-avx512.c,
features/i386/64bit-core.c, features/i386/64bit-linux.c,
features/i386/64bit-mpx.c, features/i386/64bit-pkeys.c,
features/i386/64bit-segments.c, features/i386/64bit-sse.c,
features/i386/x32-core.c, features/riscv/32bit-cpu.c,
features/riscv/32bit-csr.c, features/riscv/32bit-fpu.c,
features/riscv/64bit-cpu.c, features/riscv/64bit-csr.c,
features/riscv/64bit-fpu.c, features/tic6x-c6xp.c,
features/tic6x-core.c, features/tic6x-gp.c, filename-seen-cache.h,
findcmd.c, findvar.c, fork-child.c, gcore.c, gdb_bfd.c, gdb_bfd.h,
gdb_proc_service.h, gdb_regex.c, gdb_select.h, gdb_usleep.c,
gdbarch-selftests.c, gdbthread.h, gdbtypes.h, gnu-nat.c,
go32-nat.c, guile/guile.c, guile/scm-ports.c,
guile/scm-safe-call.c, guile/scm-type.c, i386-fbsd-nat.c,
i386-fbsd-tdep.c, i386-go32-tdep.c, i386-linux-nat.c,
i386-linux-tdep.c, i386-tdep.c, i387-tdep.c,
ia64-libunwind-tdep.c, ia64-linux-nat.c, inf-child.c,
inf-ptrace.c, infcall.c, infcall.h, infcmd.c, inferior-iter.h,
inferior.c, inferior.h, inflow.c, inflow.h, infrun.c, infrun.h,
inline-frame.c, language.h, linespec.c, linux-fork.c, linux-nat.c,
linux-tdep.c, linux-thread-db.c, location.c, machoread.c,
macrotab.h, main.c, maint.c, maint.h, memattr.c, memrange.h,
mi/mi-cmd-break.h, mi/mi-cmd-env.c, mi/mi-cmd-stack.c,
mi/mi-cmd-var.c, mi/mi-interp.c, mi/mi-main.c, mi/mi-parse.h,
minsyms.c, mips-linux-tdep.c, namespace.h,
nat/aarch64-linux-hw-point.c, nat/aarch64-linux-hw-point.h,
nat/aarch64-linux.c, nat/aarch64-sve-linux-ptrace.c,
nat/amd64-linux-siginfo.c, nat/fork-inferior.c,
nat/linux-btrace.c, nat/linux-btrace.h, nat/linux-namespaces.c,
nat/linux-nat.h, nat/linux-osdata.c, nat/linux-personality.c,
nat/linux-procfs.c, nat/linux-ptrace.c, nat/linux-ptrace.h,
nat/linux-waitpid.c, nat/mips-linux-watch.c,
nat/mips-linux-watch.h, nat/ppc-linux.c, nat/x86-dregs.c,
nat/x86-dregs.h, nat/x86-linux-dregs.c, nat/x86-linux.c,
nto-procfs.c, nto-tdep.c, objfile-flags.h, objfiles.c, objfiles.h,
obsd-nat.c, observable.h, osdata.c, p-valprint.c, parse.c,
parser-defs.h, ppc-linux-nat.c, printcmd.c, probe.c, proc-api.c,
procfs.c, producer.c, progspace.h, psymtab.h,
python/py-framefilter.c, python/py-inferior.c, python/py-ref.h,
python/py-type.c, python/python.c, record-btrace.c, record-full.c,
record.c, record.h, regcache-dump.c, regcache.c, regcache.h,
remote-fileio.c, remote-fileio.h, remote-sim.c, remote.c,
riscv-tdep.c, rs6000-aix-tdep.c, rust-exp.y, s12z-tdep.c,
selftest-arch.c, ser-base.c, ser-event.c, ser-pipe.c, ser-tcp.c,
ser-unix.c, skip.c, solib-aix.c, solib-target.c, solib.c,
source-cache.c, source.c, source.h, sparc-nat.c, spu-linux-nat.c,
stack.c, stap-probe.c, symfile-add-flags.h, symfile.c, symfile.h,
symtab.c, symtab.h, target-descriptions.c, target-descriptions.h,
target-memory.c, target.c, target.h, target/waitstatus.c,
target/waitstatus.h, thread-iter.h, thread.c, tilegx-tdep.c,
top.c, top.h, tracefile-tfile.c, tracefile.c, tracepoint.c,
tracepoint.h, tui/tui-io.c, ui-file.c, ui-out.h,
unittests/array-view-selftests.c,
unittests/child-path-selftests.c, unittests/cli-utils-selftests.c,
unittests/common-utils-selftests.c,
unittests/copy_bitwise-selftests.c, unittests/environ-selftests.c,
unittests/format_pieces-selftests.c,
unittests/function-view-selftests.c,
unittests/lookup_name_info-selftests.c,
unittests/memory-map-selftests.c, unittests/memrange-selftests.c,
unittests/mkdir-recursive-selftests.c,
unittests/observable-selftests.c,
unittests/offset-type-selftests.c, unittests/optional-selftests.c,
unittests/parse-connection-spec-selftests.c,
unittests/ptid-selftests.c, unittests/rsp-low-selftests.c,
unittests/scoped_fd-selftests.c,
unittests/scoped_mmap-selftests.c,
unittests/scoped_restore-selftests.c,
unittests/string_view-selftests.c, unittests/style-selftests.c,
unittests/tracepoint-selftests.c, unittests/unpack-selftests.c,
unittests/utils-selftests.c, unittests/xml-utils-selftests.c,
utils.c, utils.h, valarith.c, valops.c, valprint.c, value.c,
value.h, varobj.c, varobj.h, windows-nat.c, x86-linux-nat.c,
xml-support.c, xml-support.h, xml-tdesc.h, xstormy16-tdep.c,
xtensa-linux-nat.c, dwarf2read.h: Change common to gdbsupport.
gdb/gdbserver/ChangeLog
2019-07-09 Tom Tromey <tom@tromey.com>
* configure: Rebuild.
* configure.ac: Change common to gdbsupport.
* acinclude.m4: Change common to gdbsupport.
* Makefile.in (SFILES, OBS, GDBREPLAY_OBS, IPA_OBJS)
(version-generated.c, gdbsupport/%-ipa.o, gdbsupport/%.o): Change
common to gdbsupport.
* ax.c, event-loop.c, fork-child.c, gdb_proc_service.h,
gdbreplay.c, gdbthread.h, hostio-errno.c, hostio.c, i387-fp.c,
inferiors.c, inferiors.h, linux-aarch64-tdesc-selftest.c,
linux-amd64-ipa.c, linux-i386-ipa.c, linux-low.c,
linux-tic6x-low.c, linux-x86-low.c, linux-x86-tdesc-selftest.c,
linux-x86-tdesc.c, lynx-i386-low.c, lynx-low.c, mem-break.h,
nto-x86-low.c, regcache.c, regcache.h, remote-utils.c, server.c,
server.h, spu-low.c, symbol.c, target.h, tdesc.c, tdesc.h,
thread-db.c, tracepoint.c, win32-i386-low.c, win32-low.c: Change
common to gdbsupport.
2019-05-06 10:29:24 +08:00
|
|
|
#include "gdbsupport/scoped_fd.h"
|
2018-10-28 02:23:44 +08:00
|
|
|
|
2003-04-12 Andrew Cagney <cagney@redhat.com>
* gdbarch.sh: Add missing opaque declarations.
* gdbarch.h: Regnerate.
* symtab.h: Add missing opaque declarations.
* value.h, target.h, symfile.h, stabsread.h: Ditto.
* x86-64-tdep.h, xmodem.h, monitor.h, typeprint.h: Ditto.
* srec.h, solib-svr4.h, source.h, inferior.h: Ditto.
* ser-unix.h, serial.h, remote-utils.h, gdbcore.h: Ditto.
* ppc-tdep.h, ocd.h, mips-tdep.h, gdbtypes.h: Ditto.
* buildsym.h, builtin-regs.h, linespec.h, language.h: Ditto.
* i387-tdep.h, gdbthread.h, event-top.h, gdb.h: Ditto.
* dwarf2cfi.h, doublest.h, disasm.h, cp-abi.h: Ditto.
* cli-out.h, c-lang.h, ax-gdb.h, arch-utils.h: Ditto.
* ada-lang.h, config/nm-lynx.h, config/nm-linux.h: Ditto.
* config/sparc/tm-sp64.h, config/rs6000/tm-rs6000.h: Ditto.
* config/pa/tm-hppah.h, config/m68k/tm-delta68.h: Ditto.
* cli/cli-setshow.h, cli/cli-script.h: Ditto.
2003-04-13 01:41:26 +08:00
|
|
|
struct symtab;
|
|
|
|
|
Move some declarations to source.h
I noticed a few declarations in defs.h that really could be put into
source.h. I think it's generally preferable to something out of
defs.h unless it is needed by most of the files in gdb.
gdb/ChangeLog
2018-02-14 Tom Tromey <tom@tromey.com>
* solib.c: Include source.h.
* nto-tdep.c: Include source.h.
* mi/mi-cmd-env.c: Include source.h.
* infcmd.c: Include source.h.
* exec.c: Include source.h.
* defs.h (enum openp_flag, openp, source_full_path_of, mod_path)
(add_path, directory_switch, source_path, init_source_path): Move
declarations...
* source.h (enum openp_flag, openp, source_full_path_of, mod_path)
(add_path, directory_switch, source_path, init_source_path):
...here.
2017-11-11 04:21:10 +08:00
|
|
|
/* See openp function definition for their description. */
|
|
|
|
|
|
|
|
enum openp_flag
|
|
|
|
{
|
|
|
|
OPF_TRY_CWD_FIRST = 0x01,
|
|
|
|
OPF_SEARCH_IN_PATH = 0x02,
|
|
|
|
OPF_RETURN_REALPATH = 0x04,
|
|
|
|
};
|
|
|
|
|
|
|
|
DEF_ENUM_FLAGS_TYPE(openp_flag, openp_flags);
|
|
|
|
|
Change openp et al to use a unique_xmalloc_ptr
This changes openp, source_full_path_of, and find_and_open_source to
take a unique_xmalloc_ptr, rather than a char*, as an outgoing
argument type. This simplifies the API, ownership-wise, and allows
for the removal of some cleanups.
gdb/ChangeLog
2018-02-14 Tom Tromey <tom@tromey.com>
* symfile.c (symfile_bfd_open): Update.
* source.h (openp, source_full_path_of, find_and_open_source):
Change argument type to unique_xmalloc_ptr.
* source.c (openp): Take a unique_xmalloc_ptr.
(source_full_path_of, find_and_open_source): Likewise.
(open_source_file, symtab_to_fullname): Update.
* solist.h (struct target_so_ops) <find_and_open_solib>: Take a
unique_xmalloc_ptr.
* solib.c (solib_find_1): Use unique_xmalloc_ptr.
(exec_file_find): Update.
* psymtab.c (psymtab_to_fullname): Update.
* nto-tdep.h (nto_find_and_open_solib): Update.
* nto-tdep.c (nto_find_and_open_solib): Change temp_path to a
unique_xmalloc_ptr.
* exec.c (exec_file_attach): Update.
* dwarf2read.c (try_open_dwop_file): Use unique_xmalloc_ptr.
* cli/cli-cmds.c (find_and_open_script): Use unique_xmalloc_ptr.
2017-11-11 04:47:05 +08:00
|
|
|
extern int openp (const char *, openp_flags, const char *, int,
|
|
|
|
gdb::unique_xmalloc_ptr<char> *);
|
Move some declarations to source.h
I noticed a few declarations in defs.h that really could be put into
source.h. I think it's generally preferable to something out of
defs.h unless it is needed by most of the files in gdb.
gdb/ChangeLog
2018-02-14 Tom Tromey <tom@tromey.com>
* solib.c: Include source.h.
* nto-tdep.c: Include source.h.
* mi/mi-cmd-env.c: Include source.h.
* infcmd.c: Include source.h.
* exec.c: Include source.h.
* defs.h (enum openp_flag, openp, source_full_path_of, mod_path)
(add_path, directory_switch, source_path, init_source_path): Move
declarations...
* source.h (enum openp_flag, openp, source_full_path_of, mod_path)
(add_path, directory_switch, source_path, init_source_path):
...here.
2017-11-11 04:21:10 +08:00
|
|
|
|
Change openp et al to use a unique_xmalloc_ptr
This changes openp, source_full_path_of, and find_and_open_source to
take a unique_xmalloc_ptr, rather than a char*, as an outgoing
argument type. This simplifies the API, ownership-wise, and allows
for the removal of some cleanups.
gdb/ChangeLog
2018-02-14 Tom Tromey <tom@tromey.com>
* symfile.c (symfile_bfd_open): Update.
* source.h (openp, source_full_path_of, find_and_open_source):
Change argument type to unique_xmalloc_ptr.
* source.c (openp): Take a unique_xmalloc_ptr.
(source_full_path_of, find_and_open_source): Likewise.
(open_source_file, symtab_to_fullname): Update.
* solist.h (struct target_so_ops) <find_and_open_solib>: Take a
unique_xmalloc_ptr.
* solib.c (solib_find_1): Use unique_xmalloc_ptr.
(exec_file_find): Update.
* psymtab.c (psymtab_to_fullname): Update.
* nto-tdep.h (nto_find_and_open_solib): Update.
* nto-tdep.c (nto_find_and_open_solib): Change temp_path to a
unique_xmalloc_ptr.
* exec.c (exec_file_attach): Update.
* dwarf2read.c (try_open_dwop_file): Use unique_xmalloc_ptr.
* cli/cli-cmds.c (find_and_open_script): Use unique_xmalloc_ptr.
2017-11-11 04:47:05 +08:00
|
|
|
extern int source_full_path_of (const char *, gdb::unique_xmalloc_ptr<char> *);
|
Move some declarations to source.h
I noticed a few declarations in defs.h that really could be put into
source.h. I think it's generally preferable to something out of
defs.h unless it is needed by most of the files in gdb.
gdb/ChangeLog
2018-02-14 Tom Tromey <tom@tromey.com>
* solib.c: Include source.h.
* nto-tdep.c: Include source.h.
* mi/mi-cmd-env.c: Include source.h.
* infcmd.c: Include source.h.
* exec.c: Include source.h.
* defs.h (enum openp_flag, openp, source_full_path_of, mod_path)
(add_path, directory_switch, source_path, init_source_path): Move
declarations...
* source.h (enum openp_flag, openp, source_full_path_of, mod_path)
(add_path, directory_switch, source_path, init_source_path):
...here.
2017-11-11 04:21:10 +08:00
|
|
|
|
|
|
|
extern void mod_path (const char *, char **);
|
|
|
|
|
|
|
|
extern void add_path (const char *, char **, int);
|
|
|
|
|
|
|
|
extern void directory_switch (const char *, int);
|
|
|
|
|
|
|
|
extern char *source_path;
|
|
|
|
|
|
|
|
extern void init_source_path (void);
|
|
|
|
|
2012-03-02 05:09:16 +08:00
|
|
|
/* This function is capable of finding the absolute path to a
|
|
|
|
source file, and opening it, provided you give it a FILENAME. Both the
|
|
|
|
DIRNAME and FULLNAME are only added suggestions on where to find the file.
|
|
|
|
|
|
|
|
FILENAME should be the filename to open.
|
|
|
|
DIRNAME is the compilation directory of a particular source file.
|
|
|
|
Only some debug formats provide this info.
|
|
|
|
FULLNAME can be the last known absolute path to the file in question.
|
|
|
|
Space for the path must have been malloc'd. If a path substitution
|
|
|
|
is applied we free the old value and set a new one.
|
|
|
|
|
|
|
|
On Success
|
|
|
|
A valid file descriptor is returned (the return value is positive).
|
|
|
|
FULLNAME is set to the absolute path to the file just opened.
|
|
|
|
The caller is responsible for freeing FULLNAME.
|
|
|
|
|
|
|
|
On Failure
|
|
|
|
An invalid file descriptor is returned (the return value is negative).
|
|
|
|
FULLNAME is set to NULL. */
|
2018-10-28 02:23:44 +08:00
|
|
|
extern scoped_fd find_and_open_source (const char *filename,
|
|
|
|
const char *dirname,
|
|
|
|
gdb::unique_xmalloc_ptr<char> *fullname);
|
2012-03-02 05:09:16 +08:00
|
|
|
|
1999-09-22 11:28:34 +08:00
|
|
|
/* Open a source file given a symtab S. Returns a file descriptor or
|
|
|
|
negative number for error. */
|
2018-10-28 02:23:44 +08:00
|
|
|
extern scoped_fd open_source_file (struct symtab *s);
|
1999-09-22 11:28:34 +08:00
|
|
|
|
2017-08-06 00:29:56 +08:00
|
|
|
extern gdb::unique_xmalloc_ptr<char> rewrite_source_path (const char *path);
|
2013-02-04 00:20:20 +08:00
|
|
|
|
2012-10-19 04:14:45 +08:00
|
|
|
extern const char *symtab_to_fullname (struct symtab *s);
|
2004-06-11 04:05:45 +08:00
|
|
|
|
2013-02-04 00:09:33 +08:00
|
|
|
/* Returns filename without the compile directory part, basename or absolute
|
|
|
|
filename. It depends on 'set filename-display' value. */
|
|
|
|
extern const char *symtab_to_filename_for_display (struct symtab *symtab);
|
|
|
|
|
PR gdb/13860: make -interpreter-exec console "list" behave more like "list".
I noticed that "list" behaves differently in CLI vs MI. Particularly:
$ ./gdb -nx -q ./testsuite/gdb.mi/mi-cli
Reading symbols from /home/pedro/gdb/mygit/build/gdb/testsuite/gdb.mi/mi-cli...done.
(gdb) start
Temporary breakpoint 1 at 0x40054d: file ../../../src/gdb/testsuite/gdb.mi/basics.c, line 62.
Starting program: /home/pedro/gdb/mygit/build/gdb/testsuite/gdb.mi/mi-cli
Temporary breakpoint 1, main () at ../../../src/gdb/testsuite/gdb.mi/basics.c:62
62 callee1 (2, "A string argument.", 3.5);
(gdb) list
57 {
58 }
59
60 main ()
61 {
62 callee1 (2, "A string argument.", 3.5);
63 callee1 (2, "A string argument.", 3.5);
64
65 do_nothing (); /* Hello, World! */
66
(gdb)
Note the list started at line 57. IOW, the program stopped at line
62, and GDB centered the list on that.
compare with:
$ ./gdb -nx -q ./testsuite/gdb.mi/mi-cli -i=mi
=thread-group-added,id="i1"
~"Reading symbols from /home/pedro/gdb/mygit/build/gdb/testsuite/gdb.mi/mi-cli..."
~"done.\n"
(gdb)
start
&"start\n"
...
~"\nTemporary breakpoint "
~"1, main () at ../../../src/gdb/testsuite/gdb.mi/basics.c:62\n"
~"62\t callee1 (2, \"A string argument.\", 3.5);\n"
*stopped,reason="breakpoint-hit",disp="del",bkptno="1",frame={addr="0x000000000040054d",func="main",args=[],file="../../../src/gdb/testsuite/gdb.mi/basics.c",fullname="/home/pedro/gdb/mygit/src/gdb/testsuite/gdb.mi/basics.c",line="62"},thread-id="1",stopped-threads="all",core="0"
=breakpoint-deleted,id="1"
(gdb)
-interpreter-exec console list
~"62\t callee1 (2, \"A string argument.\", 3.5);\n"
~"63\t callee1 (2, \"A string argument.\", 3.5);\n"
~"64\t\n"
~"65\t do_nothing (); /* Hello, World! */\n"
~"66\t\n"
~"67\t callme (1);\n"
~"68\t callme (2);\n"
~"69\t\n"
~"70\t return 0;\n"
~"71\t}\n"
^done
(gdb)
Here the list starts at line 62, where the program was stopped.
This happens because print_stack_frame, called from both normal_stop
and mi_on_normal_stop, is the function responsible for setting the
current sal from the selected frame, overrides the PRINT_WHAT
argument, and only after that does it decide whether to center the
current sal line or not, based on the overridden value, and it will
always decide false.
(The print_stack_frame call in mi_on_normal_stop is a little different
from the call in normal_stop, in that it is an unconditional
SRC_AND_LOC call. A future patch will make those uniform.)
A previous version of this patch made MI uniform with CLI here, by
making print_stack_frame also center when MI is active. That changed
the output of a "list" command in mi-cli.exp, to expect line 57
instead of 62, as per the example above.
However, looking deeper, that list in question is the first "list"
after the program stops, and right after the stop, before the "list",
the test did "set listsize 1". Let's try the same thing with the CLI:
(gdb) start
62 callee1 (2, "A string argument.", 3.5);
(gdb) set listsize 1
(gdb) list
57 {
Huh, that's unexpected. Why the 57? It's because print_stack_frame,
called in reaction to the breakpoint stop, expecting the next "list"
to show 10 lines (the listsize at the time) around line 62, sets the
lines listed range to 57-67 (62 +/- 5). If the user changes the
listsize before "list", why would we still show that range? Looks
bogus to me.
So the fix for this whole issue should be delay trying to center the
listing to until actually listing, so that the correct listsize can be
taken into account. This makes MI and CLI uniform too, as it deletes
the center code from print_stack_frame.
A series of tests are added to list.exp to cover this. mi-cli.exp was
after all correct all along, but it now gains an additional test that
lists lines with listsize 10, to ensure the centering is consistent
with CLI's.
One related Python test changed related output -- it's a test that
prints the line number after stopping for a breakpoint, similar to the
new list.exp tests. Previously we'd print the stop line minus 5 (due
to the premature centering), now we print the stop line. I think
that's a good change.
Tested on x86_64 Fedora 20.
gdb/
2014-05-21 Pedro Alves <palves@redhat.com>
* cli/cli-cmds.c (list_command): Handle the first "list" after the
current source line having changed.
* frame.h (set_current_sal_from_frame): Remove 'center' parameter.
* infrun.c (normal_stop): Adjust call to
set_current_sal_from_frame.
* source.c (clear_lines_listed_range): New function.
(set_current_source_symtab_and_line, identify_source_line): Clear
the lines listed range.
(line_info): Handle the first "info line" after the current source
line having changed.
* stack.c (print_stack_frame): Remove center handling.
(set_current_sal_from_frame): Remove 'center' parameter. Don't
center sal.line.
gdb/testsuite/
2014-05-21 Pedro Alves <palves@redhat.com>
* gdb.base/list.exp (build_pattern, test_list): New procedures.
Use them to test variations of "list" after reaching a breakpoint.
* gdb.mi/mi-cli.exp (line_main_callme_2): New global.
Test "list" with listsize 10 after reaching a breakpoint.
* gdb.python/python.exp (decode_line current location line
number): Adjust expected line number.
2014-05-22 06:15:27 +08:00
|
|
|
/* Return the first line listed by print_source_lines. Used by
|
|
|
|
command interpreters to request listing from a previous point. If
|
|
|
|
0, then no source lines have yet been listed since the last time
|
|
|
|
the current source line was changed. */
|
2002-09-20 22:58:59 +08:00
|
|
|
extern int get_first_line_listed (void);
|
|
|
|
|
|
|
|
/* Return the default number of lines to print with commands like the
|
|
|
|
cli "list". The caller of print_source_lines must use this to
|
|
|
|
calculate the end line and use it in the call to print_source_lines
|
2011-01-12 05:53:25 +08:00
|
|
|
as it does not automatically use this value. */
|
2002-09-20 22:58:59 +08:00
|
|
|
extern int get_lines_to_list (void);
|
|
|
|
|
|
|
|
/* Return the current source file for listing and next line to list.
|
2011-01-12 05:53:25 +08:00
|
|
|
NOTE: The returned sal pc and end fields are not valid. */
|
2002-09-23 06:18:41 +08:00
|
|
|
extern struct symtab_and_line get_current_source_symtab_and_line (void);
|
2002-09-20 22:58:59 +08:00
|
|
|
|
2002-09-23 06:18:41 +08:00
|
|
|
/* If the current source file for listing is not set, try and get a default.
|
|
|
|
Usually called before get_current_source_symtab_and_line() is called.
|
2002-09-20 22:58:59 +08:00
|
|
|
It may err out if a default cannot be determined.
|
2002-09-23 06:18:41 +08:00
|
|
|
We must be cautious about where it is called, as it can recurse as the
|
|
|
|
process of determining a new default may call the caller!
|
|
|
|
Use get_current_source_symtab_and_line only to get whatever
|
2011-01-12 05:53:25 +08:00
|
|
|
we have without erroring out or trying to get a default. */
|
2002-09-23 06:18:41 +08:00
|
|
|
extern void set_default_source_symtab_and_line (void);
|
2002-09-20 22:58:59 +08:00
|
|
|
|
|
|
|
/* Return the current default file for listing and next line to list
|
|
|
|
(the returned sal pc and end fields are not valid.)
|
2002-09-23 06:18:41 +08:00
|
|
|
and set the current default to whatever is in SAL.
|
2011-01-12 05:53:25 +08:00
|
|
|
NOTE: The returned sal pc and end fields are not valid. */
|
2017-09-05 00:10:13 +08:00
|
|
|
extern symtab_and_line set_current_source_symtab_and_line
|
|
|
|
(const symtab_and_line &sal);
|
2002-09-20 22:58:59 +08:00
|
|
|
|
2011-01-12 05:53:25 +08:00
|
|
|
/* Reset any information stored about a default file and line to print. */
|
2002-09-23 06:18:41 +08:00
|
|
|
extern void clear_current_source_symtab_and_line (void);
|
2009-04-21 18:13:05 +08:00
|
|
|
|
|
|
|
/* Add a source path substitution rule. */
|
|
|
|
extern void add_substitute_path_rule (char *, char *);
|
2019-01-07 17:16:16 +08:00
|
|
|
|
|
|
|
/* Flags passed as 4th argument to print_source_lines. */
|
|
|
|
enum print_source_lines_flag
|
|
|
|
{
|
|
|
|
/* Do not print an error message. */
|
|
|
|
PRINT_SOURCE_LINES_NOERROR = (1 << 0),
|
|
|
|
|
|
|
|
/* Print the filename in front of the source lines. */
|
|
|
|
PRINT_SOURCE_LINES_FILENAME = (1 << 1)
|
|
|
|
};
|
|
|
|
DEF_ENUM_FLAGS_TYPE (enum print_source_lines_flag, print_source_lines_flags);
|
|
|
|
|
|
|
|
/* Show source lines from the file of symtab S, starting with line
|
|
|
|
number LINE and stopping before line number STOPLINE. If this is
|
|
|
|
not the command line version, then the source is shown in the source
|
|
|
|
window otherwise it is simply printed. */
|
|
|
|
extern void print_source_lines (struct symtab *s, int line, int stopline,
|
|
|
|
print_source_lines_flags flags);
|
|
|
|
|
gdb: Avoid signed integer overflow when printing source lines
When printing source lines with calls to print_source_lines we need to
pass a start line number and an end line number. The end line number
is calculated by calling get_lines_to_list and adding this value to
the start line number. For example this code from list_command:
print_source_lines (cursal.symtab, first,
first + get_lines_to_list (), 0);
The problem is that get_lines_to_list returns a value based on the
GDB setting `set listsize LISTSIZE`. By default LISTSIZE is 10,
however, its also possible to set LISTSIZE to unlimited, in which
case get_lines_to_list will return INT_MAX.
As the parameter signature for print_source_lines is:
void print_source_lines (struct symtab *, int, int,
print_source_lines_flags);
and `first` in the above code is an `int`, then when LISTSIZE is
`unlimited` the above code will result in signed integer overflow,
which is undefined.
The solution in this patch is a new class source_lines_range that can
be constructed from a single line number and a direction (forward or
backward). The range is then constructed from the line number and the
value of get_lines_to_list.
gdb/ChangeLog:
* cli/cli-cmds.c (list_command): Pass a source_lines_range to
print_source_lines.
* source.c (print_source_lines_base): Update line number check.
(print_source_lines): New function.
(source_lines_range::source_lines_range): New function.
* source.h (class source_lines_range): New class.
(print_source_lines): New declaration.
2019-01-07 15:26:35 +08:00
|
|
|
/* Wrap up the logic to build a line number range for passing to
|
|
|
|
print_source_lines when using get_lines_to_list. An instance of this
|
|
|
|
class can be built from a single line number and a direction (forward or
|
|
|
|
backward) the range is then computed using get_lines_to_list. */
|
|
|
|
class source_lines_range
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
/* When constructing the range from a single line number, does the line
|
|
|
|
range extend forward, or backward. */
|
|
|
|
enum direction
|
|
|
|
{
|
|
|
|
FORWARD,
|
|
|
|
BACKWARD
|
|
|
|
};
|
|
|
|
|
|
|
|
/* Construct a SOURCE_LINES_RANGE starting at STARTLINE and extending in
|
|
|
|
direction DIR. The number of lines is from GET_LINES_TO_LIST. If the
|
|
|
|
direction is backward then the start is actually (STARTLINE -
|
|
|
|
GET_LINES_TO_LIST). There is also logic in place to ensure the start
|
|
|
|
is always 1 or more, and the end will be at most INT_MAX. */
|
|
|
|
explicit source_lines_range (int startline, direction dir = FORWARD);
|
|
|
|
|
|
|
|
/* Construct a SOURCE_LINES_RANGE from STARTLINE to STOPLINE. */
|
|
|
|
explicit source_lines_range (int startline, int stopline)
|
|
|
|
: m_startline (startline),
|
|
|
|
m_stopline (stopline)
|
|
|
|
{ /* Nothing. */ }
|
|
|
|
|
|
|
|
/* Return the line to start listing from. */
|
|
|
|
int startline () const
|
|
|
|
{ return m_startline; }
|
|
|
|
|
|
|
|
/* Return the line after the last line that should be listed. */
|
|
|
|
int stopline () const
|
|
|
|
{ return m_stopline; }
|
|
|
|
|
|
|
|
private:
|
|
|
|
|
|
|
|
/* The start and end of the range. */
|
|
|
|
int m_startline;
|
|
|
|
int m_stopline;
|
|
|
|
};
|
|
|
|
|
|
|
|
/* Variation of previous print_source_lines that takes a range instead of a
|
|
|
|
start and end line number. */
|
|
|
|
extern void print_source_lines (struct symtab *s, source_lines_range r,
|
|
|
|
print_source_lines_flags flags);
|
|
|
|
|
2019-01-07 17:16:16 +08:00
|
|
|
/* Forget line positions and file names for the symtabs in a
|
|
|
|
particular objfile. */
|
|
|
|
extern void forget_cached_source_info_for_objfile (struct objfile *);
|
|
|
|
|
|
|
|
/* Forget what we learned about line positions in source files, and
|
|
|
|
which directories contain them; must check again now since files
|
|
|
|
may be found in a different directory now. */
|
|
|
|
extern void forget_cached_source_info (void);
|
|
|
|
|
|
|
|
/* Set the source file default for the "list" command to be S.
|
|
|
|
|
|
|
|
If S is NULL, and we don't have a default, find one. This
|
|
|
|
should only be called when the user actually tries to use the
|
|
|
|
default, since we produce an error if we can't find a reasonable
|
|
|
|
default. Also, since this can cause symbols to be read, doing it
|
|
|
|
before we need to would make things slower than necessary. */
|
|
|
|
extern void select_source_symtab (struct symtab *s);
|
|
|
|
|
1999-09-22 11:28:34 +08:00
|
|
|
#endif
|