diff options
| author | Fernando Nasser <fnasser@redhat.com> | 2002-09-20 14:58:59 +0000 |
|---|---|---|
| committer | Fernando Nasser <fnasser@redhat.com> | 2002-09-20 14:58:59 +0000 |
| commit | 0378c3323148fbb291d1035d9959de9d9c3a0f7b (patch) | |
| tree | 7a24175361aea3a17223b0a3cea75e08f2c97eb4 /gdb/breakpoint.c | |
| parent | 7cf108933bd1b2e94d4bd531583060262abd543c (diff) | |
| download | gdb-0378c3323148fbb291d1035d9959de9d9c3a0f7b.zip gdb-0378c3323148fbb291d1035d9959de9d9c3a0f7b.tar.gz gdb-0378c3323148fbb291d1035d9959de9d9c3a0f7b.tar.bz2 | |
* source.c: Make global variables current_source_symtab and
current_source_line static.
(list_command): Moved to cli/cli-cmds.c.
(ambiguous_line_spec): Moved to cli/cli-cmds.c.
(get_first_line_listed): New accessor function.
(get_lines_to_list): New accessor function.
(get_current_source_symtab_and_line): New function. Retrieves the
position in the source code that we consider current.
(get_current_or_default_source_symtab_and_line): New function.
Like the above but attempts to determine a default position if one
is not currently defined.
(set_current_source_symtab_and_line): New function. Sets the source
code position considered current and returns the previously set one.
(clear_current_source_symtab_and_line): Reset stored information about
a current source line.
(_initialize_source): Remove registration for the "list" command and
its alias.
* source.h: Add declarations for the new functions above.
* symtab.h: Remove declarations for the global variables mentioned
above.
* breakpoint.c (parse_breakpoint_sals): Use accessor functions to
obtain current source line.
* linespec.c (decode_line_1): Ditto.
* macroscope.c (default_macro_scope): Ditto.
* scm-lang.c (scm_unpac): Ditto.
* stack.c (print_frame_info_base): Ditto.
* symfile.c (clear_symtab_users): Ditto.
* symtab.c (decode_line_spec): Ditto.
* cli/cli-cmds.c (list_command): Moved here from source.c.
(ambiguous_line_spec): Moved here from source.c.
(_init_cli_cmds): Add definition for "list" and its alias.
* Makefile.in: Update dependencies.
Diffstat (limited to 'gdb/breakpoint.c')
| -rw-r--r-- | gdb/breakpoint.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index 2998671..caa8f1c 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -41,6 +41,7 @@ #include "annotate.h" #include "symfile.h" #include "objfiles.h" +#include "source.h" #include "linespec.h" #include "completer.h" #include "gdb.h" @@ -4618,8 +4619,12 @@ parse_breakpoint_sals (char **address, current_source_symtab (which is decode_line_1's default). This should produce the results we want almost all of the time while leaving default_breakpoint_* alone. */ + + struct symtab_and_line cursal = + get_current_or_default_source_symtab_and_line (); + if (default_breakpoint_valid - && (!current_source_symtab + && (!cursal.symtab || (strchr ("+-", (*address)[0]) != NULL))) *sals = decode_line_1 (address, 1, default_breakpoint_symtab, default_breakpoint_line, addr_string); |