1991-03-29 00:26:26 +08:00
|
|
|
|
/* List lines of source files for GDB, the GNU debugger.
|
1998-04-09 07:58:35 +08:00
|
|
|
|
Copyright 1986, 87, 88, 89, 91, 92, 93, 94, 95, 96, 97, 1998
|
1994-12-08 10:27:47 +08:00
|
|
|
|
Free Software Foundation, Inc.
|
1991-03-29 00:26:26 +08:00
|
|
|
|
|
|
|
|
|
This file is part of GDB.
|
|
|
|
|
|
1991-08-14 09:11:20 +09:00
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
1991-03-29 00:26:26 +08:00
|
|
|
|
it under the terms of the GNU General Public License as published by
|
1991-08-14 09:11:20 +09:00
|
|
|
|
the Free Software Foundation; either version 2 of the License, or
|
|
|
|
|
(at your option) any later version.
|
1991-03-29 00:26:26 +08:00
|
|
|
|
|
1991-08-14 09:11:20 +09:00
|
|
|
|
This program is distributed in the hope that it will be useful,
|
1991-03-29 00:26:26 +08:00
|
|
|
|
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
|
1991-08-14 09:11:20 +09:00
|
|
|
|
along with this program; if not, write to the Free Software
|
1997-06-28 14:10:06 +08:00
|
|
|
|
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
|
1991-03-29 00:26:26 +08:00
|
|
|
|
|
|
|
|
|
#include "defs.h"
|
|
|
|
|
#include "symtab.h"
|
1992-03-15 09:09:14 +08:00
|
|
|
|
#include "expression.h"
|
1991-09-19 10:40:29 +08:00
|
|
|
|
#include "language.h"
|
1991-03-29 00:26:26 +08:00
|
|
|
|
#include "command.h"
|
1991-04-19 10:38:14 +09:00
|
|
|
|
#include "gdbcmd.h"
|
1991-03-29 00:26:26 +08:00
|
|
|
|
#include "frame.h"
|
1997-06-28 14:10:06 +08:00
|
|
|
|
#include "value.h"
|
1991-03-29 00:26:26 +08:00
|
|
|
|
|
|
|
|
|
#include <sys/types.h>
|
* configure.in: Check for working mmap, ansi headers, string.h,
strings.h, and memory.h.
* configure: Regenerated.
* gdb_stat.h: New file, "portable" <sys/stat.h>.
* gdb_string.h: New file, "portable" <string.h>.
* altos-xdep.c, arm-tdep.c, arm-xdep.c, convex-tdep.c,
convex-xdep.c, coredep.c, cxux-nat.c, dbxread.c, exec.c,
gould-xdep.c, hppa-tdep.c, i386aix-nat.c, i386b-nat.c,
i386mach-nat.c, i386v-nat.c, infptrace.c, m88k-nat.c, main.c,
mdebugread.c, objfiles.c, os9kread.c, procfs.c, pyr-xdep.c,
rs6000-nat.c, source.c, standalone.c, stuff.c, sun386-nat.c,
symfile.c, symm-nat.c, symm-tdep.c, symtab.c, top.c, ultra3-nat.c,
ultra3-xdep.c, umax-xdep.c, xcoffread.c: Include "gdb_stat.h"
instead of <sys/stat.h>.
* alpha-tdep.c, breakpoint.c, buildsym.c, c-typeprint.c,
ch-typeprint.c, coffread.c, command.c, core-sol2.c, core-svr4.c,
core.c, corelow.c, cp-valprint.c, dbxread.c, dcache.c, demangle.c,
dpx2-nat.c, dstread.c, dwarfread.c, elfread.c, environ.c, eval.c,
exec.c, f-lang.c, f-typeprint.c, f-valprint.c, findvar.c,
fork-child.c, gdbtypes.c, hpread.c, i386-tdep.c, infcmd.c,
inflow.c, infptrace.c, infrun.c, irix5-nat.c, language.c,
m2-typeprint.c, main.c, mdebugread.c, minsyms.c, mipsread.c,
monitor.c, nlmread.c, objfiles.c, os9kread.c, osfsolib.c, parse.c,
printcmd.c, procfs.c, regex.c, remote-adapt.c, remote-arc.c,
remote-array.c, remote-bug.c, remote-e7000.c, remote-eb.c,
remote-es.c, remote-hms.c, remote-mm.c, remote-os9k.c,
remote-pa.c, remote-sim.c, remote-st.c, remote-udi.c,
remote-utils.c, remote-vx.c, remote-vx29k.c, remote-vx68.c,
remote-vx960.c, remote-vxmips.c, remote-vxsparc.c, remote.c,
solib.c, somread.c, source.c, stabsread.c, stack.c, symfile.c,
symmisc.c, symtab.c, target.c, top.c, typeprint.c, utils.c,
valarith.c, valops.c, valprint.c, values.c, xcoffread.c: Include
"gdb_string.h" instead of <string.h>.
* gdbtk.c: Likewise.
* config/xm-sysv4.h, i386/xm-ptx.h, m68k/xm-sun3os4.h,
sparc/xm-sun4os4.h (HAVE_MMAP): Removed.
* config/xm-lynx.h, config/i386/xm-ptx.h,
config/m68k/nm-apollo68b.h, config/m68k/xm-hp300hpux.h,
config/mips/xm-irix3.h, config/mips/xm-mips.h,
config/mips/xm-news-mips.h, config/mips/xm-riscos.h,
config/pa/hppah.h, config/rs6000/xm-rs6000.h,
config/sparc/xm-sun4os4.h, config/sparc/xm-sun4sol2.h,
config/vax/xm-vaxbsd.h, config/vax/xm-vaxult.h,
config/vax/xm-vaxult2.h (MEM_FNS_DECLARED): Removed.
* config/mips/xm-irix3.h, config/mips/xm-mips.h,
config/pa/xm-hppah.h (memcpy, memset): Removed declarations.
1995-08-02 04:14:27 +08:00
|
|
|
|
#include "gdb_string.h"
|
|
|
|
|
#include "gdb_stat.h"
|
1991-03-29 00:26:26 +08:00
|
|
|
|
#include <fcntl.h>
|
* configure.in: Check for unistd.h.
* configure: Regenerated.
* command.c, cp-valprint.c, fork-child.c, i386-tdep.c,
i386b-nat.c, inflow.c, main.c, maint.c, objfiles.c, solib.c,
source.c, stack.c, symfile.c, top.c, utils.c: Include strings.h
and/or unistd.h to bring prototypes into scope.
1995-08-01 06:46:03 +08:00
|
|
|
|
#ifdef HAVE_UNISTD_H
|
|
|
|
|
#include <unistd.h>
|
|
|
|
|
#endif
|
1991-03-29 00:26:26 +08:00
|
|
|
|
#include "gdbcore.h"
|
1997-06-28 14:10:06 +08:00
|
|
|
|
#include "gnu-regex.h"
|
1992-03-15 09:09:14 +08:00
|
|
|
|
#include "symfile.h"
|
1992-06-21 11:09:18 +08:00
|
|
|
|
#include "objfiles.h"
|
gcc -Wall lint:
* breakpoint.c (watchpoint_check): Remove unused variable b.
* stack.c (print_frame_info): Move sp and buf inside #if.
* eval.c (evaluate_subexp): Remove unused variables pp,
mangle_ptr, ptr, and mangle_tstr.
* valarith.c (value_x_binop): Remove unused variables mangle_tstr
and mangle_ptr.
* symtab.c (lookup_symtab): Put variable copy inside #if.
(decode_line_1): Put variable q1 inside #if 0.
* target.h: Declare target_link.
* infrun.c (wait_for_inferior): Remove unused variables signame.
* remote.c (remote_resume): Remove unused variable name.
* c-exp.y (parse_number): Parenthesize operand of shift.
* dbxread.c (record_minimal_symbol): Parenthesize operand of &&
(this is a semantic change, the warning seems to have detected a bug).
* dbxread.c (end_psymtab): Move variable p1 inside #if.
* coffread.c: Move variable temptype inside #if.
* ch-typeprint.c (chill_type_print_base): Remove unused variable
name.
* ch-valprint.c: #include typeprint.h and ch-lang.h.
(chill_val_print): Remove unused variable in_range.
(chill_val_print): Remove statement "length > TYPE_LENGTH (type);".
(chill_val_print): Add default case for switch.
* stabsread.h: Declare stabsect_build_psymtabs.
* os9kread.c (read_minimal_symbols): Make this return void.
(os9k_symfile_read): Remove unused variables stb_exist and val.
(os9k_symfile_init): Remove unused variable val.
(fill_sym): Remove unused variable id.
(read_os9k_psymtab): Put variable back_to inside #if 0. Remove
unused variable nsl.
Remove unused variable symfile_bfd.
#if 0 unused variables lbrac_unmatched_complaint and
lbrac_mismatch_complaint.
Remove declaration for non-existent function os9k_next_symbol_text.
* annotate.c, annotate.h: New files, containing a function for
each annotation which outputs it.
* Move breakpoints_changed from breakpoint.c to annotate.c.
* breakpoint.c, blockframe.c, infrun.c, cp-valprint.c, main.c,
printcmd.c, source.c, stack.c, utils.c, valprint.c:
Use annotate.c functions to output annotations.
* Makefile.in (OBS): Add annotate.o.
1994-05-14 02:18:57 +08:00
|
|
|
|
#include "annotate.h"
|
1995-04-08 17:59:02 +08:00
|
|
|
|
#include "gdbtypes.h"
|
1992-03-15 09:09:14 +08:00
|
|
|
|
|
1998-04-09 07:58:10 +08:00
|
|
|
|
#ifdef CRLF_SOURCE_FILES
|
|
|
|
|
|
|
|
|
|
/* Define CRLF_SOURCE_FILES in an xm-*.h file if source files on the
|
|
|
|
|
host use \r\n rather than just \n. Defining CRLF_SOURCE_FILES is
|
|
|
|
|
much faster than defining LSEEK_NOT_LINEAR. */
|
|
|
|
|
|
|
|
|
|
#ifndef O_BINARY
|
|
|
|
|
#define O_BINARY 0
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#define OPEN_MODE (O_RDONLY | O_BINARY)
|
|
|
|
|
#define FDOPEN_MODE FOPEN_RB
|
|
|
|
|
|
|
|
|
|
#else /* ! defined (CRLF_SOURCE_FILES) */
|
|
|
|
|
|
|
|
|
|
#define OPEN_MODE O_RDONLY
|
|
|
|
|
#define FDOPEN_MODE FOPEN_RT
|
|
|
|
|
|
|
|
|
|
#endif /* ! defined (CRLF_SOURCE_FILES) */
|
|
|
|
|
|
1992-03-15 09:09:14 +08:00
|
|
|
|
/* Prototypes for local functions. */
|
|
|
|
|
|
1994-12-08 10:27:47 +08:00
|
|
|
|
static int open_source_file PARAMS ((struct symtab *));
|
1992-03-15 09:09:14 +08:00
|
|
|
|
|
1994-12-08 10:27:47 +08:00
|
|
|
|
static int get_filename_and_charpos PARAMS ((struct symtab *, char **));
|
1992-03-15 09:09:14 +08:00
|
|
|
|
|
1994-12-08 10:27:47 +08:00
|
|
|
|
static void reverse_search_command PARAMS ((char *, int));
|
1992-03-15 09:09:14 +08:00
|
|
|
|
|
1994-12-08 10:27:47 +08:00
|
|
|
|
static void forward_search_command PARAMS ((char *, int));
|
1992-03-15 09:09:14 +08:00
|
|
|
|
|
1994-12-08 10:27:47 +08:00
|
|
|
|
static void line_info PARAMS ((char *, int));
|
1992-03-15 09:09:14 +08:00
|
|
|
|
|
1994-12-08 10:27:47 +08:00
|
|
|
|
static void list_command PARAMS ((char *, int));
|
1992-03-15 09:09:14 +08:00
|
|
|
|
|
1994-12-08 10:27:47 +08:00
|
|
|
|
static void ambiguous_line_spec PARAMS ((struct symtabs_and_lines *));
|
1992-03-15 09:09:14 +08:00
|
|
|
|
|
1994-12-08 10:27:47 +08:00
|
|
|
|
static void source_info PARAMS ((char *, int));
|
1992-03-15 09:09:14 +08:00
|
|
|
|
|
1994-12-08 10:27:47 +08:00
|
|
|
|
static void show_directories PARAMS ((char *, int));
|
1992-03-15 09:09:14 +08:00
|
|
|
|
|
1994-12-08 10:27:47 +08:00
|
|
|
|
static void find_source_lines PARAMS ((struct symtab *, int));
|
1991-03-29 00:26:26 +08:00
|
|
|
|
|
|
|
|
|
/* Path of directories to search for source files.
|
|
|
|
|
Same format as the PATH environment variable's value. */
|
|
|
|
|
|
|
|
|
|
char *source_path;
|
|
|
|
|
|
|
|
|
|
/* Symtab of default file for listing lines of. */
|
|
|
|
|
|
|
|
|
|
struct symtab *current_source_symtab;
|
|
|
|
|
|
|
|
|
|
/* Default next line to list. */
|
|
|
|
|
|
|
|
|
|
int current_source_line;
|
|
|
|
|
|
1991-09-19 10:40:29 +08:00
|
|
|
|
/* Default number of lines to print with commands like "list".
|
|
|
|
|
This is based on guessing how many long (i.e. more than chars_per_line
|
|
|
|
|
characters) lines there will be. To be completely correct, "list"
|
|
|
|
|
and friends should be rewritten to count characters and see where
|
|
|
|
|
things are wrapping, but that would be a fair amount of work. */
|
|
|
|
|
|
1992-03-15 09:09:14 +08:00
|
|
|
|
int lines_to_list = 10;
|
1991-09-19 10:40:29 +08:00
|
|
|
|
|
1991-03-29 00:26:26 +08:00
|
|
|
|
/* Line number of last line printed. Default for various commands.
|
|
|
|
|
current_source_line is usually, but not always, the same as this. */
|
|
|
|
|
|
|
|
|
|
static int last_line_listed;
|
|
|
|
|
|
|
|
|
|
/* First line number listed by last listing command. */
|
|
|
|
|
|
|
|
|
|
static int first_line_listed;
|
|
|
|
|
|
|
|
|
|
|
1993-05-26 11:27:32 +08:00
|
|
|
|
/* 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. */
|
1991-03-29 00:26:26 +08:00
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
select_source_symtab (s)
|
|
|
|
|
register struct symtab *s;
|
|
|
|
|
{
|
|
|
|
|
struct symtabs_and_lines sals;
|
|
|
|
|
struct symtab_and_line sal;
|
|
|
|
|
struct partial_symtab *ps;
|
|
|
|
|
struct partial_symtab *cs_pst = 0;
|
1992-03-15 09:09:14 +08:00
|
|
|
|
struct objfile *ofp;
|
1991-03-29 00:26:26 +08:00
|
|
|
|
|
|
|
|
|
if (s)
|
|
|
|
|
{
|
|
|
|
|
current_source_symtab = s;
|
|
|
|
|
current_source_line = 1;
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
1993-05-26 11:27:32 +08:00
|
|
|
|
if (current_source_symtab)
|
|
|
|
|
return;
|
|
|
|
|
|
1991-03-29 00:26:26 +08:00
|
|
|
|
/* Make the default place to list be the function `main'
|
|
|
|
|
if one exists. */
|
|
|
|
|
if (lookup_symbol ("main", 0, VAR_NAMESPACE, 0, NULL))
|
|
|
|
|
{
|
|
|
|
|
sals = decode_line_spec ("main", 1);
|
|
|
|
|
sal = sals.sals[0];
|
|
|
|
|
free (sals.sals);
|
|
|
|
|
current_source_symtab = sal.symtab;
|
1991-09-19 10:40:29 +08:00
|
|
|
|
current_source_line = max (sal.line - (lines_to_list - 1), 1);
|
1991-08-14 09:11:20 +09:00
|
|
|
|
if (current_source_symtab)
|
|
|
|
|
return;
|
1991-03-29 00:26:26 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* All right; find the last file in the symtab list (ignoring .h's). */
|
|
|
|
|
|
1991-08-14 09:11:20 +09:00
|
|
|
|
current_source_line = 1;
|
|
|
|
|
|
1992-03-15 09:09:14 +08:00
|
|
|
|
for (ofp = object_files; ofp != NULL; ofp = ofp -> next)
|
1991-03-29 00:26:26 +08:00
|
|
|
|
{
|
1992-03-15 09:09:14 +08:00
|
|
|
|
for (s = ofp -> symtabs; s; s = s->next)
|
|
|
|
|
{
|
|
|
|
|
char *name = s -> filename;
|
|
|
|
|
int len = strlen (name);
|
* defs.h (STRCMP, STREQ, STREQN): New macros.
* defs.h (demangle_and_match): Remove prototype.
* dwarfread.c (STREQ, STREQN): Remove macros, replaced with STREQ
and STREQN defined in defs.h.
* dwarfread.c (set_cu_language): For completely unknown languages,
try to deduce the language from the filename. Retain behavior
that for known languages we don't know how to handle, we use
language_unknown.
* dwarfread.c (enum_type, symthesize_typedef): Initialize language
and demangled name fields in symbol.
* dwarfread.c, mipsread.c, partial-stab.h: For all usages of
ADD_PSYMBOL_TO_LIST, add language and objfile parameters.
* dwarfread.c (new_symbol): Attempt to demangle C++ symbol names
and cache the results in SYMBOL_DEMANGLED_NAME for the symbol.
* elfread.c (STREQ): Remove macro, use STREQ defined in defs.h.
Replace usages throughout.
* elfread.c (demangle.h): Include.
* elfread.c (record_minimal_symbol): Remove prototype and function.
* gdbtypes.h, symtab.h (B_SET, B_CLR, B_TST, B_TYPE, B_BYTES,
B_CLRALL): Moved from symtab.h to gdbtypes.h.
* infcmd.c (jump_command): Remove code to demangle name and add
it to a cleanup list. Now just use SYMBOL_DEMANGLED_NAME.
* minsyms.c (demangle.h): Include.
* minsyms.c (lookup_minimal_symbol): Indent comment to match code.
* minsyms.c (install_minimal_symbols): Attempt to demangle symbol
names as C++ names, and cache them in SYMBOL_DEMANGLED_NAME.
* mipsread.c (psymtab_language): Add static variable.
* stabsread.c (demangle.h): Include.
* stabsread.c (define_symbol): Attempt to demangle C++ symbol
names and cache them in the SYMBOL_DEMANGLED_NAME field.
* stack.c (return_command): Remove explicit demangling of name
and use of cleanups. Just use SYMBOL_DEMANGLED_NAME.
* symfile.c (demangle.h): Include.
* symfile.c (add_psymbol_to_list, add_psymbol_addr_to_list): Fix
to match macros in symfile.h and allow them to be compiled
if INLINE_ADD_PSYMBOL is not true.
* symfile.h (INLINE_ADD_PSYMBOL): Default to true if not set.
* symfile.h (ADD_PSYMBOL_*): Add language and objfile parameters.
Add code to demangle and cache C++ symbol names. Use macro form
if INLINE_ADD_PSYMBOL is true, otherwise use C function form.
* symmisc.c (add_psymbol_to_list, add_psymbol_addr_to_list):
Remove, also defined in symfile.c, which we already fixed.
* symtab.c (expensive_mangler): Remove prototype and function.
* symtab.c (find_methods): Remove physnames parameter and fix
prototype to match.
* symtab.c (completion_list_add_symbol): Name changed to
completion_list_add_name.
* symtab.c (COMPLETION_LIST_ADD_SYMBOL): New macro, adds both
the normal symbol name and the cached C++ demangled name.
* symtab.c (lookup_demangled_partial_symbol,
lookup_demangled_block_symbol): Remove prototypes and functions.
* symtab.c (lookup_symbol): Remove use of expensive_mangler,
use lookup_block_symbol instead of lookup_demangled_block_symbol.
Remove code to try demangling names and matching them.
* symtab.c (lookup_partial_symbol, lookup_block_symbol):
Fix to try matching the cached demangled name if no match is
found using the regular symbol name.
* symtab.c (find_methods): Remove unused physnames array.
* symtab.c (name_match, NAME_MATCH): Remove function and macro,
replaced with SYMBOL_MATCHES_REGEXP from symtab.h.
* symtab.c (completion_list_add_symbol): Rewrite to use cached
C++ demangled symbol names.
* symtab.h: Much reformatting of structures and such to add
whitespace to make them more readable, and make them more
consistent with other gdb structure definitions.
* symtab.h (general_symbol_info): New struct containing fields
common to all symbols.
* symtab.h (SYMBOL_LANGUAGE, SYMBOL_DEMANGLED_NAME,
SYMBOL_SOURCE_NAME, SYMBOL_LINKAGE_NAME, SYMBOL_MATCHES_NAME,
SYMBOL_MATCHES_REGEXP, MSYMBOL_INFO, MSYMBOL_TYPE): New macros.
* symtab. (struct minimal_symbol, struct partial_symbol, struct
symbol): Use general_symbol_info struct.
* utils.c (demangle_and_match): Remove, no longer used.
* valops.c (demangle.h): Include.
* xcoffexec.c (eq): Remove macro, replace usages with STREQ.
* blockframe.c, breakpoint.c, c-exp.y, c-valprint.c, dbxread.c,
infcmd.c, m2-exp.y, minsyms.c, objfiles.h, solib.c, stack.c,
symmisc.c, symtab.c, valops.c: Replace references to minimal
symbol fields with appropriate macros.
* breakpoint.c, buildsym.c, c-exp.y, c-typeprint.c, c-valprint.c,
coffread.c, command.c, convex-tdep.c, cp-valprint.c, dbxread.c,
demangle.c, elfread.c, energize.c, environ.c, exec.c,
gdbtypes.c, i960-tdep.c, infrun.c, infrun-hacked.c, language.c,
main.c, minsyms.c, mipsread.c, partial-stab.h, remote-es1800.c,
remote-nindy.c, remote-udi.c, rs6000-tdep.c, solib.c, source.c,
sparc-pinsn.c, stabsread.c, standalone.c, state.c, stuff.c,
symfile.c, symmisc.c, symtab.c, symtab.h, tm-sysv4.h,
tm-ultra3.h, values.c, xcoffexec.c, xcoffread.c: Replace strcmp
and strncmp usages with STREQ, STREQN, or STRCMP as appropriate.
* breakpoint.c, buildsym.c, c-typeprint.c, expprint.c, findvar.c,
mipsread.c, printcmd.c, source.c, stabsread.c, stack.c,
symmisc.c, tm-29k.h, valops.c, values.c: Replace SYMBOL_NAME
references with SYMBOL_SOURCE_NAME or SYMBOL_LINKAGE_NAME as
appropriate.
* buildsym.c (start_subfile, patch_subfile_names): Default the
source language to what can be deduced from the filename.
* buildsym.c (end_symtab): Update the source language in the
allocated symtab to match what we have been using.
* buildsym.h (struct subfile): Add a language field.
* c-typeprint.c (c_print_type): Remove code to do explicit
demangling.
* dbxread.c (psymtab_language): Add static variable.
* dbxread.c (start_psymtab): Initialize psymtab_language using
deduce_language_from_filename.
1992-12-23 14:34:57 +08:00
|
|
|
|
if (! (len > 2 && (STREQ (&name[len - 2], ".h"))))
|
1992-03-15 09:09:14 +08:00
|
|
|
|
{
|
|
|
|
|
current_source_symtab = s;
|
|
|
|
|
}
|
|
|
|
|
}
|
1991-03-29 00:26:26 +08:00
|
|
|
|
}
|
1991-08-14 09:11:20 +09:00
|
|
|
|
if (current_source_symtab)
|
|
|
|
|
return;
|
|
|
|
|
|
1992-03-15 09:09:14 +08:00
|
|
|
|
/* Howabout the partial symbol tables? */
|
1991-08-14 09:11:20 +09:00
|
|
|
|
|
1992-03-15 09:09:14 +08:00
|
|
|
|
for (ofp = object_files; ofp != NULL; ofp = ofp -> next)
|
1991-03-29 00:26:26 +08:00
|
|
|
|
{
|
1992-03-15 09:09:14 +08:00
|
|
|
|
for (ps = ofp -> psymtabs; ps != NULL; ps = ps -> next)
|
1991-03-29 00:26:26 +08:00
|
|
|
|
{
|
1992-03-15 09:09:14 +08:00
|
|
|
|
char *name = ps -> filename;
|
1991-03-29 00:26:26 +08:00
|
|
|
|
int len = strlen (name);
|
* defs.h (STRCMP, STREQ, STREQN): New macros.
* defs.h (demangle_and_match): Remove prototype.
* dwarfread.c (STREQ, STREQN): Remove macros, replaced with STREQ
and STREQN defined in defs.h.
* dwarfread.c (set_cu_language): For completely unknown languages,
try to deduce the language from the filename. Retain behavior
that for known languages we don't know how to handle, we use
language_unknown.
* dwarfread.c (enum_type, symthesize_typedef): Initialize language
and demangled name fields in symbol.
* dwarfread.c, mipsread.c, partial-stab.h: For all usages of
ADD_PSYMBOL_TO_LIST, add language and objfile parameters.
* dwarfread.c (new_symbol): Attempt to demangle C++ symbol names
and cache the results in SYMBOL_DEMANGLED_NAME for the symbol.
* elfread.c (STREQ): Remove macro, use STREQ defined in defs.h.
Replace usages throughout.
* elfread.c (demangle.h): Include.
* elfread.c (record_minimal_symbol): Remove prototype and function.
* gdbtypes.h, symtab.h (B_SET, B_CLR, B_TST, B_TYPE, B_BYTES,
B_CLRALL): Moved from symtab.h to gdbtypes.h.
* infcmd.c (jump_command): Remove code to demangle name and add
it to a cleanup list. Now just use SYMBOL_DEMANGLED_NAME.
* minsyms.c (demangle.h): Include.
* minsyms.c (lookup_minimal_symbol): Indent comment to match code.
* minsyms.c (install_minimal_symbols): Attempt to demangle symbol
names as C++ names, and cache them in SYMBOL_DEMANGLED_NAME.
* mipsread.c (psymtab_language): Add static variable.
* stabsread.c (demangle.h): Include.
* stabsread.c (define_symbol): Attempt to demangle C++ symbol
names and cache them in the SYMBOL_DEMANGLED_NAME field.
* stack.c (return_command): Remove explicit demangling of name
and use of cleanups. Just use SYMBOL_DEMANGLED_NAME.
* symfile.c (demangle.h): Include.
* symfile.c (add_psymbol_to_list, add_psymbol_addr_to_list): Fix
to match macros in symfile.h and allow them to be compiled
if INLINE_ADD_PSYMBOL is not true.
* symfile.h (INLINE_ADD_PSYMBOL): Default to true if not set.
* symfile.h (ADD_PSYMBOL_*): Add language and objfile parameters.
Add code to demangle and cache C++ symbol names. Use macro form
if INLINE_ADD_PSYMBOL is true, otherwise use C function form.
* symmisc.c (add_psymbol_to_list, add_psymbol_addr_to_list):
Remove, also defined in symfile.c, which we already fixed.
* symtab.c (expensive_mangler): Remove prototype and function.
* symtab.c (find_methods): Remove physnames parameter and fix
prototype to match.
* symtab.c (completion_list_add_symbol): Name changed to
completion_list_add_name.
* symtab.c (COMPLETION_LIST_ADD_SYMBOL): New macro, adds both
the normal symbol name and the cached C++ demangled name.
* symtab.c (lookup_demangled_partial_symbol,
lookup_demangled_block_symbol): Remove prototypes and functions.
* symtab.c (lookup_symbol): Remove use of expensive_mangler,
use lookup_block_symbol instead of lookup_demangled_block_symbol.
Remove code to try demangling names and matching them.
* symtab.c (lookup_partial_symbol, lookup_block_symbol):
Fix to try matching the cached demangled name if no match is
found using the regular symbol name.
* symtab.c (find_methods): Remove unused physnames array.
* symtab.c (name_match, NAME_MATCH): Remove function and macro,
replaced with SYMBOL_MATCHES_REGEXP from symtab.h.
* symtab.c (completion_list_add_symbol): Rewrite to use cached
C++ demangled symbol names.
* symtab.h: Much reformatting of structures and such to add
whitespace to make them more readable, and make them more
consistent with other gdb structure definitions.
* symtab.h (general_symbol_info): New struct containing fields
common to all symbols.
* symtab.h (SYMBOL_LANGUAGE, SYMBOL_DEMANGLED_NAME,
SYMBOL_SOURCE_NAME, SYMBOL_LINKAGE_NAME, SYMBOL_MATCHES_NAME,
SYMBOL_MATCHES_REGEXP, MSYMBOL_INFO, MSYMBOL_TYPE): New macros.
* symtab. (struct minimal_symbol, struct partial_symbol, struct
symbol): Use general_symbol_info struct.
* utils.c (demangle_and_match): Remove, no longer used.
* valops.c (demangle.h): Include.
* xcoffexec.c (eq): Remove macro, replace usages with STREQ.
* blockframe.c, breakpoint.c, c-exp.y, c-valprint.c, dbxread.c,
infcmd.c, m2-exp.y, minsyms.c, objfiles.h, solib.c, stack.c,
symmisc.c, symtab.c, valops.c: Replace references to minimal
symbol fields with appropriate macros.
* breakpoint.c, buildsym.c, c-exp.y, c-typeprint.c, c-valprint.c,
coffread.c, command.c, convex-tdep.c, cp-valprint.c, dbxread.c,
demangle.c, elfread.c, energize.c, environ.c, exec.c,
gdbtypes.c, i960-tdep.c, infrun.c, infrun-hacked.c, language.c,
main.c, minsyms.c, mipsread.c, partial-stab.h, remote-es1800.c,
remote-nindy.c, remote-udi.c, rs6000-tdep.c, solib.c, source.c,
sparc-pinsn.c, stabsread.c, standalone.c, state.c, stuff.c,
symfile.c, symmisc.c, symtab.c, symtab.h, tm-sysv4.h,
tm-ultra3.h, values.c, xcoffexec.c, xcoffread.c: Replace strcmp
and strncmp usages with STREQ, STREQN, or STRCMP as appropriate.
* breakpoint.c, buildsym.c, c-typeprint.c, expprint.c, findvar.c,
mipsread.c, printcmd.c, source.c, stabsread.c, stack.c,
symmisc.c, tm-29k.h, valops.c, values.c: Replace SYMBOL_NAME
references with SYMBOL_SOURCE_NAME or SYMBOL_LINKAGE_NAME as
appropriate.
* buildsym.c (start_subfile, patch_subfile_names): Default the
source language to what can be deduced from the filename.
* buildsym.c (end_symtab): Update the source language in the
allocated symtab to match what we have been using.
* buildsym.h (struct subfile): Add a language field.
* c-typeprint.c (c_print_type): Remove code to do explicit
demangling.
* dbxread.c (psymtab_language): Add static variable.
* dbxread.c (start_psymtab): Initialize psymtab_language using
deduce_language_from_filename.
1992-12-23 14:34:57 +08:00
|
|
|
|
if (! (len > 2 && (STREQ (&name[len - 2], ".h"))))
|
1992-03-15 09:09:14 +08:00
|
|
|
|
{
|
|
|
|
|
cs_pst = ps;
|
|
|
|
|
}
|
1991-03-29 00:26:26 +08:00
|
|
|
|
}
|
1992-03-15 09:09:14 +08:00
|
|
|
|
}
|
|
|
|
|
if (cs_pst)
|
|
|
|
|
{
|
|
|
|
|
if (cs_pst -> readin)
|
|
|
|
|
{
|
1991-03-29 00:26:26 +08:00
|
|
|
|
fatal ("Internal: select_source_symtab: readin pst found and no symtabs.");
|
1992-03-15 09:09:14 +08:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
1991-03-29 00:26:26 +08:00
|
|
|
|
current_source_symtab = PSYMTAB_TO_SYMTAB (cs_pst);
|
1992-03-15 09:09:14 +08:00
|
|
|
|
}
|
1991-03-29 00:26:26 +08:00
|
|
|
|
}
|
1998-04-09 07:58:10 +08:00
|
|
|
|
if (current_source_symtab)
|
|
|
|
|
return;
|
1992-03-15 09:09:14 +08:00
|
|
|
|
|
1991-08-14 09:11:20 +09:00
|
|
|
|
error ("Can't find a default source file");
|
1991-03-29 00:26:26 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
1992-06-21 11:09:18 +08:00
|
|
|
|
show_directories (ignore, from_tty)
|
|
|
|
|
char *ignore;
|
|
|
|
|
int from_tty;
|
1991-03-29 00:26:26 +08:00
|
|
|
|
{
|
1992-11-06 17:21:13 +08:00
|
|
|
|
puts_filtered ("Source directories searched: ");
|
|
|
|
|
puts_filtered (source_path);
|
|
|
|
|
puts_filtered ("\n");
|
1991-03-29 00:26:26 +08:00
|
|
|
|
}
|
|
|
|
|
|
1994-12-08 10:27:47 +08:00
|
|
|
|
/* 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. */
|
1991-03-29 00:26:26 +08:00
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
forget_cached_source_info ()
|
|
|
|
|
{
|
|
|
|
|
register struct symtab *s;
|
1992-03-15 09:09:14 +08:00
|
|
|
|
register struct objfile *objfile;
|
1991-03-29 00:26:26 +08:00
|
|
|
|
|
1992-03-15 09:09:14 +08:00
|
|
|
|
for (objfile = object_files; objfile != NULL; objfile = objfile -> next)
|
1991-03-29 00:26:26 +08:00
|
|
|
|
{
|
1992-03-15 09:09:14 +08:00
|
|
|
|
for (s = objfile -> symtabs; s != NULL; s = s -> next)
|
1991-03-29 00:26:26 +08:00
|
|
|
|
{
|
1992-03-15 09:09:14 +08:00
|
|
|
|
if (s -> line_charpos != NULL)
|
|
|
|
|
{
|
|
|
|
|
mfree (objfile -> md, s -> line_charpos);
|
|
|
|
|
s -> line_charpos = NULL;
|
|
|
|
|
}
|
|
|
|
|
if (s -> fullname != NULL)
|
|
|
|
|
{
|
|
|
|
|
mfree (objfile -> md, s -> fullname);
|
|
|
|
|
s -> fullname = NULL;
|
|
|
|
|
}
|
1991-03-29 00:26:26 +08:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
init_source_path ()
|
|
|
|
|
{
|
1994-04-16 05:55:49 +08:00
|
|
|
|
char buf[20];
|
|
|
|
|
|
|
|
|
|
sprintf (buf, "$cdir%c$cwd", DIRNAME_SEPARATOR);
|
|
|
|
|
source_path = strsave (buf);
|
1991-03-29 00:26:26 +08:00
|
|
|
|
forget_cached_source_info ();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Add zero or more directories to the front of the source path. */
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
directory_command (dirname, from_tty)
|
|
|
|
|
char *dirname;
|
|
|
|
|
int from_tty;
|
|
|
|
|
{
|
|
|
|
|
dont_repeat ();
|
|
|
|
|
/* FIXME, this goes to "delete dir"... */
|
|
|
|
|
if (dirname == 0)
|
|
|
|
|
{
|
* configure.in: Check for unistd.h.
* configure: Regenerated.
* command.c, cp-valprint.c, fork-child.c, i386-tdep.c,
i386b-nat.c, inflow.c, main.c, maint.c, objfiles.c, solib.c,
source.c, stack.c, symfile.c, top.c, utils.c: Include strings.h
and/or unistd.h to bring prototypes into scope.
1995-08-01 06:46:03 +08:00
|
|
|
|
if (query ("Reinitialize source path to empty? "))
|
1991-03-29 00:26:26 +08:00
|
|
|
|
{
|
|
|
|
|
free (source_path);
|
|
|
|
|
init_source_path ();
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else
|
1991-08-14 09:11:20 +09:00
|
|
|
|
mod_path (dirname, &source_path);
|
1991-03-29 00:26:26 +08:00
|
|
|
|
if (from_tty)
|
1992-06-21 11:09:18 +08:00
|
|
|
|
show_directories ((char *)0, from_tty);
|
1991-03-29 00:26:26 +08:00
|
|
|
|
forget_cached_source_info ();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Add zero or more directories to the front of an arbitrary path. */
|
|
|
|
|
|
|
|
|
|
void
|
1991-08-14 09:11:20 +09:00
|
|
|
|
mod_path (dirname, which_path)
|
1991-03-29 00:26:26 +08:00
|
|
|
|
char *dirname;
|
|
|
|
|
char **which_path;
|
|
|
|
|
{
|
|
|
|
|
char *old = *which_path;
|
|
|
|
|
int prefix = 0;
|
|
|
|
|
|
|
|
|
|
if (dirname == 0)
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
dirname = strsave (dirname);
|
|
|
|
|
make_cleanup (free, dirname);
|
|
|
|
|
|
|
|
|
|
do
|
|
|
|
|
{
|
|
|
|
|
char *name = dirname;
|
|
|
|
|
register char *p;
|
|
|
|
|
struct stat st;
|
|
|
|
|
|
|
|
|
|
{
|
1994-12-08 10:27:47 +08:00
|
|
|
|
char *separator = strchr (name, DIRNAME_SEPARATOR);
|
1992-03-15 09:09:14 +08:00
|
|
|
|
char *space = strchr (name, ' ');
|
|
|
|
|
char *tab = strchr (name, '\t');
|
1994-12-08 10:27:47 +08:00
|
|
|
|
|
|
|
|
|
if (separator == 0 && space == 0 && tab == 0)
|
1991-03-29 00:26:26 +08:00
|
|
|
|
p = dirname = name + strlen (name);
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
p = 0;
|
1994-12-08 10:27:47 +08:00
|
|
|
|
if (separator != 0 && (p == 0 || separator < p))
|
|
|
|
|
p = separator;
|
1991-03-29 00:26:26 +08:00
|
|
|
|
if (space != 0 && (p == 0 || space < p))
|
|
|
|
|
p = space;
|
|
|
|
|
if (tab != 0 && (p == 0 || tab < p))
|
|
|
|
|
p = tab;
|
|
|
|
|
dirname = p + 1;
|
1994-12-08 10:27:47 +08:00
|
|
|
|
while (*dirname == DIRNAME_SEPARATOR
|
|
|
|
|
|| *dirname == ' '
|
|
|
|
|
|| *dirname == '\t')
|
1991-03-29 00:26:26 +08:00
|
|
|
|
++dirname;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
1997-06-28 14:10:06 +08:00
|
|
|
|
#ifndef WIN32
|
|
|
|
|
/* On win32 h:\ is different to h: */
|
* configure.in: Check for unistd.h.
* configure: Regenerated.
* command.c, cp-valprint.c, fork-child.c, i386-tdep.c,
i386b-nat.c, inflow.c, main.c, maint.c, objfiles.c, solib.c,
source.c, stack.c, symfile.c, top.c, utils.c: Include strings.h
and/or unistd.h to bring prototypes into scope.
1995-08-01 06:46:03 +08:00
|
|
|
|
if (SLASH_P (p[-1]))
|
1991-03-29 00:26:26 +08:00
|
|
|
|
/* Sigh. "foo/" => "foo" */
|
|
|
|
|
--p;
|
1997-06-28 14:10:06 +08:00
|
|
|
|
#endif
|
1991-03-29 00:26:26 +08:00
|
|
|
|
*p = '\0';
|
|
|
|
|
|
|
|
|
|
while (p[-1] == '.')
|
|
|
|
|
{
|
|
|
|
|
if (p - name == 1)
|
|
|
|
|
{
|
|
|
|
|
/* "." => getwd (). */
|
|
|
|
|
name = current_directory;
|
|
|
|
|
goto append;
|
|
|
|
|
}
|
* configure.in: Check for unistd.h.
* configure: Regenerated.
* command.c, cp-valprint.c, fork-child.c, i386-tdep.c,
i386b-nat.c, inflow.c, main.c, maint.c, objfiles.c, solib.c,
source.c, stack.c, symfile.c, top.c, utils.c: Include strings.h
and/or unistd.h to bring prototypes into scope.
1995-08-01 06:46:03 +08:00
|
|
|
|
else if (SLASH_P (p[-2]))
|
1991-03-29 00:26:26 +08:00
|
|
|
|
{
|
|
|
|
|
if (p - name == 2)
|
|
|
|
|
{
|
|
|
|
|
/* "/." => "/". */
|
|
|
|
|
*--p = '\0';
|
|
|
|
|
goto append;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
/* "...foo/." => "...foo". */
|
|
|
|
|
p -= 2;
|
|
|
|
|
*p = '\0';
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (name[0] == '~')
|
|
|
|
|
name = tilde_expand (name);
|
1997-06-28 14:10:06 +08:00
|
|
|
|
else if (!ROOTED_P (name) && name[0] != '$')
|
* configure.in: Check for unistd.h.
* configure: Regenerated.
* command.c, cp-valprint.c, fork-child.c, i386-tdep.c,
i386b-nat.c, inflow.c, main.c, maint.c, objfiles.c, solib.c,
source.c, stack.c, symfile.c, top.c, utils.c: Include strings.h
and/or unistd.h to bring prototypes into scope.
1995-08-01 06:46:03 +08:00
|
|
|
|
name = concat (current_directory, SLASH_STRING, name, NULL);
|
1991-03-29 00:26:26 +08:00
|
|
|
|
else
|
|
|
|
|
name = savestring (name, p - name);
|
|
|
|
|
make_cleanup (free, name);
|
|
|
|
|
|
|
|
|
|
/* Unless it's a variable, check existence. */
|
|
|
|
|
if (name[0] != '$') {
|
1993-07-12 11:42:35 +08:00
|
|
|
|
/* These are warnings, not errors, since we don't want a
|
|
|
|
|
non-existent directory in a .gdbinit file to stop processing
|
|
|
|
|
of the .gdbinit file.
|
|
|
|
|
|
|
|
|
|
Whether they get added to the path is more debatable. Current
|
|
|
|
|
answer is yes, in case the user wants to go make the directory
|
|
|
|
|
or whatever. If the directory continues to not exist/not be
|
|
|
|
|
a directory/etc, then having them in the path should be
|
|
|
|
|
harmless. */
|
1991-03-29 00:26:26 +08:00
|
|
|
|
if (stat (name, &st) < 0)
|
1993-07-12 11:42:35 +08:00
|
|
|
|
{
|
|
|
|
|
int save_errno = errno;
|
1993-11-02 06:25:23 +08:00
|
|
|
|
fprintf_unfiltered (gdb_stderr, "Warning: ");
|
1993-07-12 11:42:35 +08:00
|
|
|
|
print_sys_errmsg (name, save_errno);
|
|
|
|
|
}
|
1995-08-01 06:50:21 +08:00
|
|
|
|
else if ((st.st_mode & S_IFMT) != S_IFDIR)
|
1993-07-12 11:42:35 +08:00
|
|
|
|
warning ("%s is not a directory.", name);
|
1991-03-29 00:26:26 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
append:
|
|
|
|
|
{
|
|
|
|
|
register unsigned int len = strlen (name);
|
|
|
|
|
|
|
|
|
|
p = *which_path;
|
|
|
|
|
while (1)
|
|
|
|
|
{
|
|
|
|
|
if (!strncmp (p, name, len)
|
1994-04-16 05:55:49 +08:00
|
|
|
|
&& (p[len] == '\0' || p[len] == DIRNAME_SEPARATOR))
|
1991-03-29 00:26:26 +08:00
|
|
|
|
{
|
|
|
|
|
/* Found it in the search path, remove old copy */
|
|
|
|
|
if (p > *which_path)
|
1994-12-08 10:27:47 +08:00
|
|
|
|
p--; /* Back over leading separator */
|
1991-03-29 00:26:26 +08:00
|
|
|
|
if (prefix > p - *which_path)
|
|
|
|
|
goto skip_dup; /* Same dir twice in one cmd */
|
|
|
|
|
strcpy (p, &p[len+1]); /* Copy from next \0 or : */
|
|
|
|
|
}
|
1994-04-16 05:55:49 +08:00
|
|
|
|
p = strchr (p, DIRNAME_SEPARATOR);
|
1991-03-29 00:26:26 +08:00
|
|
|
|
if (p != 0)
|
|
|
|
|
++p;
|
|
|
|
|
else
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
if (p == 0)
|
|
|
|
|
{
|
1994-04-16 05:55:49 +08:00
|
|
|
|
char tinybuf[2];
|
|
|
|
|
|
|
|
|
|
tinybuf[0] = DIRNAME_SEPARATOR;
|
|
|
|
|
tinybuf[1] = '\0';
|
|
|
|
|
|
1991-03-29 00:26:26 +08:00
|
|
|
|
/* If we have already tacked on a name(s) in this command, be sure they stay on the front as we tack on some more. */
|
|
|
|
|
if (prefix)
|
|
|
|
|
{
|
|
|
|
|
char *temp, c;
|
|
|
|
|
|
|
|
|
|
c = old[prefix];
|
|
|
|
|
old[prefix] = '\0';
|
1994-04-16 05:55:49 +08:00
|
|
|
|
temp = concat (old, tinybuf, name, NULL);
|
1991-03-29 00:26:26 +08:00
|
|
|
|
old[prefix] = c;
|
1992-03-15 09:09:14 +08:00
|
|
|
|
*which_path = concat (temp, "", &old[prefix], NULL);
|
1991-03-29 00:26:26 +08:00
|
|
|
|
prefix = strlen (temp);
|
|
|
|
|
free (temp);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
1994-04-16 05:55:49 +08:00
|
|
|
|
*which_path = concat (name, (old[0] ? tinybuf : old), old, NULL);
|
1991-03-29 00:26:26 +08:00
|
|
|
|
prefix = strlen (name);
|
|
|
|
|
}
|
|
|
|
|
free (old);
|
|
|
|
|
old = *which_path;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
skip_dup: ;
|
|
|
|
|
} while (*dirname != '\0');
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static void
|
1992-06-21 11:09:18 +08:00
|
|
|
|
source_info (ignore, from_tty)
|
|
|
|
|
char *ignore;
|
|
|
|
|
int from_tty;
|
1991-03-29 00:26:26 +08:00
|
|
|
|
{
|
|
|
|
|
register struct symtab *s = current_source_symtab;
|
|
|
|
|
|
|
|
|
|
if (!s)
|
|
|
|
|
{
|
1992-06-21 11:09:18 +08:00
|
|
|
|
printf_filtered("No current source file.\n");
|
1991-03-29 00:26:26 +08:00
|
|
|
|
return;
|
|
|
|
|
}
|
1992-06-21 11:09:18 +08:00
|
|
|
|
printf_filtered ("Current source file is %s\n", s->filename);
|
1991-03-29 00:26:26 +08:00
|
|
|
|
if (s->dirname)
|
1992-06-21 11:09:18 +08:00
|
|
|
|
printf_filtered ("Compilation directory is %s\n", s->dirname);
|
1991-03-29 00:26:26 +08:00
|
|
|
|
if (s->fullname)
|
1992-06-21 11:09:18 +08:00
|
|
|
|
printf_filtered ("Located in %s\n", s->fullname);
|
1991-03-29 00:26:26 +08:00
|
|
|
|
if (s->nlines)
|
* Makefile.in (VERSION): Bump to 4.7.4.
* Makefile.in (SFILES_MAINDIR): Add typeprint.c, c-typeprint.c,
m2-typeprint.c, c-valprint.c cp-valprint.c m2-valprint.c.
* Makefile.in (HFILES): Add valprint.h.
* Makefile.in (OBS): Add typeprint.o, c-typeprint.o,
m2-typeprint.o, c-valprint.o, cp-valprint.o m2-valprint.o.
* typeprint.c, typeprint.h: New files for language independent
type printing functions.
* c-typeprint.c, m2-typeprint.c: New files for language dependent
type printing functions and definitions.
* valprint.h: New include file for language independent value
printing definitions.
* c-valprint.c, cp-valprint.c, m2-valprint.c: New files for language
dependent value printing functions.
* c-exp.y (production ptype): Add range_type variable and use new
create_range_type function.
* c-exp.y (tokentab2, tokentab3), c-lang.c (c_op_print_tab),
infcmd.c (path_var_name), language.c (unk_op_print_tab),
m2-lang.c (m2_op_print_tab): Change from ANSI-obsolescent
"const static" to ANSI-conformant "static const".
* c-exp.y (c_create_fundamental_type): Remove unused nbytes.
* c-exp.y (c_language_defn, cplus_language_defn): Add c_print_type,
and c_val_print.
* c-lang.h (c_print_type, c_val_print): Add prototypes.
* coffread.c (decode_type): Add range_type variable and call to
new create_range_type function.
* complaints.c (complain): Remove unused val variable.
* complaints.c (_initialize_complaints): Make it void.
* convex-tdep.c (value_of_trapped_internalvar): Add range_type
variable and call new create_range_type function.
* defs.h (enum val_prettyprint): Move enum from value.h to here
so we can avoid having to include value.h just for prototypes that
need the enum (thanks ANSI).
* dwarfread.c (struct_type): Local anonymous_size variable is
only used if !BITS_BIG_ENDIAN.
* dwarfread.c (decode_subscript_data_item): Add rangetype
variable and call new create_range_type function.
* elfread.c (elf_symfile_read): Remove unused dbx and text_sect
variables.
* eval.c (evaluate_subexp): Remove unused local variable name
and the statement with no side effects that initializes it.
* expprint.c (print_subexp): Change local_printstr to
LA_PRINT_STRING.
* gdbtypes.c (create_range_type): New function that creates
a range type using code fragments from object file readers as
an example of what has to be initialized.
* gdbtypes.c (create_array_type): Removed index_type, low_bound,
and high_bound parameters, replaced with a single range_type
parameter. Change function body to use passed in range_type
rather than handcrafting one.
* gdbtypes.h (create_range_type): Add prototype.
* gdbtypes.h (create_array_type): Change prototype parameters.
* infrun.c (normal_stop): Remove unused local variables tem and c.
* infrun.c (hook_stop_stub): Return 0 rather than random value.
* language.c (unk_lang_print_type, unk_lang_val_print): Add
stub functions that call error if called.
* language.c (unknown_language_defn, auto_language_defn,
local_language_defn): Add initializers unk_lang_print_type and
unk_lang_val_print.
* language.h (struct language_defn): Reformat for larger
comments, add la_print_type and la_val_print members. Add
LA_PRINT_TYPE and LA_VAL_PRINT macros. Change local_printchar
to LA_PRINT_CHAR and local_printstr to LA_PRINT_STRING.
* m2-lang.c (m2_create_fundamental_type): Remove unused local
variable nbytes.
* m2-lang.c (m2_language_defn): Add initializers m2_print_type
and m2_val_print.
* m2-lang.h (m2_print_type, m2_val_print): Add prototypes.
* main.c (execute_command): Remove unused local variable cmdlines.
* main.c (echo_command), stabsread.c (read_type), printcmd.c
(clear_displays), symmisc.c (block_depth), values.c
(clear_value_history):
Make testing of truth value of assignment result explicit.
* mipsread.c (upgrade_type): Update FIXME to include future use
of create_range_type.
* printcmd.c (ptype_command, ptype_eval, whatis_command,
whatis_exp, maintenance_print_type): Move prototypes and functions
to new typeprint.c.
* printcmd.c (_initialize_printcmd): Move add_com calls for
ptype_command and whatis_command to new typeprint.c.
* ser-bsd.c (serial_open): Remove unused variable sgttyb.
* source.c (find_source_lines): Local variable c only used
when LSEEK_NOT_LINEAR is defined.
* stabsread.c (read_array_type): Use new create_range_type
function.
* stabsread.c (read_range_type): Add new index_type variable and
call new create_range_type function rather than handcrafting
range types.
* symmisc.c (type_print_1): Change usages to LA_PRINT_TYPE.
* symtab.c (typedef_print usages): Use c_typedef_print, renamed.
* symtab.c (type_print_base usages): Use c_type_print_base.
* symtab.c (type_print_varspec_prefix usages): Use
c_type_print_varspec_prefix.
* symtab.c (type_print_method_args usages): Use
cp_type_print_method_args.
* valprint.c: Completely ripped apart and the fragments used
to create c-valprint.c, cp-valprint.c, m2-valprint.c, and
valprint.h. Remaining stuff is language independent.
* value.h (struct fn_field): Forward declare for prototypes.
* value.h (type_print_1): Remove prototype.
* value.h (enum val_prettyprint): Moved to defs.h.
* value.h (typedef_print): Prototype renamed to c_typedef_print.
* value.h (baseclass_offset): Add prototype.
**** start-sanitize-chill ****
* Makefile.in (SFILES_MAINDIR): Add ch-typeprint.c, ch-valprint.c.
* Makefile.in (OBS): Add ch-typeprint.o, ch-valprint.o.
* ch-typeprint.c: New file for language dependent type printing.
* ch-valprint.c: New file for language dependent value printing.
* ch-exp.y (parse_number): Remove prototype and stub function.
* ch-exp.y (decode_integer_literal): Removed unused digits and
temp variables.
* ch-exp.y (convert_float): Completely ifdef out for now.
* ch-exp.y (tokentab2, tokentab3, tokentab4, tokentab5),
ch-lang.c (chill_op_print_tab):
Change from ANSI-obsolescent "const static" to ANSI-conformant
"static const".
* ch-exp.y (yylex): Add unhandled storage class enumeration
literals to switch statement for completeness.
* ch-lang.c (chill_create_fundamental_types): Remove unused
nbytes variable. Change dummy type to 2 bytes to match int.
Handle FT_VOID types gratuituously added to chill DWARF by
compiler. Change FT_CHAR case to generate an TYPE_CODE_CHAR
type rather than a one byte TYPE_CODE_INT type.
* ch-lang.c (chill_language_defn): Add chill_print_type and
chill_val_print.
* ch-lang.h (chill_print_type, chill_val_print): Add prototypes.
**** end-sanitize-chill ****
1992-12-19 04:21:32 +08:00
|
|
|
|
printf_filtered ("Contains %d line%s.\n", s->nlines,
|
|
|
|
|
s->nlines == 1 ? "" : "s");
|
1991-03-29 00:26:26 +08:00
|
|
|
|
|
1997-06-28 14:10:06 +08:00
|
|
|
|
printf_filtered ("Source language is %s.\n", language_str (s->language));
|
|
|
|
|
printf_filtered ("Compiled with %s debugging format.\n", s->debugformat);
|
1991-03-29 00:26:26 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1994-04-16 05:55:49 +08:00
|
|
|
|
/* Open a file named STRING, searching path PATH (dir names sep by some char)
|
1991-03-29 00:26:26 +08:00
|
|
|
|
using mode MODE and protection bits PROT in the calls to open.
|
1993-05-26 11:27:32 +08:00
|
|
|
|
|
1991-03-29 00:26:26 +08:00
|
|
|
|
If TRY_CWD_FIRST, try to open ./STRING before searching PATH.
|
1993-05-26 11:27:32 +08:00
|
|
|
|
(ie pretend the first element of PATH is "."). This also indicates
|
|
|
|
|
that a slash in STRING disables searching of the path (this is
|
|
|
|
|
so that "exec-file ./foo" or "symbol-file ./foo" insures that you
|
|
|
|
|
get that particular version of foo or an error message).
|
|
|
|
|
|
1991-03-29 00:26:26 +08:00
|
|
|
|
If FILENAMED_OPENED is non-null, set it to a newly allocated string naming
|
|
|
|
|
the actual file opened (this string will always start with a "/". We
|
|
|
|
|
have to take special pains to avoid doubling the "/" between the directory
|
|
|
|
|
and the file, sigh! Emacs gets confuzzed by this when we print the
|
|
|
|
|
source file name!!!
|
|
|
|
|
|
|
|
|
|
If a file is found, return the descriptor.
|
|
|
|
|
Otherwise, return -1, with errno set for the last name we tried to open. */
|
|
|
|
|
|
|
|
|
|
/* >>>> This should only allow files of certain types,
|
|
|
|
|
>>>> eg executable, non-directory */
|
|
|
|
|
int
|
|
|
|
|
openp (path, try_cwd_first, string, mode, prot, filename_opened)
|
|
|
|
|
char *path;
|
|
|
|
|
int try_cwd_first;
|
|
|
|
|
char *string;
|
|
|
|
|
int mode;
|
|
|
|
|
int prot;
|
|
|
|
|
char **filename_opened;
|
|
|
|
|
{
|
|
|
|
|
register int fd;
|
|
|
|
|
register char *filename;
|
|
|
|
|
register char *p, *p1;
|
|
|
|
|
register int len;
|
|
|
|
|
int alloclen;
|
|
|
|
|
|
|
|
|
|
if (!path)
|
|
|
|
|
path = ".";
|
|
|
|
|
|
1997-06-28 14:10:06 +08:00
|
|
|
|
#ifdef WIN32
|
|
|
|
|
mode |= O_BINARY;
|
|
|
|
|
#endif
|
|
|
|
|
|
* configure.in: Check for unistd.h.
* configure: Regenerated.
* command.c, cp-valprint.c, fork-child.c, i386-tdep.c,
i386b-nat.c, inflow.c, main.c, maint.c, objfiles.c, solib.c,
source.c, stack.c, symfile.c, top.c, utils.c: Include strings.h
and/or unistd.h to bring prototypes into scope.
1995-08-01 06:46:03 +08:00
|
|
|
|
if (try_cwd_first || SLASH_P (string[0]))
|
1991-03-29 00:26:26 +08:00
|
|
|
|
{
|
* configure.in: Check for unistd.h.
* configure: Regenerated.
* command.c, cp-valprint.c, fork-child.c, i386-tdep.c,
i386b-nat.c, inflow.c, main.c, maint.c, objfiles.c, solib.c,
source.c, stack.c, symfile.c, top.c, utils.c: Include strings.h
and/or unistd.h to bring prototypes into scope.
1995-08-01 06:46:03 +08:00
|
|
|
|
int i;
|
1991-03-29 00:26:26 +08:00
|
|
|
|
filename = string;
|
|
|
|
|
fd = open (filename, mode, prot);
|
* configure.in: Check for unistd.h.
* configure: Regenerated.
* command.c, cp-valprint.c, fork-child.c, i386-tdep.c,
i386b-nat.c, inflow.c, main.c, maint.c, objfiles.c, solib.c,
source.c, stack.c, symfile.c, top.c, utils.c: Include strings.h
and/or unistd.h to bring prototypes into scope.
1995-08-01 06:46:03 +08:00
|
|
|
|
if (fd >= 0)
|
|
|
|
|
goto done;
|
|
|
|
|
for (i = 0; string[i]; i++)
|
1997-06-28 14:10:06 +08:00
|
|
|
|
if (SLASH_P (string[i]))
|
|
|
|
|
goto done;
|
1991-03-29 00:26:26 +08:00
|
|
|
|
}
|
|
|
|
|
|
1993-05-26 11:27:32 +08:00
|
|
|
|
/* ./foo => foo */
|
* configure.in: Check for unistd.h.
* configure: Regenerated.
* command.c, cp-valprint.c, fork-child.c, i386-tdep.c,
i386b-nat.c, inflow.c, main.c, maint.c, objfiles.c, solib.c,
source.c, stack.c, symfile.c, top.c, utils.c: Include strings.h
and/or unistd.h to bring prototypes into scope.
1995-08-01 06:46:03 +08:00
|
|
|
|
while (string[0] == '.' && SLASH_P (string[1]))
|
1993-05-26 11:27:32 +08:00
|
|
|
|
string += 2;
|
|
|
|
|
|
1991-03-29 00:26:26 +08:00
|
|
|
|
alloclen = strlen (path) + strlen (string) + 2;
|
|
|
|
|
filename = (char *) alloca (alloclen);
|
|
|
|
|
fd = -1;
|
|
|
|
|
for (p = path; p; p = p1 ? p1 + 1 : 0)
|
|
|
|
|
{
|
1994-04-16 05:55:49 +08:00
|
|
|
|
p1 = (char *) strchr (p, DIRNAME_SEPARATOR);
|
1991-03-29 00:26:26 +08:00
|
|
|
|
if (p1)
|
|
|
|
|
len = p1 - p;
|
|
|
|
|
else
|
|
|
|
|
len = strlen (p);
|
|
|
|
|
|
|
|
|
|
if (len == 4 && p[0] == '$' && p[1] == 'c'
|
1997-06-28 14:10:06 +08:00
|
|
|
|
&& p[2] == 'w' && p[3] == 'd') {
|
1991-03-29 00:26:26 +08:00
|
|
|
|
/* Name is $cwd -- insert current directory name instead. */
|
|
|
|
|
int newlen;
|
|
|
|
|
|
|
|
|
|
/* First, realloc the filename buffer if too short. */
|
|
|
|
|
len = strlen (current_directory);
|
|
|
|
|
newlen = len + strlen (string) + 2;
|
|
|
|
|
if (newlen > alloclen) {
|
|
|
|
|
alloclen = newlen;
|
|
|
|
|
filename = (char *) alloca (alloclen);
|
|
|
|
|
}
|
|
|
|
|
strcpy (filename, current_directory);
|
|
|
|
|
} else {
|
|
|
|
|
/* Normal file name in path -- just use it. */
|
|
|
|
|
strncpy (filename, p, len);
|
|
|
|
|
filename[len] = 0;
|
|
|
|
|
}
|
|
|
|
|
|
1992-06-21 11:09:18 +08:00
|
|
|
|
/* Remove trailing slashes */
|
* configure.in: Check for unistd.h.
* configure: Regenerated.
* command.c, cp-valprint.c, fork-child.c, i386-tdep.c,
i386b-nat.c, inflow.c, main.c, maint.c, objfiles.c, solib.c,
source.c, stack.c, symfile.c, top.c, utils.c: Include strings.h
and/or unistd.h to bring prototypes into scope.
1995-08-01 06:46:03 +08:00
|
|
|
|
while (len > 0 && SLASH_P (filename[len-1]))
|
1997-06-28 14:10:06 +08:00
|
|
|
|
filename[--len] = 0;
|
1992-06-21 11:09:18 +08:00
|
|
|
|
|
* configure.in: Check for unistd.h.
* configure: Regenerated.
* command.c, cp-valprint.c, fork-child.c, i386-tdep.c,
i386b-nat.c, inflow.c, main.c, maint.c, objfiles.c, solib.c,
source.c, stack.c, symfile.c, top.c, utils.c: Include strings.h
and/or unistd.h to bring prototypes into scope.
1995-08-01 06:46:03 +08:00
|
|
|
|
strcat (filename+len, SLASH_STRING);
|
1991-03-29 00:26:26 +08:00
|
|
|
|
strcat (filename, string);
|
|
|
|
|
|
1994-04-16 05:55:49 +08:00
|
|
|
|
fd = open (filename, mode);
|
1991-03-29 00:26:26 +08:00
|
|
|
|
if (fd >= 0) break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
done:
|
|
|
|
|
if (filename_opened)
|
1994-12-08 10:27:47 +08:00
|
|
|
|
{
|
|
|
|
|
if (fd < 0)
|
|
|
|
|
*filename_opened = (char *) 0;
|
* configure.in: Check for unistd.h.
* configure: Regenerated.
* command.c, cp-valprint.c, fork-child.c, i386-tdep.c,
i386b-nat.c, inflow.c, main.c, maint.c, objfiles.c, solib.c,
source.c, stack.c, symfile.c, top.c, utils.c: Include strings.h
and/or unistd.h to bring prototypes into scope.
1995-08-01 06:46:03 +08:00
|
|
|
|
else if (ROOTED_P (filename))
|
1994-12-08 10:27:47 +08:00
|
|
|
|
*filename_opened = savestring (filename, strlen (filename));
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
/* Beware the // my son, the Emacs barfs, the botch that catch... */
|
|
|
|
|
|
|
|
|
|
*filename_opened = concat (current_directory,
|
* configure.in: Check for unistd.h.
* configure: Regenerated.
* command.c, cp-valprint.c, fork-child.c, i386-tdep.c,
i386b-nat.c, inflow.c, main.c, maint.c, objfiles.c, solib.c,
source.c, stack.c, symfile.c, top.c, utils.c: Include strings.h
and/or unistd.h to bring prototypes into scope.
1995-08-01 06:46:03 +08:00
|
|
|
|
SLASH_CHAR
|
|
|
|
|
== current_directory[strlen(current_directory)-1]
|
|
|
|
|
? "": SLASH_STRING,
|
1994-12-08 10:27:47 +08:00
|
|
|
|
filename, NULL);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
#ifdef MPW
|
1995-04-08 17:59:02 +08:00
|
|
|
|
/* This is a debugging hack that can go away when all combinations
|
|
|
|
|
of Mac and Unix names are handled reasonably. */
|
|
|
|
|
{
|
|
|
|
|
extern int debug_openp;
|
|
|
|
|
|
|
|
|
|
if (debug_openp)
|
|
|
|
|
{
|
|
|
|
|
printf("openp on %s, path %s mode %d prot %d\n returned %d",
|
|
|
|
|
string, path, mode, prot, fd);
|
|
|
|
|
if (*filename_opened)
|
|
|
|
|
printf(" (filename is %s)", *filename_opened);
|
|
|
|
|
printf("\n");
|
|
|
|
|
}
|
1994-12-08 10:27:47 +08:00
|
|
|
|
}
|
* configure.in: Check for unistd.h.
* configure: Regenerated.
* command.c, cp-valprint.c, fork-child.c, i386-tdep.c,
i386b-nat.c, inflow.c, main.c, maint.c, objfiles.c, solib.c,
source.c, stack.c, symfile.c, top.c, utils.c: Include strings.h
and/or unistd.h to bring prototypes into scope.
1995-08-01 06:46:03 +08:00
|
|
|
|
#endif /* MPW */
|
1991-03-29 00:26:26 +08:00
|
|
|
|
|
|
|
|
|
return fd;
|
|
|
|
|
}
|
|
|
|
|
|
1994-12-08 10:27:47 +08:00
|
|
|
|
/* Open a source file given a symtab S. Returns a file descriptor or
|
|
|
|
|
negative number for error. */
|
1992-03-15 09:09:14 +08:00
|
|
|
|
|
|
|
|
|
static int
|
1991-03-29 00:26:26 +08:00
|
|
|
|
open_source_file (s)
|
|
|
|
|
struct symtab *s;
|
|
|
|
|
{
|
|
|
|
|
char *path = source_path;
|
|
|
|
|
char *p;
|
|
|
|
|
int result;
|
1992-03-15 09:09:14 +08:00
|
|
|
|
char *fullname;
|
1991-03-29 00:26:26 +08:00
|
|
|
|
|
|
|
|
|
/* Quick way out if we already know its full name */
|
|
|
|
|
if (s->fullname)
|
|
|
|
|
{
|
1998-04-09 07:58:10 +08:00
|
|
|
|
result = open (s->fullname, OPEN_MODE);
|
1991-03-29 00:26:26 +08:00
|
|
|
|
if (result >= 0)
|
|
|
|
|
return result;
|
|
|
|
|
/* Didn't work -- free old one, try again. */
|
1992-03-15 09:09:14 +08:00
|
|
|
|
mfree (s->objfile->md, s->fullname);
|
1991-03-29 00:26:26 +08:00
|
|
|
|
s->fullname = NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (s->dirname != NULL)
|
|
|
|
|
{
|
|
|
|
|
/* Replace a path entry of $cdir with the compilation directory name */
|
|
|
|
|
#define cdir_len 5
|
1991-09-19 10:40:29 +08:00
|
|
|
|
/* We cast strstr's result in case an ANSIhole has made it const,
|
|
|
|
|
which produces a "required warning" when assigned to a nonconst. */
|
|
|
|
|
p = (char *)strstr (source_path, "$cdir");
|
1994-04-16 05:55:49 +08:00
|
|
|
|
if (p && (p == path || p[-1] == DIRNAME_SEPARATOR)
|
1994-12-08 10:27:47 +08:00
|
|
|
|
&& (p[cdir_len] == DIRNAME_SEPARATOR || p[cdir_len] == '\0'))
|
|
|
|
|
{
|
|
|
|
|
int len;
|
|
|
|
|
|
|
|
|
|
path = (char *)
|
|
|
|
|
alloca (strlen (source_path) + 1 + strlen (s->dirname) + 1);
|
|
|
|
|
len = p - source_path;
|
|
|
|
|
strncpy (path, source_path, len); /* Before $cdir */
|
|
|
|
|
strcpy (path + len, s->dirname); /* new stuff */
|
|
|
|
|
strcat (path + len, source_path + len + cdir_len); /* After $cdir */
|
|
|
|
|
}
|
1991-03-29 00:26:26 +08:00
|
|
|
|
}
|
|
|
|
|
|
1998-04-09 07:58:10 +08:00
|
|
|
|
result = openp (path, 0, s->filename, OPEN_MODE, 0, &s->fullname);
|
1992-03-15 09:09:14 +08:00
|
|
|
|
if (result < 0)
|
|
|
|
|
{
|
|
|
|
|
/* Didn't work. Try using just the basename. */
|
|
|
|
|
p = basename (s->filename);
|
|
|
|
|
if (p != s->filename)
|
1998-04-09 07:58:10 +08:00
|
|
|
|
result = openp (path, 0, p, OPEN_MODE, 0, &s->fullname);
|
1992-03-15 09:09:14 +08:00
|
|
|
|
}
|
1994-12-08 10:27:47 +08:00
|
|
|
|
#ifdef MPW
|
|
|
|
|
if (result < 0)
|
|
|
|
|
{
|
|
|
|
|
/* Didn't work. Try using just the MPW basename. */
|
|
|
|
|
p = (char *) mpw_basename (s->filename);
|
|
|
|
|
if (p != s->filename)
|
1998-04-09 07:58:10 +08:00
|
|
|
|
result = openp (path, 0, p, OPEN_MODE, 0, &s->fullname);
|
1994-12-08 10:27:47 +08:00
|
|
|
|
}
|
|
|
|
|
if (result < 0)
|
|
|
|
|
{
|
|
|
|
|
/* Didn't work. Try using the mixed Unix/MPW basename. */
|
|
|
|
|
p = (char *) mpw_mixed_basename (s->filename);
|
|
|
|
|
if (p != s->filename)
|
1998-04-09 07:58:10 +08:00
|
|
|
|
result = openp (path, 0, p, OPEN_MODE, 0, &s->fullname);
|
1994-12-08 10:27:47 +08:00
|
|
|
|
}
|
1995-04-08 17:59:02 +08:00
|
|
|
|
#endif /* MPW */
|
* configure.in: Check for unistd.h.
* configure: Regenerated.
* command.c, cp-valprint.c, fork-child.c, i386-tdep.c,
i386b-nat.c, inflow.c, main.c, maint.c, objfiles.c, solib.c,
source.c, stack.c, symfile.c, top.c, utils.c: Include strings.h
and/or unistd.h to bring prototypes into scope.
1995-08-01 06:46:03 +08:00
|
|
|
|
|
1992-03-15 09:09:14 +08:00
|
|
|
|
if (result >= 0)
|
|
|
|
|
{
|
1994-04-16 05:55:49 +08:00
|
|
|
|
fullname = s->fullname;
|
|
|
|
|
s->fullname = mstrsave (s->objfile->md, s->fullname);
|
1992-03-15 09:09:14 +08:00
|
|
|
|
free (fullname);
|
|
|
|
|
}
|
|
|
|
|
return result;
|
1991-03-29 00:26:26 +08:00
|
|
|
|
}
|
|
|
|
|
|
1994-12-08 10:27:47 +08:00
|
|
|
|
/* Return the path to the source file associated with symtab. Returns NULL
|
|
|
|
|
if no symtab. */
|
|
|
|
|
|
|
|
|
|
char *
|
|
|
|
|
symtab_to_filename (s)
|
|
|
|
|
struct symtab *s;
|
|
|
|
|
{
|
|
|
|
|
int fd;
|
|
|
|
|
|
|
|
|
|
if (!s)
|
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
|
|
/* If we've seen the file before, just return fullname. */
|
|
|
|
|
|
|
|
|
|
if (s->fullname)
|
|
|
|
|
return s->fullname;
|
|
|
|
|
|
|
|
|
|
/* Try opening the file to setup fullname */
|
|
|
|
|
|
|
|
|
|
fd = open_source_file (s);
|
|
|
|
|
if (fd < 0)
|
|
|
|
|
return s->filename; /* File not found. Just use short name */
|
|
|
|
|
|
|
|
|
|
/* Found the file. Cleanup and return the full name */
|
|
|
|
|
|
|
|
|
|
close (fd);
|
|
|
|
|
return s->fullname;
|
|
|
|
|
}
|
|
|
|
|
|
1991-03-29 00:26:26 +08:00
|
|
|
|
|
|
|
|
|
/* Create and initialize the table S->line_charpos that records
|
|
|
|
|
the positions of the lines in the source file, which is assumed
|
|
|
|
|
to be open on descriptor DESC.
|
|
|
|
|
All set S->nlines to the number of such lines. */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
find_source_lines (s, desc)
|
|
|
|
|
struct symtab *s;
|
|
|
|
|
int desc;
|
|
|
|
|
{
|
|
|
|
|
struct stat st;
|
|
|
|
|
register char *data, *p, *end;
|
|
|
|
|
int nlines = 0;
|
|
|
|
|
int lines_allocated = 1000;
|
1992-03-15 09:09:14 +08:00
|
|
|
|
int *line_charpos;
|
1997-06-28 14:10:06 +08:00
|
|
|
|
long mtime;
|
1992-06-21 11:09:18 +08:00
|
|
|
|
int size;
|
1991-03-29 00:26:26 +08:00
|
|
|
|
|
1992-03-15 09:09:14 +08:00
|
|
|
|
line_charpos = (int *) xmmalloc (s -> objfile -> md,
|
|
|
|
|
lines_allocated * sizeof (int));
|
1991-03-29 00:26:26 +08:00
|
|
|
|
if (fstat (desc, &st) < 0)
|
1994-12-08 10:27:47 +08:00
|
|
|
|
perror_with_name (s->filename);
|
1992-03-15 09:09:14 +08:00
|
|
|
|
|
1997-06-28 14:10:06 +08:00
|
|
|
|
if (s && s->objfile && s->objfile->obfd)
|
1994-12-08 10:27:47 +08:00
|
|
|
|
{
|
1997-06-28 14:10:06 +08:00
|
|
|
|
mtime = bfd_get_mtime(s->objfile->obfd);
|
|
|
|
|
if (mtime && mtime < st.st_mtime)
|
|
|
|
|
printf_filtered ("Source file is more recent than executable.\n");
|
|
|
|
|
}
|
|
|
|
|
else if (exec_bfd)
|
|
|
|
|
{
|
|
|
|
|
mtime = bfd_get_mtime(exec_bfd);
|
|
|
|
|
if (mtime && mtime < st.st_mtime)
|
1994-12-08 10:27:47 +08:00
|
|
|
|
printf_filtered ("Source file is more recent than executable.\n");
|
|
|
|
|
}
|
1991-03-29 00:26:26 +08:00
|
|
|
|
|
1992-11-06 17:21:13 +08:00
|
|
|
|
#ifdef LSEEK_NOT_LINEAR
|
1994-12-08 10:27:47 +08:00
|
|
|
|
{
|
|
|
|
|
char c;
|
1992-11-06 17:21:13 +08:00
|
|
|
|
|
1994-12-08 10:27:47 +08:00
|
|
|
|
/* Have to read it byte by byte to find out where the chars live */
|
1992-06-21 11:09:18 +08:00
|
|
|
|
|
1997-06-28 14:10:06 +08:00
|
|
|
|
line_charpos[0] = lseek (desc, 0, SEEK_CUR);
|
1994-12-08 10:27:47 +08:00
|
|
|
|
nlines = 1;
|
|
|
|
|
while (myread(desc, &c, 1)>0)
|
|
|
|
|
{
|
|
|
|
|
if (c == '\n')
|
|
|
|
|
{
|
|
|
|
|
if (nlines == lines_allocated)
|
|
|
|
|
{
|
|
|
|
|
lines_allocated *= 2;
|
|
|
|
|
line_charpos =
|
|
|
|
|
(int *) xmrealloc (s -> objfile -> md, (char *) line_charpos,
|
|
|
|
|
sizeof (int) * lines_allocated);
|
|
|
|
|
}
|
1997-06-28 14:10:06 +08:00
|
|
|
|
line_charpos[nlines++] = lseek (desc, 0, SEEK_CUR);
|
1994-12-08 10:27:47 +08:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
#else /* lseek linear. */
|
1992-11-06 17:21:13 +08:00
|
|
|
|
{
|
1994-12-08 10:27:47 +08:00
|
|
|
|
struct cleanup *old_cleanups;
|
|
|
|
|
|
|
|
|
|
/* st_size might be a large type, but we only support source files whose
|
|
|
|
|
size fits in an int. */
|
|
|
|
|
size = (int) st.st_size;
|
|
|
|
|
|
|
|
|
|
/* Use malloc, not alloca, because this may be pretty large, and we may
|
|
|
|
|
run into various kinds of limits on stack size. */
|
|
|
|
|
data = (char *) xmalloc (size);
|
|
|
|
|
old_cleanups = make_cleanup (free, data);
|
|
|
|
|
|
1997-06-28 14:10:06 +08:00
|
|
|
|
/* Reassign `size' to result of read for systems where \r\n -> \n. */
|
|
|
|
|
size = myread (desc, data, size);
|
|
|
|
|
if (size < 0)
|
1994-12-08 10:27:47 +08:00
|
|
|
|
perror_with_name (s->filename);
|
|
|
|
|
end = data + size;
|
|
|
|
|
p = data;
|
|
|
|
|
line_charpos[0] = 0;
|
|
|
|
|
nlines = 1;
|
|
|
|
|
while (p != end)
|
1992-11-06 17:21:13 +08:00
|
|
|
|
{
|
1994-12-08 10:27:47 +08:00
|
|
|
|
if (*p++ == '\n'
|
|
|
|
|
/* A newline at the end does not start a new line. */
|
|
|
|
|
&& p != end)
|
|
|
|
|
{
|
|
|
|
|
if (nlines == lines_allocated)
|
|
|
|
|
{
|
|
|
|
|
lines_allocated *= 2;
|
|
|
|
|
line_charpos =
|
|
|
|
|
(int *) xmrealloc (s -> objfile -> md, (char *) line_charpos,
|
|
|
|
|
sizeof (int) * lines_allocated);
|
|
|
|
|
}
|
|
|
|
|
line_charpos[nlines++] = p - data;
|
|
|
|
|
}
|
1992-11-06 17:21:13 +08:00
|
|
|
|
}
|
1994-12-08 10:27:47 +08:00
|
|
|
|
do_cleanups (old_cleanups);
|
1992-11-06 17:21:13 +08:00
|
|
|
|
}
|
1994-12-08 10:27:47 +08:00
|
|
|
|
#endif /* lseek linear. */
|
1991-03-29 00:26:26 +08:00
|
|
|
|
s->nlines = nlines;
|
1992-03-15 09:09:14 +08:00
|
|
|
|
s->line_charpos =
|
1992-11-06 17:21:13 +08:00
|
|
|
|
(int *) xmrealloc (s -> objfile -> md, (char *) line_charpos,
|
|
|
|
|
nlines * sizeof (int));
|
|
|
|
|
|
1991-03-29 00:26:26 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Return the character position of a line LINE in symtab S.
|
|
|
|
|
Return 0 if anything is invalid. */
|
|
|
|
|
|
1992-03-15 09:09:14 +08:00
|
|
|
|
#if 0 /* Currently unused */
|
|
|
|
|
|
1991-03-29 00:26:26 +08:00
|
|
|
|
int
|
|
|
|
|
source_line_charpos (s, line)
|
|
|
|
|
struct symtab *s;
|
|
|
|
|
int line;
|
|
|
|
|
{
|
|
|
|
|
if (!s) return 0;
|
|
|
|
|
if (!s->line_charpos || line <= 0) return 0;
|
|
|
|
|
if (line > s->nlines)
|
|
|
|
|
line = s->nlines;
|
|
|
|
|
return s->line_charpos[line - 1];
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Return the line number of character position POS in symtab S. */
|
|
|
|
|
|
|
|
|
|
int
|
|
|
|
|
source_charpos_line (s, chr)
|
|
|
|
|
register struct symtab *s;
|
|
|
|
|
register int chr;
|
|
|
|
|
{
|
|
|
|
|
register int line = 0;
|
|
|
|
|
register int *lnp;
|
|
|
|
|
|
|
|
|
|
if (s == 0 || s->line_charpos == 0) return 0;
|
|
|
|
|
lnp = s->line_charpos;
|
|
|
|
|
/* Files are usually short, so sequential search is Ok */
|
|
|
|
|
while (line < s->nlines && *lnp <= chr)
|
|
|
|
|
{
|
|
|
|
|
line++;
|
|
|
|
|
lnp++;
|
|
|
|
|
}
|
|
|
|
|
if (line >= s->nlines)
|
|
|
|
|
line = s->nlines;
|
|
|
|
|
return line;
|
|
|
|
|
}
|
1992-03-15 09:09:14 +08:00
|
|
|
|
|
|
|
|
|
#endif /* 0 */
|
|
|
|
|
|
1991-03-29 00:26:26 +08:00
|
|
|
|
|
|
|
|
|
/* Get full pathname and line number positions for a symtab.
|
|
|
|
|
Return nonzero if line numbers may have changed.
|
|
|
|
|
Set *FULLNAME to actual name of the file as found by `openp',
|
|
|
|
|
or to 0 if the file is not found. */
|
|
|
|
|
|
1992-03-15 09:09:14 +08:00
|
|
|
|
static int
|
1991-03-29 00:26:26 +08:00
|
|
|
|
get_filename_and_charpos (s, fullname)
|
|
|
|
|
struct symtab *s;
|
|
|
|
|
char **fullname;
|
|
|
|
|
{
|
|
|
|
|
register int desc, linenums_changed = 0;
|
|
|
|
|
|
|
|
|
|
desc = open_source_file (s);
|
|
|
|
|
if (desc < 0)
|
|
|
|
|
{
|
|
|
|
|
if (fullname)
|
|
|
|
|
*fullname = NULL;
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
if (fullname)
|
|
|
|
|
*fullname = s->fullname;
|
|
|
|
|
if (s->line_charpos == 0) linenums_changed = 1;
|
|
|
|
|
if (linenums_changed) find_source_lines (s, desc);
|
|
|
|
|
close (desc);
|
|
|
|
|
return linenums_changed;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Print text describing the full name of the source file S
|
|
|
|
|
and the line number LINE and its corresponding character position.
|
|
|
|
|
The text starts with two Ctrl-z so that the Emacs-GDB interface
|
|
|
|
|
can easily find it.
|
|
|
|
|
|
|
|
|
|
MID_STATEMENT is nonzero if the PC is not at the beginning of that line.
|
|
|
|
|
|
|
|
|
|
Return 1 if successful, 0 if could not find the file. */
|
|
|
|
|
|
|
|
|
|
int
|
1993-05-26 11:27:32 +08:00
|
|
|
|
identify_source_line (s, line, mid_statement, pc)
|
1991-03-29 00:26:26 +08:00
|
|
|
|
struct symtab *s;
|
|
|
|
|
int line;
|
|
|
|
|
int mid_statement;
|
1993-05-26 11:27:32 +08:00
|
|
|
|
CORE_ADDR pc;
|
1991-03-29 00:26:26 +08:00
|
|
|
|
{
|
|
|
|
|
if (s->line_charpos == 0)
|
|
|
|
|
get_filename_and_charpos (s, (char **)NULL);
|
|
|
|
|
if (s->fullname == 0)
|
|
|
|
|
return 0;
|
1993-07-12 11:42:35 +08:00
|
|
|
|
if (line > s->nlines)
|
|
|
|
|
/* Don't index off the end of the line_charpos array. */
|
|
|
|
|
return 0;
|
gcc -Wall lint:
* breakpoint.c (watchpoint_check): Remove unused variable b.
* stack.c (print_frame_info): Move sp and buf inside #if.
* eval.c (evaluate_subexp): Remove unused variables pp,
mangle_ptr, ptr, and mangle_tstr.
* valarith.c (value_x_binop): Remove unused variables mangle_tstr
and mangle_ptr.
* symtab.c (lookup_symtab): Put variable copy inside #if.
(decode_line_1): Put variable q1 inside #if 0.
* target.h: Declare target_link.
* infrun.c (wait_for_inferior): Remove unused variables signame.
* remote.c (remote_resume): Remove unused variable name.
* c-exp.y (parse_number): Parenthesize operand of shift.
* dbxread.c (record_minimal_symbol): Parenthesize operand of &&
(this is a semantic change, the warning seems to have detected a bug).
* dbxread.c (end_psymtab): Move variable p1 inside #if.
* coffread.c: Move variable temptype inside #if.
* ch-typeprint.c (chill_type_print_base): Remove unused variable
name.
* ch-valprint.c: #include typeprint.h and ch-lang.h.
(chill_val_print): Remove unused variable in_range.
(chill_val_print): Remove statement "length > TYPE_LENGTH (type);".
(chill_val_print): Add default case for switch.
* stabsread.h: Declare stabsect_build_psymtabs.
* os9kread.c (read_minimal_symbols): Make this return void.
(os9k_symfile_read): Remove unused variables stb_exist and val.
(os9k_symfile_init): Remove unused variable val.
(fill_sym): Remove unused variable id.
(read_os9k_psymtab): Put variable back_to inside #if 0. Remove
unused variable nsl.
Remove unused variable symfile_bfd.
#if 0 unused variables lbrac_unmatched_complaint and
lbrac_mismatch_complaint.
Remove declaration for non-existent function os9k_next_symbol_text.
* annotate.c, annotate.h: New files, containing a function for
each annotation which outputs it.
* Move breakpoints_changed from breakpoint.c to annotate.c.
* breakpoint.c, blockframe.c, infrun.c, cp-valprint.c, main.c,
printcmd.c, source.c, stack.c, utils.c, valprint.c:
Use annotate.c functions to output annotations.
* Makefile.in (OBS): Add annotate.o.
1994-05-14 02:18:57 +08:00
|
|
|
|
annotate_source (s->fullname, line, s->line_charpos[line - 1],
|
|
|
|
|
mid_statement, pc);
|
|
|
|
|
|
1991-03-29 00:26:26 +08:00
|
|
|
|
current_source_line = line;
|
|
|
|
|
first_line_listed = line;
|
|
|
|
|
last_line_listed = line;
|
|
|
|
|
current_source_symtab = s;
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Print source lines from the file of symtab S,
|
|
|
|
|
starting with line number LINE and stopping before line number STOPLINE. */
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
print_source_lines (s, line, stopline, noerror)
|
|
|
|
|
struct symtab *s;
|
|
|
|
|
int line, stopline;
|
|
|
|
|
int noerror;
|
|
|
|
|
{
|
|
|
|
|
register int c;
|
|
|
|
|
register int desc;
|
|
|
|
|
register FILE *stream;
|
|
|
|
|
int nlines = stopline - line;
|
|
|
|
|
|
|
|
|
|
/* Regardless of whether we can open the file, set current_source_symtab. */
|
|
|
|
|
current_source_symtab = s;
|
|
|
|
|
current_source_line = line;
|
|
|
|
|
first_line_listed = line;
|
|
|
|
|
|
|
|
|
|
desc = open_source_file (s);
|
|
|
|
|
if (desc < 0)
|
|
|
|
|
{
|
|
|
|
|
if (! noerror) {
|
|
|
|
|
char *name = alloca (strlen (s->filename) + 100);
|
|
|
|
|
sprintf (name, "%s:%d", s->filename, line);
|
|
|
|
|
print_sys_errmsg (name, errno);
|
|
|
|
|
}
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (s->line_charpos == 0)
|
|
|
|
|
find_source_lines (s, desc);
|
|
|
|
|
|
|
|
|
|
if (line < 1 || line > s->nlines)
|
|
|
|
|
{
|
|
|
|
|
close (desc);
|
|
|
|
|
error ("Line number %d out of range; %s has %d lines.",
|
|
|
|
|
line, s->filename, s->nlines);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (lseek (desc, s->line_charpos[line - 1], 0) < 0)
|
|
|
|
|
{
|
|
|
|
|
close (desc);
|
|
|
|
|
perror_with_name (s->filename);
|
|
|
|
|
}
|
|
|
|
|
|
1998-04-09 07:58:10 +08:00
|
|
|
|
stream = fdopen (desc, FDOPEN_MODE);
|
1991-03-29 00:26:26 +08:00
|
|
|
|
clearerr (stream);
|
|
|
|
|
|
|
|
|
|
while (nlines-- > 0)
|
|
|
|
|
{
|
|
|
|
|
c = fgetc (stream);
|
|
|
|
|
if (c == EOF) break;
|
|
|
|
|
last_line_listed = current_source_line;
|
|
|
|
|
printf_filtered ("%d\t", current_source_line++);
|
|
|
|
|
do
|
|
|
|
|
{
|
1992-11-06 17:21:13 +08:00
|
|
|
|
if (c < 040 && c != '\t' && c != '\n' && c != '\r')
|
1991-03-29 00:26:26 +08:00
|
|
|
|
printf_filtered ("^%c", c + 0100);
|
|
|
|
|
else if (c == 0177)
|
|
|
|
|
printf_filtered ("^?");
|
1998-04-09 07:58:10 +08:00
|
|
|
|
#ifdef CRLF_SOURCE_FILES
|
|
|
|
|
else if (c == '\r')
|
|
|
|
|
{
|
|
|
|
|
/* Just skip \r characters. */
|
|
|
|
|
}
|
|
|
|
|
#endif
|
1991-03-29 00:26:26 +08:00
|
|
|
|
else
|
|
|
|
|
printf_filtered ("%c", c);
|
|
|
|
|
} while (c != '\n' && (c = fgetc (stream)) >= 0);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
fclose (stream);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1994-12-08 10:27:47 +08:00
|
|
|
|
/* Print a list of files and line numbers which a user may choose from
|
|
|
|
|
in order to list a function which was specified ambiguously (as with
|
|
|
|
|
`list classname::overloadedfuncname', for example). The vector in
|
|
|
|
|
SALS provides the filenames and line numbers. */
|
|
|
|
|
|
1991-03-29 00:26:26 +08:00
|
|
|
|
static void
|
|
|
|
|
ambiguous_line_spec (sals)
|
|
|
|
|
struct symtabs_and_lines *sals;
|
|
|
|
|
{
|
|
|
|
|
int i;
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < sals->nelts; ++i)
|
1992-06-21 11:09:18 +08:00
|
|
|
|
printf_filtered("file: \"%s\", line number: %d\n",
|
|
|
|
|
sals->sals[i].symtab->filename, sals->sals[i].line);
|
1991-03-29 00:26:26 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
list_command (arg, from_tty)
|
|
|
|
|
char *arg;
|
|
|
|
|
int from_tty;
|
|
|
|
|
{
|
|
|
|
|
struct symtabs_and_lines sals, sals_end;
|
|
|
|
|
struct symtab_and_line sal, sal_end;
|
|
|
|
|
struct symbol *sym;
|
|
|
|
|
char *arg1;
|
|
|
|
|
int no_end = 1;
|
|
|
|
|
int dummy_end = 0;
|
|
|
|
|
int dummy_beg = 0;
|
|
|
|
|
int linenum_beg = 0;
|
|
|
|
|
char *p;
|
|
|
|
|
|
1992-03-15 09:09:14 +08:00
|
|
|
|
if (!have_full_symbols () && !have_partial_symbols())
|
1991-08-14 09:11:20 +09:00
|
|
|
|
error ("No symbol table is loaded. Use the \"file\" command.");
|
1991-03-29 00:26:26 +08:00
|
|
|
|
|
|
|
|
|
/* Pull in a current source symtab if necessary */
|
|
|
|
|
if (current_source_symtab == 0 &&
|
|
|
|
|
(arg == 0 || arg[0] == '+' || arg[0] == '-'))
|
|
|
|
|
select_source_symtab (0);
|
|
|
|
|
|
|
|
|
|
/* "l" or "l +" lists next ten lines. */
|
|
|
|
|
|
* defs.h (STRCMP, STREQ, STREQN): New macros.
* defs.h (demangle_and_match): Remove prototype.
* dwarfread.c (STREQ, STREQN): Remove macros, replaced with STREQ
and STREQN defined in defs.h.
* dwarfread.c (set_cu_language): For completely unknown languages,
try to deduce the language from the filename. Retain behavior
that for known languages we don't know how to handle, we use
language_unknown.
* dwarfread.c (enum_type, symthesize_typedef): Initialize language
and demangled name fields in symbol.
* dwarfread.c, mipsread.c, partial-stab.h: For all usages of
ADD_PSYMBOL_TO_LIST, add language and objfile parameters.
* dwarfread.c (new_symbol): Attempt to demangle C++ symbol names
and cache the results in SYMBOL_DEMANGLED_NAME for the symbol.
* elfread.c (STREQ): Remove macro, use STREQ defined in defs.h.
Replace usages throughout.
* elfread.c (demangle.h): Include.
* elfread.c (record_minimal_symbol): Remove prototype and function.
* gdbtypes.h, symtab.h (B_SET, B_CLR, B_TST, B_TYPE, B_BYTES,
B_CLRALL): Moved from symtab.h to gdbtypes.h.
* infcmd.c (jump_command): Remove code to demangle name and add
it to a cleanup list. Now just use SYMBOL_DEMANGLED_NAME.
* minsyms.c (demangle.h): Include.
* minsyms.c (lookup_minimal_symbol): Indent comment to match code.
* minsyms.c (install_minimal_symbols): Attempt to demangle symbol
names as C++ names, and cache them in SYMBOL_DEMANGLED_NAME.
* mipsread.c (psymtab_language): Add static variable.
* stabsread.c (demangle.h): Include.
* stabsread.c (define_symbol): Attempt to demangle C++ symbol
names and cache them in the SYMBOL_DEMANGLED_NAME field.
* stack.c (return_command): Remove explicit demangling of name
and use of cleanups. Just use SYMBOL_DEMANGLED_NAME.
* symfile.c (demangle.h): Include.
* symfile.c (add_psymbol_to_list, add_psymbol_addr_to_list): Fix
to match macros in symfile.h and allow them to be compiled
if INLINE_ADD_PSYMBOL is not true.
* symfile.h (INLINE_ADD_PSYMBOL): Default to true if not set.
* symfile.h (ADD_PSYMBOL_*): Add language and objfile parameters.
Add code to demangle and cache C++ symbol names. Use macro form
if INLINE_ADD_PSYMBOL is true, otherwise use C function form.
* symmisc.c (add_psymbol_to_list, add_psymbol_addr_to_list):
Remove, also defined in symfile.c, which we already fixed.
* symtab.c (expensive_mangler): Remove prototype and function.
* symtab.c (find_methods): Remove physnames parameter and fix
prototype to match.
* symtab.c (completion_list_add_symbol): Name changed to
completion_list_add_name.
* symtab.c (COMPLETION_LIST_ADD_SYMBOL): New macro, adds both
the normal symbol name and the cached C++ demangled name.
* symtab.c (lookup_demangled_partial_symbol,
lookup_demangled_block_symbol): Remove prototypes and functions.
* symtab.c (lookup_symbol): Remove use of expensive_mangler,
use lookup_block_symbol instead of lookup_demangled_block_symbol.
Remove code to try demangling names and matching them.
* symtab.c (lookup_partial_symbol, lookup_block_symbol):
Fix to try matching the cached demangled name if no match is
found using the regular symbol name.
* symtab.c (find_methods): Remove unused physnames array.
* symtab.c (name_match, NAME_MATCH): Remove function and macro,
replaced with SYMBOL_MATCHES_REGEXP from symtab.h.
* symtab.c (completion_list_add_symbol): Rewrite to use cached
C++ demangled symbol names.
* symtab.h: Much reformatting of structures and such to add
whitespace to make them more readable, and make them more
consistent with other gdb structure definitions.
* symtab.h (general_symbol_info): New struct containing fields
common to all symbols.
* symtab.h (SYMBOL_LANGUAGE, SYMBOL_DEMANGLED_NAME,
SYMBOL_SOURCE_NAME, SYMBOL_LINKAGE_NAME, SYMBOL_MATCHES_NAME,
SYMBOL_MATCHES_REGEXP, MSYMBOL_INFO, MSYMBOL_TYPE): New macros.
* symtab. (struct minimal_symbol, struct partial_symbol, struct
symbol): Use general_symbol_info struct.
* utils.c (demangle_and_match): Remove, no longer used.
* valops.c (demangle.h): Include.
* xcoffexec.c (eq): Remove macro, replace usages with STREQ.
* blockframe.c, breakpoint.c, c-exp.y, c-valprint.c, dbxread.c,
infcmd.c, m2-exp.y, minsyms.c, objfiles.h, solib.c, stack.c,
symmisc.c, symtab.c, valops.c: Replace references to minimal
symbol fields with appropriate macros.
* breakpoint.c, buildsym.c, c-exp.y, c-typeprint.c, c-valprint.c,
coffread.c, command.c, convex-tdep.c, cp-valprint.c, dbxread.c,
demangle.c, elfread.c, energize.c, environ.c, exec.c,
gdbtypes.c, i960-tdep.c, infrun.c, infrun-hacked.c, language.c,
main.c, minsyms.c, mipsread.c, partial-stab.h, remote-es1800.c,
remote-nindy.c, remote-udi.c, rs6000-tdep.c, solib.c, source.c,
sparc-pinsn.c, stabsread.c, standalone.c, state.c, stuff.c,
symfile.c, symmisc.c, symtab.c, symtab.h, tm-sysv4.h,
tm-ultra3.h, values.c, xcoffexec.c, xcoffread.c: Replace strcmp
and strncmp usages with STREQ, STREQN, or STRCMP as appropriate.
* breakpoint.c, buildsym.c, c-typeprint.c, expprint.c, findvar.c,
mipsread.c, printcmd.c, source.c, stabsread.c, stack.c,
symmisc.c, tm-29k.h, valops.c, values.c: Replace SYMBOL_NAME
references with SYMBOL_SOURCE_NAME or SYMBOL_LINKAGE_NAME as
appropriate.
* buildsym.c (start_subfile, patch_subfile_names): Default the
source language to what can be deduced from the filename.
* buildsym.c (end_symtab): Update the source language in the
allocated symtab to match what we have been using.
* buildsym.h (struct subfile): Add a language field.
* c-typeprint.c (c_print_type): Remove code to do explicit
demangling.
* dbxread.c (psymtab_language): Add static variable.
* dbxread.c (start_psymtab): Initialize psymtab_language using
deduce_language_from_filename.
1992-12-23 14:34:57 +08:00
|
|
|
|
if (arg == 0 || STREQ (arg, "+"))
|
1991-03-29 00:26:26 +08:00
|
|
|
|
{
|
|
|
|
|
if (current_source_symtab == 0)
|
|
|
|
|
error ("No default source file yet. Do \"help list\".");
|
|
|
|
|
print_source_lines (current_source_symtab, current_source_line,
|
1991-09-19 10:40:29 +08:00
|
|
|
|
current_source_line + lines_to_list, 0);
|
1991-03-29 00:26:26 +08:00
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* "l -" lists previous ten lines, the ones before the ten just listed. */
|
* defs.h (STRCMP, STREQ, STREQN): New macros.
* defs.h (demangle_and_match): Remove prototype.
* dwarfread.c (STREQ, STREQN): Remove macros, replaced with STREQ
and STREQN defined in defs.h.
* dwarfread.c (set_cu_language): For completely unknown languages,
try to deduce the language from the filename. Retain behavior
that for known languages we don't know how to handle, we use
language_unknown.
* dwarfread.c (enum_type, symthesize_typedef): Initialize language
and demangled name fields in symbol.
* dwarfread.c, mipsread.c, partial-stab.h: For all usages of
ADD_PSYMBOL_TO_LIST, add language and objfile parameters.
* dwarfread.c (new_symbol): Attempt to demangle C++ symbol names
and cache the results in SYMBOL_DEMANGLED_NAME for the symbol.
* elfread.c (STREQ): Remove macro, use STREQ defined in defs.h.
Replace usages throughout.
* elfread.c (demangle.h): Include.
* elfread.c (record_minimal_symbol): Remove prototype and function.
* gdbtypes.h, symtab.h (B_SET, B_CLR, B_TST, B_TYPE, B_BYTES,
B_CLRALL): Moved from symtab.h to gdbtypes.h.
* infcmd.c (jump_command): Remove code to demangle name and add
it to a cleanup list. Now just use SYMBOL_DEMANGLED_NAME.
* minsyms.c (demangle.h): Include.
* minsyms.c (lookup_minimal_symbol): Indent comment to match code.
* minsyms.c (install_minimal_symbols): Attempt to demangle symbol
names as C++ names, and cache them in SYMBOL_DEMANGLED_NAME.
* mipsread.c (psymtab_language): Add static variable.
* stabsread.c (demangle.h): Include.
* stabsread.c (define_symbol): Attempt to demangle C++ symbol
names and cache them in the SYMBOL_DEMANGLED_NAME field.
* stack.c (return_command): Remove explicit demangling of name
and use of cleanups. Just use SYMBOL_DEMANGLED_NAME.
* symfile.c (demangle.h): Include.
* symfile.c (add_psymbol_to_list, add_psymbol_addr_to_list): Fix
to match macros in symfile.h and allow them to be compiled
if INLINE_ADD_PSYMBOL is not true.
* symfile.h (INLINE_ADD_PSYMBOL): Default to true if not set.
* symfile.h (ADD_PSYMBOL_*): Add language and objfile parameters.
Add code to demangle and cache C++ symbol names. Use macro form
if INLINE_ADD_PSYMBOL is true, otherwise use C function form.
* symmisc.c (add_psymbol_to_list, add_psymbol_addr_to_list):
Remove, also defined in symfile.c, which we already fixed.
* symtab.c (expensive_mangler): Remove prototype and function.
* symtab.c (find_methods): Remove physnames parameter and fix
prototype to match.
* symtab.c (completion_list_add_symbol): Name changed to
completion_list_add_name.
* symtab.c (COMPLETION_LIST_ADD_SYMBOL): New macro, adds both
the normal symbol name and the cached C++ demangled name.
* symtab.c (lookup_demangled_partial_symbol,
lookup_demangled_block_symbol): Remove prototypes and functions.
* symtab.c (lookup_symbol): Remove use of expensive_mangler,
use lookup_block_symbol instead of lookup_demangled_block_symbol.
Remove code to try demangling names and matching them.
* symtab.c (lookup_partial_symbol, lookup_block_symbol):
Fix to try matching the cached demangled name if no match is
found using the regular symbol name.
* symtab.c (find_methods): Remove unused physnames array.
* symtab.c (name_match, NAME_MATCH): Remove function and macro,
replaced with SYMBOL_MATCHES_REGEXP from symtab.h.
* symtab.c (completion_list_add_symbol): Rewrite to use cached
C++ demangled symbol names.
* symtab.h: Much reformatting of structures and such to add
whitespace to make them more readable, and make them more
consistent with other gdb structure definitions.
* symtab.h (general_symbol_info): New struct containing fields
common to all symbols.
* symtab.h (SYMBOL_LANGUAGE, SYMBOL_DEMANGLED_NAME,
SYMBOL_SOURCE_NAME, SYMBOL_LINKAGE_NAME, SYMBOL_MATCHES_NAME,
SYMBOL_MATCHES_REGEXP, MSYMBOL_INFO, MSYMBOL_TYPE): New macros.
* symtab. (struct minimal_symbol, struct partial_symbol, struct
symbol): Use general_symbol_info struct.
* utils.c (demangle_and_match): Remove, no longer used.
* valops.c (demangle.h): Include.
* xcoffexec.c (eq): Remove macro, replace usages with STREQ.
* blockframe.c, breakpoint.c, c-exp.y, c-valprint.c, dbxread.c,
infcmd.c, m2-exp.y, minsyms.c, objfiles.h, solib.c, stack.c,
symmisc.c, symtab.c, valops.c: Replace references to minimal
symbol fields with appropriate macros.
* breakpoint.c, buildsym.c, c-exp.y, c-typeprint.c, c-valprint.c,
coffread.c, command.c, convex-tdep.c, cp-valprint.c, dbxread.c,
demangle.c, elfread.c, energize.c, environ.c, exec.c,
gdbtypes.c, i960-tdep.c, infrun.c, infrun-hacked.c, language.c,
main.c, minsyms.c, mipsread.c, partial-stab.h, remote-es1800.c,
remote-nindy.c, remote-udi.c, rs6000-tdep.c, solib.c, source.c,
sparc-pinsn.c, stabsread.c, standalone.c, state.c, stuff.c,
symfile.c, symmisc.c, symtab.c, symtab.h, tm-sysv4.h,
tm-ultra3.h, values.c, xcoffexec.c, xcoffread.c: Replace strcmp
and strncmp usages with STREQ, STREQN, or STRCMP as appropriate.
* breakpoint.c, buildsym.c, c-typeprint.c, expprint.c, findvar.c,
mipsread.c, printcmd.c, source.c, stabsread.c, stack.c,
symmisc.c, tm-29k.h, valops.c, values.c: Replace SYMBOL_NAME
references with SYMBOL_SOURCE_NAME or SYMBOL_LINKAGE_NAME as
appropriate.
* buildsym.c (start_subfile, patch_subfile_names): Default the
source language to what can be deduced from the filename.
* buildsym.c (end_symtab): Update the source language in the
allocated symtab to match what we have been using.
* buildsym.h (struct subfile): Add a language field.
* c-typeprint.c (c_print_type): Remove code to do explicit
demangling.
* dbxread.c (psymtab_language): Add static variable.
* dbxread.c (start_psymtab): Initialize psymtab_language using
deduce_language_from_filename.
1992-12-23 14:34:57 +08:00
|
|
|
|
if (STREQ (arg, "-"))
|
1991-03-29 00:26:26 +08:00
|
|
|
|
{
|
|
|
|
|
if (current_source_symtab == 0)
|
|
|
|
|
error ("No default source file yet. Do \"help list\".");
|
|
|
|
|
print_source_lines (current_source_symtab,
|
1991-09-19 10:40:29 +08:00
|
|
|
|
max (first_line_listed - lines_to_list, 1),
|
1991-03-29 00:26:26 +08:00
|
|
|
|
first_line_listed, 0);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Now if there is only one argument, decode it in SAL
|
|
|
|
|
and set NO_END.
|
|
|
|
|
If there are two arguments, decode them in SAL and SAL_END
|
|
|
|
|
and clear NO_END; however, if one of the arguments is blank,
|
|
|
|
|
set DUMMY_BEG or DUMMY_END to record that fact. */
|
|
|
|
|
|
|
|
|
|
arg1 = arg;
|
|
|
|
|
if (*arg1 == ',')
|
|
|
|
|
dummy_beg = 1;
|
|
|
|
|
else
|
|
|
|
|
{
|
1993-11-02 06:25:23 +08:00
|
|
|
|
sals = decode_line_1 (&arg1, 0, 0, 0, 0);
|
1991-03-29 00:26:26 +08:00
|
|
|
|
|
|
|
|
|
if (! sals.nelts) return; /* C++ */
|
|
|
|
|
if (sals.nelts > 1)
|
|
|
|
|
{
|
|
|
|
|
ambiguous_line_spec (&sals);
|
|
|
|
|
free (sals.sals);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
sal = sals.sals[0];
|
|
|
|
|
free (sals.sals);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Record whether the BEG arg is all digits. */
|
|
|
|
|
|
|
|
|
|
for (p = arg; p != arg1 && *p >= '0' && *p <= '9'; p++);
|
|
|
|
|
linenum_beg = (p == arg1);
|
|
|
|
|
|
|
|
|
|
while (*arg1 == ' ' || *arg1 == '\t')
|
|
|
|
|
arg1++;
|
|
|
|
|
if (*arg1 == ',')
|
|
|
|
|
{
|
|
|
|
|
no_end = 0;
|
|
|
|
|
arg1++;
|
|
|
|
|
while (*arg1 == ' ' || *arg1 == '\t')
|
|
|
|
|
arg1++;
|
|
|
|
|
if (*arg1 == 0)
|
|
|
|
|
dummy_end = 1;
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
if (dummy_beg)
|
1993-11-02 06:25:23 +08:00
|
|
|
|
sals_end = decode_line_1 (&arg1, 0, 0, 0, 0);
|
1991-03-29 00:26:26 +08:00
|
|
|
|
else
|
1993-11-02 06:25:23 +08:00
|
|
|
|
sals_end = decode_line_1 (&arg1, 0, sal.symtab, sal.line, 0);
|
1991-03-29 00:26:26 +08:00
|
|
|
|
if (sals_end.nelts == 0)
|
|
|
|
|
return;
|
|
|
|
|
if (sals_end.nelts > 1)
|
|
|
|
|
{
|
|
|
|
|
ambiguous_line_spec (&sals_end);
|
|
|
|
|
free (sals_end.sals);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
sal_end = sals_end.sals[0];
|
|
|
|
|
free (sals_end.sals);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (*arg1)
|
|
|
|
|
error ("Junk at end of line specification.");
|
|
|
|
|
|
|
|
|
|
if (!no_end && !dummy_beg && !dummy_end
|
|
|
|
|
&& sal.symtab != sal_end.symtab)
|
|
|
|
|
error ("Specified start and end are in different files.");
|
|
|
|
|
if (dummy_beg && dummy_end)
|
|
|
|
|
error ("Two empty args do not say what lines to list.");
|
|
|
|
|
|
|
|
|
|
/* if line was specified by address,
|
|
|
|
|
first print exactly which line, and which file.
|
|
|
|
|
In this case, sal.symtab == 0 means address is outside
|
|
|
|
|
of all known source files, not that user failed to give a filename. */
|
|
|
|
|
if (*arg == '*')
|
|
|
|
|
{
|
|
|
|
|
if (sal.symtab == 0)
|
1994-04-16 05:55:49 +08:00
|
|
|
|
/* FIXME-32x64--assumes sal.pc fits in long. */
|
1993-11-02 06:25:23 +08:00
|
|
|
|
error ("No source file for address %s.",
|
|
|
|
|
local_hex_string((unsigned long) sal.pc));
|
1991-03-29 00:26:26 +08:00
|
|
|
|
sym = find_pc_function (sal.pc);
|
|
|
|
|
if (sym)
|
1992-06-21 11:09:18 +08:00
|
|
|
|
{
|
gcc -Wall lint:
* breakpoint.c (watchpoint_check): Remove unused variable b.
* stack.c (print_frame_info): Move sp and buf inside #if.
* eval.c (evaluate_subexp): Remove unused variables pp,
mangle_ptr, ptr, and mangle_tstr.
* valarith.c (value_x_binop): Remove unused variables mangle_tstr
and mangle_ptr.
* symtab.c (lookup_symtab): Put variable copy inside #if.
(decode_line_1): Put variable q1 inside #if 0.
* target.h: Declare target_link.
* infrun.c (wait_for_inferior): Remove unused variables signame.
* remote.c (remote_resume): Remove unused variable name.
* c-exp.y (parse_number): Parenthesize operand of shift.
* dbxread.c (record_minimal_symbol): Parenthesize operand of &&
(this is a semantic change, the warning seems to have detected a bug).
* dbxread.c (end_psymtab): Move variable p1 inside #if.
* coffread.c: Move variable temptype inside #if.
* ch-typeprint.c (chill_type_print_base): Remove unused variable
name.
* ch-valprint.c: #include typeprint.h and ch-lang.h.
(chill_val_print): Remove unused variable in_range.
(chill_val_print): Remove statement "length > TYPE_LENGTH (type);".
(chill_val_print): Add default case for switch.
* stabsread.h: Declare stabsect_build_psymtabs.
* os9kread.c (read_minimal_symbols): Make this return void.
(os9k_symfile_read): Remove unused variables stb_exist and val.
(os9k_symfile_init): Remove unused variable val.
(fill_sym): Remove unused variable id.
(read_os9k_psymtab): Put variable back_to inside #if 0. Remove
unused variable nsl.
Remove unused variable symfile_bfd.
#if 0 unused variables lbrac_unmatched_complaint and
lbrac_mismatch_complaint.
Remove declaration for non-existent function os9k_next_symbol_text.
* annotate.c, annotate.h: New files, containing a function for
each annotation which outputs it.
* Move breakpoints_changed from breakpoint.c to annotate.c.
* breakpoint.c, blockframe.c, infrun.c, cp-valprint.c, main.c,
printcmd.c, source.c, stack.c, utils.c, valprint.c:
Use annotate.c functions to output annotations.
* Makefile.in (OBS): Add annotate.o.
1994-05-14 02:18:57 +08:00
|
|
|
|
print_address_numeric (sal.pc, 1, gdb_stdout);
|
1994-04-16 05:55:49 +08:00
|
|
|
|
printf_filtered (" is in ");
|
1993-11-02 06:25:23 +08:00
|
|
|
|
fputs_filtered (SYMBOL_SOURCE_NAME (sym), gdb_stdout);
|
1992-06-21 11:09:18 +08:00
|
|
|
|
printf_filtered (" (%s:%d).\n", sal.symtab->filename, sal.line);
|
|
|
|
|
}
|
1991-03-29 00:26:26 +08:00
|
|
|
|
else
|
1994-04-16 05:55:49 +08:00
|
|
|
|
{
|
gcc -Wall lint:
* breakpoint.c (watchpoint_check): Remove unused variable b.
* stack.c (print_frame_info): Move sp and buf inside #if.
* eval.c (evaluate_subexp): Remove unused variables pp,
mangle_ptr, ptr, and mangle_tstr.
* valarith.c (value_x_binop): Remove unused variables mangle_tstr
and mangle_ptr.
* symtab.c (lookup_symtab): Put variable copy inside #if.
(decode_line_1): Put variable q1 inside #if 0.
* target.h: Declare target_link.
* infrun.c (wait_for_inferior): Remove unused variables signame.
* remote.c (remote_resume): Remove unused variable name.
* c-exp.y (parse_number): Parenthesize operand of shift.
* dbxread.c (record_minimal_symbol): Parenthesize operand of &&
(this is a semantic change, the warning seems to have detected a bug).
* dbxread.c (end_psymtab): Move variable p1 inside #if.
* coffread.c: Move variable temptype inside #if.
* ch-typeprint.c (chill_type_print_base): Remove unused variable
name.
* ch-valprint.c: #include typeprint.h and ch-lang.h.
(chill_val_print): Remove unused variable in_range.
(chill_val_print): Remove statement "length > TYPE_LENGTH (type);".
(chill_val_print): Add default case for switch.
* stabsread.h: Declare stabsect_build_psymtabs.
* os9kread.c (read_minimal_symbols): Make this return void.
(os9k_symfile_read): Remove unused variables stb_exist and val.
(os9k_symfile_init): Remove unused variable val.
(fill_sym): Remove unused variable id.
(read_os9k_psymtab): Put variable back_to inside #if 0. Remove
unused variable nsl.
Remove unused variable symfile_bfd.
#if 0 unused variables lbrac_unmatched_complaint and
lbrac_mismatch_complaint.
Remove declaration for non-existent function os9k_next_symbol_text.
* annotate.c, annotate.h: New files, containing a function for
each annotation which outputs it.
* Move breakpoints_changed from breakpoint.c to annotate.c.
* breakpoint.c, blockframe.c, infrun.c, cp-valprint.c, main.c,
printcmd.c, source.c, stack.c, utils.c, valprint.c:
Use annotate.c functions to output annotations.
* Makefile.in (OBS): Add annotate.o.
1994-05-14 02:18:57 +08:00
|
|
|
|
print_address_numeric (sal.pc, 1, gdb_stdout);
|
1994-04-16 05:55:49 +08:00
|
|
|
|
printf_filtered (" is at %s:%d.\n",
|
|
|
|
|
sal.symtab->filename, sal.line);
|
|
|
|
|
}
|
1991-03-29 00:26:26 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* If line was not specified by just a line number,
|
|
|
|
|
and it does not imply a symtab, it must be an undebuggable symbol
|
|
|
|
|
which means no source code. */
|
|
|
|
|
|
|
|
|
|
if (! linenum_beg && sal.symtab == 0)
|
|
|
|
|
error ("No line number known for %s.", arg);
|
|
|
|
|
|
|
|
|
|
/* If this command is repeated with RET,
|
|
|
|
|
turn it into the no-arg variant. */
|
|
|
|
|
|
|
|
|
|
if (from_tty)
|
|
|
|
|
*arg = 0;
|
|
|
|
|
|
|
|
|
|
if (dummy_beg && sal_end.symtab == 0)
|
|
|
|
|
error ("No default source file yet. Do \"help list\".");
|
|
|
|
|
if (dummy_beg)
|
|
|
|
|
print_source_lines (sal_end.symtab,
|
1991-09-19 10:40:29 +08:00
|
|
|
|
max (sal_end.line - (lines_to_list - 1), 1),
|
1991-03-29 00:26:26 +08:00
|
|
|
|
sal_end.line + 1, 0);
|
|
|
|
|
else if (sal.symtab == 0)
|
|
|
|
|
error ("No default source file yet. Do \"help list\".");
|
|
|
|
|
else if (no_end)
|
|
|
|
|
print_source_lines (sal.symtab,
|
1991-09-19 10:40:29 +08:00
|
|
|
|
max (sal.line - (lines_to_list / 2), 1),
|
|
|
|
|
sal.line + (lines_to_list / 2), 0);
|
1991-03-29 00:26:26 +08:00
|
|
|
|
else
|
|
|
|
|
print_source_lines (sal.symtab, sal.line,
|
|
|
|
|
(dummy_end
|
1991-09-19 10:40:29 +08:00
|
|
|
|
? sal.line + lines_to_list
|
1991-03-29 00:26:26 +08:00
|
|
|
|
: sal_end.line + 1),
|
|
|
|
|
0);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Print info on range of pc's in a specified line. */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
line_info (arg, from_tty)
|
|
|
|
|
char *arg;
|
|
|
|
|
int from_tty;
|
|
|
|
|
{
|
|
|
|
|
struct symtabs_and_lines sals;
|
|
|
|
|
struct symtab_and_line sal;
|
|
|
|
|
CORE_ADDR start_pc, end_pc;
|
|
|
|
|
int i;
|
|
|
|
|
|
1997-06-28 14:10:06 +08:00
|
|
|
|
INIT_SAL (&sal); /* initialize to zeroes */
|
|
|
|
|
|
1991-03-29 00:26:26 +08:00
|
|
|
|
if (arg == 0)
|
|
|
|
|
{
|
|
|
|
|
sal.symtab = current_source_symtab;
|
|
|
|
|
sal.line = last_line_listed;
|
|
|
|
|
sals.nelts = 1;
|
|
|
|
|
sals.sals = (struct symtab_and_line *)
|
|
|
|
|
xmalloc (sizeof (struct symtab_and_line));
|
|
|
|
|
sals.sals[0] = sal;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
sals = decode_line_spec_1 (arg, 0);
|
|
|
|
|
|
1993-05-26 12:29:38 +08:00
|
|
|
|
dont_repeat ();
|
1991-03-29 00:26:26 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* C++ More than one line may have been specified, as when the user
|
|
|
|
|
specifies an overloaded function name. Print info on them all. */
|
|
|
|
|
for (i = 0; i < sals.nelts; i++)
|
|
|
|
|
{
|
|
|
|
|
sal = sals.sals[i];
|
|
|
|
|
|
|
|
|
|
if (sal.symtab == 0)
|
1993-05-26 12:29:38 +08:00
|
|
|
|
{
|
|
|
|
|
printf_filtered ("No line number information available");
|
|
|
|
|
if (sal.pc != 0)
|
|
|
|
|
{
|
|
|
|
|
/* This is useful for "info line *0x7f34". If we can't tell the
|
|
|
|
|
user about a source line, at least let them have the symbolic
|
|
|
|
|
address. */
|
|
|
|
|
printf_filtered (" for address ");
|
|
|
|
|
wrap_here (" ");
|
1993-11-02 06:25:23 +08:00
|
|
|
|
print_address (sal.pc, gdb_stdout);
|
1993-05-26 12:29:38 +08:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
printf_filtered (".");
|
|
|
|
|
printf_filtered ("\n");
|
|
|
|
|
}
|
|
|
|
|
else if (sal.line > 0
|
1994-04-16 05:55:49 +08:00
|
|
|
|
&& find_line_pc_range (sal, &start_pc, &end_pc))
|
1991-03-29 00:26:26 +08:00
|
|
|
|
{
|
|
|
|
|
if (start_pc == end_pc)
|
1993-07-12 11:42:35 +08:00
|
|
|
|
{
|
|
|
|
|
printf_filtered ("Line %d of \"%s\"",
|
|
|
|
|
sal.line, sal.symtab->filename);
|
|
|
|
|
wrap_here (" ");
|
|
|
|
|
printf_filtered (" is at address ");
|
1993-11-02 06:25:23 +08:00
|
|
|
|
print_address (start_pc, gdb_stdout);
|
1993-07-12 11:42:35 +08:00
|
|
|
|
wrap_here (" ");
|
|
|
|
|
printf_filtered (" but contains no code.\n");
|
|
|
|
|
}
|
1991-03-29 00:26:26 +08:00
|
|
|
|
else
|
1992-03-15 09:09:14 +08:00
|
|
|
|
{
|
1993-07-12 11:42:35 +08:00
|
|
|
|
printf_filtered ("Line %d of \"%s\"",
|
|
|
|
|
sal.line, sal.symtab->filename);
|
|
|
|
|
wrap_here (" ");
|
|
|
|
|
printf_filtered (" starts at address ");
|
1993-11-02 06:25:23 +08:00
|
|
|
|
print_address (start_pc, gdb_stdout);
|
1993-07-12 11:42:35 +08:00
|
|
|
|
wrap_here (" ");
|
|
|
|
|
printf_filtered (" and ends at ");
|
1993-11-02 06:25:23 +08:00
|
|
|
|
print_address (end_pc, gdb_stdout);
|
1993-07-12 11:42:35 +08:00
|
|
|
|
printf_filtered (".\n");
|
1992-03-15 09:09:14 +08:00
|
|
|
|
}
|
1993-07-12 11:42:35 +08:00
|
|
|
|
|
1991-03-29 00:26:26 +08:00
|
|
|
|
/* x/i should display this line's code. */
|
|
|
|
|
set_next_address (start_pc);
|
1993-07-12 11:42:35 +08:00
|
|
|
|
|
1991-03-29 00:26:26 +08:00
|
|
|
|
/* Repeating "info line" should do the following line. */
|
|
|
|
|
last_line_listed = sal.line + 1;
|
1993-05-26 11:27:32 +08:00
|
|
|
|
|
|
|
|
|
/* If this is the only line, show the source code. If it could
|
|
|
|
|
not find the file, don't do anything special. */
|
gcc -Wall lint:
* breakpoint.c (watchpoint_check): Remove unused variable b.
* stack.c (print_frame_info): Move sp and buf inside #if.
* eval.c (evaluate_subexp): Remove unused variables pp,
mangle_ptr, ptr, and mangle_tstr.
* valarith.c (value_x_binop): Remove unused variables mangle_tstr
and mangle_ptr.
* symtab.c (lookup_symtab): Put variable copy inside #if.
(decode_line_1): Put variable q1 inside #if 0.
* target.h: Declare target_link.
* infrun.c (wait_for_inferior): Remove unused variables signame.
* remote.c (remote_resume): Remove unused variable name.
* c-exp.y (parse_number): Parenthesize operand of shift.
* dbxread.c (record_minimal_symbol): Parenthesize operand of &&
(this is a semantic change, the warning seems to have detected a bug).
* dbxread.c (end_psymtab): Move variable p1 inside #if.
* coffread.c: Move variable temptype inside #if.
* ch-typeprint.c (chill_type_print_base): Remove unused variable
name.
* ch-valprint.c: #include typeprint.h and ch-lang.h.
(chill_val_print): Remove unused variable in_range.
(chill_val_print): Remove statement "length > TYPE_LENGTH (type);".
(chill_val_print): Add default case for switch.
* stabsread.h: Declare stabsect_build_psymtabs.
* os9kread.c (read_minimal_symbols): Make this return void.
(os9k_symfile_read): Remove unused variables stb_exist and val.
(os9k_symfile_init): Remove unused variable val.
(fill_sym): Remove unused variable id.
(read_os9k_psymtab): Put variable back_to inside #if 0. Remove
unused variable nsl.
Remove unused variable symfile_bfd.
#if 0 unused variables lbrac_unmatched_complaint and
lbrac_mismatch_complaint.
Remove declaration for non-existent function os9k_next_symbol_text.
* annotate.c, annotate.h: New files, containing a function for
each annotation which outputs it.
* Move breakpoints_changed from breakpoint.c to annotate.c.
* breakpoint.c, blockframe.c, infrun.c, cp-valprint.c, main.c,
printcmd.c, source.c, stack.c, utils.c, valprint.c:
Use annotate.c functions to output annotations.
* Makefile.in (OBS): Add annotate.o.
1994-05-14 02:18:57 +08:00
|
|
|
|
if (annotation_level && sals.nelts == 1)
|
1993-05-26 11:27:32 +08:00
|
|
|
|
identify_source_line (sal.symtab, sal.line, 0, start_pc);
|
1991-03-29 00:26:26 +08:00
|
|
|
|
}
|
|
|
|
|
else
|
1993-05-26 12:29:38 +08:00
|
|
|
|
/* Is there any case in which we get here, and have an address
|
|
|
|
|
which the user would want to see? If we have debugging symbols
|
|
|
|
|
and no line numbers? */
|
1992-06-21 11:09:18 +08:00
|
|
|
|
printf_filtered ("Line number %d is out of range for \"%s\".\n",
|
|
|
|
|
sal.line, sal.symtab->filename);
|
1991-03-29 00:26:26 +08:00
|
|
|
|
}
|
1993-11-02 06:25:23 +08:00
|
|
|
|
free (sals.sals);
|
1991-03-29 00:26:26 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Commands to search the source file for a regexp. */
|
|
|
|
|
|
1991-08-14 09:11:20 +09:00
|
|
|
|
/* ARGSUSED */
|
1991-03-29 00:26:26 +08:00
|
|
|
|
static void
|
|
|
|
|
forward_search_command (regex, from_tty)
|
|
|
|
|
char *regex;
|
|
|
|
|
int from_tty;
|
|
|
|
|
{
|
|
|
|
|
register int c;
|
|
|
|
|
register int desc;
|
|
|
|
|
register FILE *stream;
|
|
|
|
|
int line = last_line_listed + 1;
|
|
|
|
|
char *msg;
|
|
|
|
|
|
|
|
|
|
msg = (char *) re_comp (regex);
|
|
|
|
|
if (msg)
|
|
|
|
|
error (msg);
|
|
|
|
|
|
|
|
|
|
if (current_source_symtab == 0)
|
|
|
|
|
select_source_symtab (0);
|
|
|
|
|
|
|
|
|
|
/* Search from last_line_listed+1 in current_source_symtab */
|
|
|
|
|
|
|
|
|
|
desc = open_source_file (current_source_symtab);
|
|
|
|
|
if (desc < 0)
|
|
|
|
|
perror_with_name (current_source_symtab->filename);
|
|
|
|
|
|
|
|
|
|
if (current_source_symtab->line_charpos == 0)
|
|
|
|
|
find_source_lines (current_source_symtab, desc);
|
|
|
|
|
|
|
|
|
|
if (line < 1 || line > current_source_symtab->nlines)
|
|
|
|
|
{
|
|
|
|
|
close (desc);
|
|
|
|
|
error ("Expression not found");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (lseek (desc, current_source_symtab->line_charpos[line - 1], 0) < 0)
|
|
|
|
|
{
|
|
|
|
|
close (desc);
|
|
|
|
|
perror_with_name (current_source_symtab->filename);
|
|
|
|
|
}
|
|
|
|
|
|
1998-04-09 07:58:10 +08:00
|
|
|
|
stream = fdopen (desc, FDOPEN_MODE);
|
1991-03-29 00:26:26 +08:00
|
|
|
|
clearerr (stream);
|
|
|
|
|
while (1) {
|
1994-12-08 10:27:47 +08:00
|
|
|
|
static char *buf = NULL;
|
|
|
|
|
register char *p;
|
|
|
|
|
int cursize, newsize;
|
|
|
|
|
|
|
|
|
|
cursize = 256;
|
|
|
|
|
buf = xmalloc (cursize);
|
|
|
|
|
p = buf;
|
1991-03-29 00:26:26 +08:00
|
|
|
|
|
1991-08-14 09:11:20 +09:00
|
|
|
|
c = getc (stream);
|
1991-03-29 00:26:26 +08:00
|
|
|
|
if (c == EOF)
|
|
|
|
|
break;
|
|
|
|
|
do {
|
|
|
|
|
*p++ = c;
|
1994-12-08 10:27:47 +08:00
|
|
|
|
if (p - buf == cursize)
|
|
|
|
|
{
|
|
|
|
|
newsize = cursize + cursize / 2;
|
|
|
|
|
buf = xrealloc (buf, newsize);
|
|
|
|
|
p = buf + cursize;
|
|
|
|
|
cursize = newsize;
|
|
|
|
|
}
|
1991-08-14 09:11:20 +09:00
|
|
|
|
} while (c != '\n' && (c = getc (stream)) >= 0);
|
1991-03-29 00:26:26 +08:00
|
|
|
|
|
|
|
|
|
/* we now have a source line in buf, null terminate and match */
|
|
|
|
|
*p = 0;
|
|
|
|
|
if (re_exec (buf) > 0)
|
|
|
|
|
{
|
|
|
|
|
/* Match! */
|
|
|
|
|
fclose (stream);
|
1994-12-08 10:27:47 +08:00
|
|
|
|
print_source_lines (current_source_symtab, line, line+1, 0);
|
1995-04-08 17:59:02 +08:00
|
|
|
|
set_internalvar (lookup_internalvar ("_"),
|
|
|
|
|
value_from_longest (builtin_type_int,
|
|
|
|
|
(LONGEST) line));
|
1991-09-19 10:40:29 +08:00
|
|
|
|
current_source_line = max (line - lines_to_list / 2, 1);
|
1991-03-29 00:26:26 +08:00
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
line++;
|
|
|
|
|
}
|
|
|
|
|
|
1992-06-21 11:09:18 +08:00
|
|
|
|
printf_filtered ("Expression not found\n");
|
1991-03-29 00:26:26 +08:00
|
|
|
|
fclose (stream);
|
|
|
|
|
}
|
|
|
|
|
|
1991-08-14 09:11:20 +09:00
|
|
|
|
/* ARGSUSED */
|
1991-03-29 00:26:26 +08:00
|
|
|
|
static void
|
|
|
|
|
reverse_search_command (regex, from_tty)
|
|
|
|
|
char *regex;
|
|
|
|
|
int from_tty;
|
|
|
|
|
{
|
|
|
|
|
register int c;
|
|
|
|
|
register int desc;
|
|
|
|
|
register FILE *stream;
|
|
|
|
|
int line = last_line_listed - 1;
|
|
|
|
|
char *msg;
|
|
|
|
|
|
|
|
|
|
msg = (char *) re_comp (regex);
|
|
|
|
|
if (msg)
|
|
|
|
|
error (msg);
|
|
|
|
|
|
|
|
|
|
if (current_source_symtab == 0)
|
|
|
|
|
select_source_symtab (0);
|
|
|
|
|
|
|
|
|
|
/* Search from last_line_listed-1 in current_source_symtab */
|
|
|
|
|
|
|
|
|
|
desc = open_source_file (current_source_symtab);
|
|
|
|
|
if (desc < 0)
|
|
|
|
|
perror_with_name (current_source_symtab->filename);
|
|
|
|
|
|
|
|
|
|
if (current_source_symtab->line_charpos == 0)
|
|
|
|
|
find_source_lines (current_source_symtab, desc);
|
|
|
|
|
|
|
|
|
|
if (line < 1 || line > current_source_symtab->nlines)
|
|
|
|
|
{
|
|
|
|
|
close (desc);
|
|
|
|
|
error ("Expression not found");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (lseek (desc, current_source_symtab->line_charpos[line - 1], 0) < 0)
|
|
|
|
|
{
|
|
|
|
|
close (desc);
|
|
|
|
|
perror_with_name (current_source_symtab->filename);
|
|
|
|
|
}
|
|
|
|
|
|
1998-04-09 07:58:10 +08:00
|
|
|
|
stream = fdopen (desc, FDOPEN_MODE);
|
1991-03-29 00:26:26 +08:00
|
|
|
|
clearerr (stream);
|
|
|
|
|
while (line > 1)
|
|
|
|
|
{
|
1991-08-14 09:11:20 +09:00
|
|
|
|
/* FIXME!!! We walk right off the end of buf if we get a long line!!! */
|
1991-03-29 00:26:26 +08:00
|
|
|
|
char buf[4096]; /* Should be reasonable??? */
|
|
|
|
|
register char *p = buf;
|
|
|
|
|
|
1991-08-14 09:11:20 +09:00
|
|
|
|
c = getc (stream);
|
1991-03-29 00:26:26 +08:00
|
|
|
|
if (c == EOF)
|
|
|
|
|
break;
|
|
|
|
|
do {
|
|
|
|
|
*p++ = c;
|
1991-08-14 09:11:20 +09:00
|
|
|
|
} while (c != '\n' && (c = getc (stream)) >= 0);
|
1991-03-29 00:26:26 +08:00
|
|
|
|
|
|
|
|
|
/* We now have a source line in buf; null terminate and match. */
|
|
|
|
|
*p = 0;
|
|
|
|
|
if (re_exec (buf) > 0)
|
|
|
|
|
{
|
|
|
|
|
/* Match! */
|
|
|
|
|
fclose (stream);
|
|
|
|
|
print_source_lines (current_source_symtab,
|
|
|
|
|
line, line+1, 0);
|
1995-04-08 17:59:02 +08:00
|
|
|
|
set_internalvar (lookup_internalvar ("_"),
|
|
|
|
|
value_from_longest (builtin_type_int,
|
|
|
|
|
(LONGEST) line));
|
1991-09-19 10:40:29 +08:00
|
|
|
|
current_source_line = max (line - lines_to_list / 2, 1);
|
1991-03-29 00:26:26 +08:00
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
line--;
|
|
|
|
|
if (fseek (stream, current_source_symtab->line_charpos[line - 1], 0) < 0)
|
|
|
|
|
{
|
|
|
|
|
fclose (stream);
|
|
|
|
|
perror_with_name (current_source_symtab->filename);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
1992-06-21 11:09:18 +08:00
|
|
|
|
printf_filtered ("Expression not found\n");
|
1991-03-29 00:26:26 +08:00
|
|
|
|
fclose (stream);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
_initialize_source ()
|
|
|
|
|
{
|
1993-07-12 11:42:35 +08:00
|
|
|
|
struct cmd_list_element *c;
|
1991-03-29 00:26:26 +08:00
|
|
|
|
current_source_symtab = 0;
|
|
|
|
|
init_source_path ();
|
|
|
|
|
|
1993-11-02 06:25:23 +08:00
|
|
|
|
/* The intention is to use POSIX Basic Regular Expressions.
|
|
|
|
|
Always use the GNU regex routine for consistency across all hosts.
|
|
|
|
|
Our current GNU regex.c does not have all the POSIX features, so this is
|
|
|
|
|
just an approximation. */
|
|
|
|
|
re_set_syntax (RE_SYNTAX_GREP);
|
|
|
|
|
|
1993-07-12 11:42:35 +08:00
|
|
|
|
c = add_cmd ("directory", class_files, directory_command,
|
1991-03-29 00:26:26 +08:00
|
|
|
|
"Add directory DIR to beginning of search path for source files.\n\
|
|
|
|
|
Forget cached info on source file locations and line positions.\n\
|
|
|
|
|
DIR can also be $cwd for the current working directory, or $cdir for the\n\
|
|
|
|
|
directory in which the source file was compiled into object code.\n\
|
1993-07-12 11:42:35 +08:00
|
|
|
|
With no argument, reset the search path to $cdir:$cwd, the default.",
|
|
|
|
|
&cmdlist);
|
|
|
|
|
c->completer = filename_completer;
|
1991-03-29 00:26:26 +08:00
|
|
|
|
|
1991-04-19 10:38:14 +09:00
|
|
|
|
add_cmd ("directories", no_class, show_directories,
|
|
|
|
|
"Current search path for finding source files.\n\
|
1991-03-29 00:26:26 +08:00
|
|
|
|
$cwd in the path means the current working directory.\n\
|
1991-04-19 10:38:14 +09:00
|
|
|
|
$cdir in the path means the compilation directory of the source file.",
|
|
|
|
|
&showlist);
|
1991-03-29 00:26:26 +08:00
|
|
|
|
|
|
|
|
|
add_info ("source", source_info,
|
|
|
|
|
"Information about the current source file.");
|
|
|
|
|
|
|
|
|
|
add_info ("line", line_info,
|
1995-04-08 17:59:02 +08:00
|
|
|
|
concat ("Core addresses of the code for a source line.\n\
|
1991-03-29 00:26:26 +08:00
|
|
|
|
Line can be specified as\n\
|
|
|
|
|
LINENUM, to list around that line in current file,\n\
|
|
|
|
|
FILE:LINENUM, to list around that line in that file,\n\
|
|
|
|
|
FUNCTION, to list around beginning of that function,\n\
|
|
|
|
|
FILE:FUNCTION, to distinguish among like-named static functions.\n\
|
1995-04-08 17:59:02 +08:00
|
|
|
|
", "\
|
1991-03-29 00:26:26 +08:00
|
|
|
|
Default is to describe the last source line that was listed.\n\n\
|
|
|
|
|
This sets the default address for \"x\" to the line's first instruction\n\
|
|
|
|
|
so that \"x/i\" suffices to start examining the machine code.\n\
|
1995-04-08 17:59:02 +08:00
|
|
|
|
The address is also stored as the value of \"$_\".", NULL));
|
1991-03-29 00:26:26 +08:00
|
|
|
|
|
|
|
|
|
add_com ("forward-search", class_files, forward_search_command,
|
1995-04-08 17:59:02 +08:00
|
|
|
|
"Search for regular expression (see regex(3)) from last line listed.\n\
|
|
|
|
|
The matching line number is also stored as the value of \"$_\".");
|
1991-03-29 00:26:26 +08:00
|
|
|
|
add_com_alias ("search", "forward-search", class_files, 0);
|
|
|
|
|
|
|
|
|
|
add_com ("reverse-search", class_files, reverse_search_command,
|
1995-04-08 17:59:02 +08:00
|
|
|
|
"Search backward for regular expression (see regex(3)) from last line listed.\n\
|
|
|
|
|
The matching line number is also stored as the value of \"$_\".");
|
1991-03-29 00:26:26 +08:00
|
|
|
|
|
|
|
|
|
add_com ("list", class_files, list_command,
|
1995-04-08 17:59:02 +08:00
|
|
|
|
concat ("List specified function or line.\n\
|
1991-03-29 00:26:26 +08:00
|
|
|
|
With no argument, lists ten more lines after or around previous listing.\n\
|
|
|
|
|
\"list -\" lists the ten lines before a previous ten-line listing.\n\
|
|
|
|
|
One argument specifies a line, and ten lines are listed around that line.\n\
|
|
|
|
|
Two arguments with comma between specify starting and ending lines to list.\n\
|
1995-04-08 17:59:02 +08:00
|
|
|
|
", "\
|
1991-03-29 00:26:26 +08:00
|
|
|
|
Lines can be specified in these ways:\n\
|
|
|
|
|
LINENUM, to list around that line in current file,\n\
|
|
|
|
|
FILE:LINENUM, to list around that line in that file,\n\
|
|
|
|
|
FUNCTION, to list around beginning of that function,\n\
|
|
|
|
|
FILE:FUNCTION, to distinguish among like-named static functions.\n\
|
|
|
|
|
*ADDRESS, to list around the line containing that address.\n\
|
1995-04-08 17:59:02 +08:00
|
|
|
|
With two args if one is empty it stands for ten lines away from the other arg.", NULL));
|
|
|
|
|
|
1992-11-06 17:21:13 +08:00
|
|
|
|
add_com_alias ("l", "list", class_files, 1);
|
1991-03-29 00:26:26 +08:00
|
|
|
|
|
1991-09-19 10:40:29 +08:00
|
|
|
|
add_show_from_set
|
|
|
|
|
(add_set_cmd ("listsize", class_support, var_uinteger,
|
|
|
|
|
(char *)&lines_to_list,
|
|
|
|
|
"Set number of source lines gdb will list by default.",
|
|
|
|
|
&setlist),
|
|
|
|
|
&showlist);
|
|
|
|
|
}
|