* infcmd.c (run_command_1): New function, extracted from
run_command. (run_command): Replace implementation by call to run_command_1. (start_command): Use run_command_1 to insert the temporary breakpoint and run the program. Remove code that's no longer needed, as already done at the proper time by run_command_1.
This commit is contained in:
parent
c0501be550
commit
f67a969fd6
2 changed files with 26 additions and 10 deletions
|
@ -1,3 +1,12 @@
|
||||||
|
2005-03-08 Joel Brobecker <brobecker@adacore.com>
|
||||||
|
|
||||||
|
* infcmd.c (run_command_1): New function, extracted from
|
||||||
|
run_command.
|
||||||
|
(run_command): Replace implementation by call to run_command_1.
|
||||||
|
(start_command): Use run_command_1 to insert the temporary
|
||||||
|
breakpoint and run the program. Remove code that's no longer
|
||||||
|
needed, as already done at the proper time by run_command_1.
|
||||||
|
|
||||||
2005-03-08 Daniel Jacobowitz <dan@codesourcery.com>
|
2005-03-08 Daniel Jacobowitz <dan@codesourcery.com>
|
||||||
|
|
||||||
* symfile.c (clear_symtab_users): Call
|
* symfile.c (clear_symtab_users): Call
|
||||||
|
|
27
gdb/infcmd.c
27
gdb/infcmd.c
|
@ -400,8 +400,12 @@ Start it from the beginning? "))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Implement the "run" command. If TBREAK_AT_MAIN is set, then insert
|
||||||
|
a temporary breakpoint at the begining of the main program before
|
||||||
|
running the program. */
|
||||||
|
|
||||||
static void
|
static void
|
||||||
run_command (char *args, int from_tty)
|
run_command_1 (char *args, int from_tty, int tbreak_at_main)
|
||||||
{
|
{
|
||||||
char *exec_file;
|
char *exec_file;
|
||||||
|
|
||||||
|
@ -425,6 +429,10 @@ run_command (char *args, int from_tty)
|
||||||
reopen_exec_file ();
|
reopen_exec_file ();
|
||||||
reread_symbols ();
|
reread_symbols ();
|
||||||
|
|
||||||
|
/* Insert the temporary breakpoint if a location was specified. */
|
||||||
|
if (tbreak_at_main)
|
||||||
|
tbreak_command (main_name (), 0);
|
||||||
|
|
||||||
exec_file = (char *) get_exec_file (0);
|
exec_file = (char *) get_exec_file (0);
|
||||||
|
|
||||||
/* We keep symbols from add-symbol-file, on the grounds that the
|
/* We keep symbols from add-symbol-file, on the grounds that the
|
||||||
|
@ -486,6 +494,12 @@ run_command (char *args, int from_tty)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
static void
|
||||||
|
run_command (char *args, int from_tty)
|
||||||
|
{
|
||||||
|
run_command_1 (args, from_tty, 0);
|
||||||
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
run_no_args_command (char *args, int from_tty)
|
run_no_args_command (char *args, int from_tty)
|
||||||
{
|
{
|
||||||
|
@ -506,15 +520,8 @@ start_command (char *args, int from_tty)
|
||||||
if (!have_minimal_symbols ())
|
if (!have_minimal_symbols ())
|
||||||
error (_("No symbol table loaded. Use the \"file\" command."));
|
error (_("No symbol table loaded. Use the \"file\" command."));
|
||||||
|
|
||||||
/* If the inferior is already running, we want to ask the user if we
|
/* Run the program until reaching the main procedure... */
|
||||||
should restart it or not before we insert the temporary breakpoint.
|
run_command_1 (args, from_tty, 1);
|
||||||
This makes sure that this command doesn't have any side effect if
|
|
||||||
the user changes its mind. */
|
|
||||||
kill_if_already_running (from_tty);
|
|
||||||
|
|
||||||
/* Insert the temporary breakpoint, and run... */
|
|
||||||
tbreak_command (main_name (), 0);
|
|
||||||
run_command (args, from_tty);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
|
Loading…
Reference in a new issue