/* Memory-access and commands for "inferior" process, for GDB.
- Copyright 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995,
- 1996, 1997, 1998, 1999, 2000, 2001, 2002
- Free Software Foundation, Inc.
+
+ Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995,
+ 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+ 2008 Free Software Foundation, Inc.
This file is part of GDB.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
+ the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA. */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include "defs.h"
#include <signal.h>
#include "parser-defs.h"
#include "regcache.h"
#include "reggroups.h"
+#include "block.h"
+#include "solib.h"
#include <ctype.h>
+#include "gdb_assert.h"
+#include "observer.h"
+#include "target-descriptions.h"
+#include "user-regs.h"
/* Functions exported for general use, in inferior.h: */
static void nofp_registers_info (char *, int);
-static void print_return_value (int struct_return, struct type *value_type);
+static void print_return_value (struct type *value_type);
static void finish_command_continuation (struct continuation_arg *);
static void detach_command (char *, int);
+static void disconnect_command (char *, int);
+
static void unset_environment_command (char *, int);
static void set_environment_command (char *, int);
#define GO_USAGE "Usage: go <location>\n"
-static void breakpoint_auto_delete_contents (void *);
-
#define ERROR_NO_INFERIOR \
- if (!target_has_execution) error ("The program is not being run.");
+ if (!target_has_execution) error (_("The program is not being run."));
/* String containing arguments to give to the program, separated by spaces.
Empty string (pointer to '\0') means no args. */
/* File name for default use for standard in/out in the inferior. */
-char *inferior_io_terminal;
+static char *inferior_io_terminal;
/* Pid of our debugged inferior, or 0 if no inferior now.
Since various parts of infrun.c test this to see whether there is a program
struct frame_id step_frame_id;
-/* Our notion of the current stack pointer. */
-
-CORE_ADDR step_sp;
-
enum step_over_calls_kind step_over_calls;
/* If stepping, nonzero means step count is > 1
/* Environment to use for running inferior,
in format described in environ.h. */
-struct environ *inferior_environ;
+struct gdb_environ *inferior_environ;
\f
/* Accessor routines. */
+void
+set_inferior_io_terminal (const char *terminal_name)
+{
+ if (inferior_io_terminal)
+ xfree (inferior_io_terminal);
+
+ if (!terminal_name)
+ inferior_io_terminal = NULL;
+ else
+ inferior_io_terminal = savestring (terminal_name, strlen (terminal_name));
+}
+
+const char *
+get_inferior_io_terminal (void)
+{
+ return inferior_io_terminal;
+}
+
char *
get_inferior_args (void)
{
/* Notice when `show args' is run. */
static void
-notice_args_read (char *args, int from_tty, struct cmd_list_element *c)
+notice_args_read (struct ui_file *file, int from_tty,
+ struct cmd_list_element *c, const char *value)
{
+ deprecated_show_value_hack (file, from_tty, c, value);
/* Might compute the value. */
get_inferior_args ();
}
\f
/* Compute command-line string given argument vector. This does the
same shell processing as fork_inferior. */
-/* ARGSUSED */
char *
construct_inferior_arguments (struct gdbarch *gdbarch, int argc, char **argv)
{
if (cp == NULL)
cp = strchr (argv[i], '\n');
if (cp != NULL)
- error ("can't handle command-line argument containing whitespace");
+ error (_("can't handle command-line argument containing whitespace"));
length += strlen (argv[i]) + 1;
}
return 0;
}
-/* ARGSUSED */
void
tty_command (char *file, int from_tty)
{
if (file == 0)
- error_no_arg ("terminal name for running target process");
+ error_no_arg (_("terminal name for running target process"));
- inferior_io_terminal = savestring (file, strlen (file));
+ set_inferior_io_terminal (file);
}
-static void
-run_command (char *args, int from_tty)
+/* Common actions to take after creating any sort of inferior, by any
+ means (running, attaching, connecting, et cetera). The target
+ should be stopped. */
+
+void
+post_create_inferior (struct target_ops *target, int from_tty)
{
- char *exec_file;
+ /* Be sure we own the terminal in case write operations are performed. */
+ target_terminal_ours ();
- dont_repeat ();
+ /* If the target hasn't taken care of this already, do it now.
+ Targets which need to access registers during to_open,
+ to_create_inferior, or to_attach should do it earlier; but many
+ don't need to. */
+ target_find_description ();
+ if (exec_bfd)
+ {
+ /* Sometimes the platform-specific hook loads initial shared
+ libraries, and sometimes it doesn't. Try to do so first, so
+ that we can add them with the correct value for FROM_TTY.
+ If we made all the inferior hook methods consistent,
+ this call could be removed. */
+#ifdef SOLIB_ADD
+ SOLIB_ADD (NULL, from_tty, target, auto_solib_add);
+#else
+ solib_add (NULL, from_tty, target, auto_solib_add);
+#endif
+
+ /* Create the hooks to handle shared library load and unload
+ events. */
+#ifdef SOLIB_CREATE_INFERIOR_HOOK
+ SOLIB_CREATE_INFERIOR_HOOK (PIDGET (inferior_ptid));
+#else
+ solib_create_inferior_hook ();
+#endif
+ }
+
+ observer_notify_inferior_created (target, from_tty);
+}
+
+/* Kill the inferior if already running. This function is designed
+ to be called when we are about to start the execution of the program
+ from the beginning. Ask the user to confirm that he wants to restart
+ the program being debugged when FROM_TTY is non-null. */
+
+void
+kill_if_already_running (int from_tty)
+{
if (! ptid_equal (inferior_ptid, null_ptid) && target_has_execution)
{
if (from_tty
&& !query ("The program being debugged has been started already.\n\
Start it from the beginning? "))
- error ("Program not restarted.");
+ error (_("Program not restarted."));
target_kill ();
#if defined(SOLIB_RESTART)
SOLIB_RESTART ();
#endif
init_wait_for_inferior ();
}
+}
+
+/* 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
+run_command_1 (char *args, int from_tty, int tbreak_at_main)
+{
+ char *exec_file;
+ dont_repeat ();
+
+ kill_if_already_running (from_tty);
clear_breakpoint_hit_counts ();
+ /* Clean up any leftovers from other runs. Some other things from
+ this function should probably be moved into target_pre_inferior. */
+ target_pre_inferior (from_tty);
+
/* Purge old solib objfiles. */
objfile_purge_solibs ();
- do_run_cleanups (NULL);
+ clear_solib ();
/* The comment here used to read, "The exec file is re-read every
time we do a generic_mourn_inferior, so we just have to worry
reopen_exec_file ();
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);
/* We keep symbols from add-symbol-file, on the grounds that the
if (!args)
{
- if (event_loop_p && target_can_async_p ())
+ if (target_can_async_p ())
async_disable_stdin ();
}
else
/* If we get a request for running in the bg but the target
doesn't support it, error out. */
- if (event_loop_p && async_exec && !target_can_async_p ())
- error ("Asynchronous execution not supported on this target.");
+ if (async_exec && !target_can_async_p ())
+ error (_("Asynchronous execution not supported on this target."));
/* If we don't get a request of running in the bg, then we need
to simulate synchronous (fg) execution. */
- if (event_loop_p && !async_exec && target_can_async_p ())
+ if (!async_exec && target_can_async_p ())
{
/* Simulate synchronous execution */
async_disable_stdin ();
/* We call get_inferior_args() because we might need to compute
the value now. */
target_create_inferior (exec_file, get_inferior_args (),
- environ_vector (inferior_environ));
+ environ_vector (inferior_environ), from_tty);
+
+ /* Pass zero for FROM_TTY, because at this point the "run" command
+ has done its thing; now we are setting up the running program. */
+ post_create_inferior (¤t_target, 0);
+
+ /* Start the target running. */
+ proceed ((CORE_ADDR) -1, TARGET_SIGNAL_0, 0);
}
+static void
+run_command (char *args, int from_tty)
+{
+ run_command_1 (args, from_tty, 0);
+}
+
static void
run_no_args_command (char *args, int from_tty)
{
}
\f
+/* Start the execution of the program up until the beginning of the main
+ program. */
+
+static void
+start_command (char *args, int from_tty)
+{
+ /* Some languages such as Ada need to search inside the program
+ minimal symbols for the location where to put the temporary
+ breakpoint before starting. */
+ if (!have_minimal_symbols ())
+ error (_("No symbol table loaded. Use the \"file\" command."));
+
+ /* Run the program until reaching the main procedure... */
+ run_command_1 (args, from_tty, 1);
+}
+
void
continue_command (char *proc_count_exp, int from_tty)
{
/* If we must run in the background, but the target can't do it,
error out. */
- if (event_loop_p && async_exec && !target_can_async_p ())
- error ("Asynchronous execution not supported on this target.");
+ if (async_exec && !target_can_async_p ())
+ error (_("Asynchronous execution not supported on this target."));
/* If we are not asked to run in the bg, then prepare to run in the
foreground, synchronously. */
- if (event_loop_p && !async_exec && target_can_async_p ())
+ if (!async_exec && target_can_async_p ())
{
/* Simulate synchronous execution */
async_disable_stdin ();
if (proc_count_exp != NULL)
{
bpstat bs = stop_bpstat;
- int num = bpstat_num (&bs);
- if (num == 0 && from_tty)
+ int num, stat;
+ int stopped = 0;
+
+ while ((stat = bpstat_num (&bs, &num)) != 0)
+ if (stat > 0)
+ {
+ set_ignore_count (num,
+ parse_and_eval_long (proc_count_exp) - 1,
+ from_tty);
+ /* set_ignore_count prints a message ending with a period.
+ So print two spaces before "Continuing.". */
+ if (from_tty)
+ printf_filtered (" ");
+ stopped = 1;
+ }
+
+ if (!stopped && from_tty)
{
printf_filtered
("Not stopped at any breakpoint; argument ignored.\n");
}
- while (num != 0)
- {
- set_ignore_count (num,
- parse_and_eval_long (proc_count_exp) - 1,
- from_tty);
- /* set_ignore_count prints a message ending with a period.
- So print two spaces before "Continuing.". */
- if (from_tty)
- printf_filtered (" ");
- num = bpstat_num (&bs);
- }
}
if (from_tty)
- printf_filtered ("Continuing.\n");
+ printf_filtered (_("Continuing.\n"));
clear_proceed_status ();
\f
/* Step until outside of current statement. */
-/* ARGSUSED */
static void
step_command (char *count_string, int from_tty)
{
/* Likewise, but skip over subroutine calls as if single instructions. */
-/* ARGSUSED */
static void
next_command (char *count_string, int from_tty)
{
/* Likewise, but step only one instruction. */
-/* ARGSUSED */
void
stepi_command (char *count_string, int from_tty)
{
step_1 (0, 1, count_string);
}
-/* ARGSUSED */
void
nexti_command (char *count_string, int from_tty)
{
static void
step_1 (int skip_subroutines, int single_inst, char *count_string)
{
- register int count = 1;
+ int count = 1;
struct frame_info *frame;
struct cleanup *cleanups = 0;
int async_exec = 0;
/* If we get a request for running in the bg but the target
doesn't support it, error out. */
- if (event_loop_p && async_exec && !target_can_async_p ())
- error ("Asynchronous execution not supported on this target.");
+ if (async_exec && !target_can_async_p ())
+ error (_("Asynchronous execution not supported on this target."));
/* If we don't get a request of running in the bg, then we need
to simulate synchronous (fg) execution. */
- if (event_loop_p && !async_exec && target_can_async_p ())
+ if (!async_exec && target_can_async_p ())
{
/* Simulate synchronous execution */
async_disable_stdin ();
if (!single_inst || skip_subroutines) /* leave si command alone */
{
enable_longjmp_breakpoint ();
- if (!event_loop_p || !target_can_async_p ())
+ if (!target_can_async_p ())
cleanups = make_cleanup (disable_longjmp_breakpoint_cleanup, 0 /*ignore*/);
else
make_exec_cleanup (disable_longjmp_breakpoint_cleanup, 0 /*ignore*/);
}
/* In synchronous case, all is well, just use the regular for loop. */
- if (!event_loop_p || !target_can_async_p ())
+ if (!target_can_async_p ())
{
for (; count > 0; count--)
{
frame = get_current_frame ();
if (!frame) /* Avoid coredump here. Why tho? */
- error ("No current frame");
+ error (_("No current frame"));
step_frame_id = get_frame_id (frame);
- step_sp = read_sp ();
if (!single_inst)
{
char *name;
if (find_pc_partial_function (stop_pc, &name, &step_range_start,
&step_range_end) == 0)
- error ("Cannot find bounds of current function");
+ error (_("Cannot find bounds of current function"));
target_terminal_ours ();
- printf_filtered ("\
+ printf_filtered (_("\
Single stepping until exit from function %s, \n\
-which has no line number information.\n", name);
+which has no line number information.\n"), name);
}
}
else
if (!stop_step)
break;
-
- /* FIXME: On nexti, this may have already been done (when we hit the
- step resume break, I think). Probably this should be moved to
- wait_for_inferior (near the top). */
-#if defined (SHIFT_INST_REGS)
- SHIFT_INST_REGS ();
-#endif
}
if (!single_inst || skip_subroutines)
and handle them one at the time, through step_once(). */
else
{
- if (event_loop_p && target_can_async_p ())
+ if (target_can_async_p ())
step_once (skip_subroutines, single_inst, count);
}
}
count = arg->next->next->data.integer;
if (stop_step)
- {
- /* FIXME: On nexti, this may have already been done (when we hit the
- step resume break, I think). Probably this should be moved to
- wait_for_inferior (near the top). */
-#if defined (SHIFT_INST_REGS)
- SHIFT_INST_REGS ();
-#endif
- step_once (skip_subroutines, single_inst, count - 1);
- }
+ step_once (skip_subroutines, single_inst, count - 1);
else
if (!single_inst || skip_subroutines)
do_exec_cleanups (ALL_CLEANUPS);
frame = get_current_frame ();
if (!frame) /* Avoid coredump here. Why tho? */
- error ("No current frame");
+ error (_("No current frame"));
step_frame_id = get_frame_id (frame);
- step_sp = read_sp ();
if (!single_inst)
{
char *name;
if (find_pc_partial_function (stop_pc, &name, &step_range_start,
&step_range_end) == 0)
- error ("Cannot find bounds of current function");
+ error (_("Cannot find bounds of current function"));
target_terminal_ours ();
- printf_filtered ("\
+ printf_filtered (_("\
Single stepping until exit from function %s, \n\
-which has no line number information.\n", name);
+which has no line number information.\n"), name);
}
}
else
static void
jump_command (char *arg, int from_tty)
{
- register CORE_ADDR addr;
+ CORE_ADDR addr;
struct symtabs_and_lines sals;
struct symtab_and_line sal;
struct symbol *fn;
/* If we must run in the background, but the target can't do it,
error out. */
- if (event_loop_p && async_exec && !target_can_async_p ())
- error ("Asynchronous execution not supported on this target.");
+ if (async_exec && !target_can_async_p ())
+ error (_("Asynchronous execution not supported on this target."));
/* If we are not asked to run in the bg, then prepare to run in the
foreground, synchronously. */
- if (event_loop_p && !async_exec && target_can_async_p ())
+ if (!async_exec && target_can_async_p ())
{
/* Simulate synchronous execution */
async_disable_stdin ();
}
if (!arg)
- error_no_arg ("starting address");
+ error_no_arg (_("starting address"));
sals = decode_line_spec_1 (arg, 1);
if (sals.nelts != 1)
{
- error ("Unreasonable jump request");
+ error (_("Unreasonable jump request"));
}
sal = sals.sals[0];
xfree (sals.sals);
if (sal.symtab == 0 && sal.pc == 0)
- error ("No source file has been specified.");
+ error (_("No source file has been specified."));
resolve_sal_pc (&sal); /* May error out */
if (fn != NULL && sfn != fn)
{
if (!query ("Line %d is not in `%s'. Jump anyway? ", sal.line,
- SYMBOL_SOURCE_NAME (fn)))
+ SYMBOL_PRINT_NAME (fn)))
{
- error ("Not confirmed.");
+ error (_("Not confirmed."));
/* NOTREACHED */
}
}
{
if (!query ("WARNING!!! Destination is in unmapped overlay! Jump anyway? "))
{
- error ("Not confirmed.");
+ error (_("Not confirmed."));
/* NOTREACHED */
}
}
if (from_tty)
{
- printf_filtered ("Continuing at ");
- print_address_numeric (addr, 1, gdb_stdout);
+ printf_filtered (_("Continuing at "));
+ fputs_filtered (paddress (addr), gdb_stdout);
printf_filtered (".\n");
}
ERROR_NO_INFERIOR;
if (!signum_exp)
- error_no_arg ("signal number");
+ error_no_arg (_("signal number"));
/* It would be even slicker to make signal names be valid expressions,
(the type could be "enum $signal" or some such), then the user could
if (from_tty)
{
if (oursig == TARGET_SIGNAL_0)
- printf_filtered ("Continuing with no signal.\n");
+ printf_filtered (_("Continuing with no signal.\n"));
else
- printf_filtered ("Continuing with signal %s.\n",
+ printf_filtered (_("Continuing with signal %s.\n"),
target_signal_to_name (oursig));
}
proceed (oursig == TARGET_SIGNAL_0 ? (CORE_ADDR) -1 : stop_pc, oursig, 0);
}
-/* Call breakpoint_auto_delete on the current contents of the bpstat
- pointed to by arg (which is really a bpstat *). */
-
-static void
-breakpoint_auto_delete_contents (void *arg)
-{
- breakpoint_auto_delete (*(bpstat *) arg);
-}
-
-
-/* Execute a "stack dummy", a piece of code stored in the stack
- by the debugger to be executed in the inferior.
-
- To call: first, do PUSH_DUMMY_FRAME.
- Then push the contents of the dummy. It should end with a breakpoint insn.
- Then call here, passing address at which to start the dummy.
-
- The contents of all registers are saved before the dummy frame is popped
- and copied into the buffer BUFFER.
-
- The dummy's frame is automatically popped whenever that break is hit.
- If that is the first time the program stops, run_stack_dummy
- returns to its caller with that frame already gone and returns 0.
-
- Otherwise, run_stack-dummy returns a non-zero value.
- If the called function receives a random signal, we do not allow the user
- to continue executing it as this may not work. The dummy frame is poped
- and we return 1.
- If we hit a breakpoint, we leave the frame in place and return 2 (the frame
- will eventually be popped when we do hit the dummy end breakpoint). */
-
-int
-run_stack_dummy (CORE_ADDR addr, struct regcache *buffer)
-{
- struct cleanup *old_cleanups = make_cleanup (null_cleanup, 0);
- int saved_async = 0;
-
- /* Now proceed, having reached the desired place. */
- clear_proceed_status ();
-
- if (CALL_DUMMY_BREAKPOINT_OFFSET_P)
- {
- struct breakpoint *bpt;
- struct symtab_and_line sal;
-
- init_sal (&sal); /* initialize to zeroes */
- if (CALL_DUMMY_LOCATION == AT_ENTRY_POINT)
- {
- sal.pc = CALL_DUMMY_ADDRESS ();
- }
- else
- {
- /* If defined, CALL_DUMMY_BREAKPOINT_OFFSET is where we need
- to put a breakpoint instruction. If not, the call dummy
- already has the breakpoint instruction in it.
-
- ADDR IS THE ADDRESS of the call dummy plus the
- CALL_DUMMY_START_OFFSET, so we need to subtract the
- CALL_DUMMY_START_OFFSET. */
- sal.pc = addr - CALL_DUMMY_START_OFFSET + CALL_DUMMY_BREAKPOINT_OFFSET;
- }
- sal.section = find_pc_overlay (sal.pc);
-
- {
- /* Set up a frame ID for the dummy frame so we can pass it to
- set_momentary_breakpoint. We need to give the breakpoint a
- frame ID so that the breakpoint code can correctly
- re-identify the dummy breakpoint. */
- struct frame_id frame = frame_id_build (read_fp (), sal.pc);
- /* Create a momentary breakpoint at the return address of the
- inferior. That way it breaks when it returns. */
- bpt = set_momentary_breakpoint (sal, frame, bp_call_dummy);
- bpt->disposition = disp_del;
- }
-
- /* If all error()s out of proceed ended up calling normal_stop (and
- perhaps they should; it already does in the special case of error
- out of resume()), then we wouldn't need this. */
- make_cleanup (breakpoint_auto_delete_contents, &stop_bpstat);
- }
-
- disable_watchpoints_before_interactive_call_start ();
- proceed_to_finish = 1; /* We want stop_registers, please... */
-
- if (target_can_async_p ())
- saved_async = target_async_mask (0);
-
- proceed (addr, TARGET_SIGNAL_0, 0);
-
- if (saved_async)
- target_async_mask (saved_async);
-
- enable_watchpoints_after_interactive_call_stop ();
-
- discard_cleanups (old_cleanups);
-
- /* We can stop during an inferior call because a signal is received. */
- if (stopped_by_random_signal)
- return 1;
-
- /* We may also stop prematurely because we hit a breakpoint in the
- called routine. */
- if (!stop_stack_dummy)
- return 2;
-
- /* On normal return, the stack dummy has been popped already. */
- regcache_cpy_no_passthrough (buffer, stop_registers);
- return 0;
-}
-\f
/* Proceed until we reach a different source line with pc greater than
our current one or exit the function. We skip calls in both cases.
we set. This may involve changes to wait_for_inferior and the
proceed status code. */
-/* ARGSUSED */
static void
until_next_command (int from_tty)
{
struct minimal_symbol *msymbol = lookup_minimal_symbol_by_pc (pc);
if (msymbol == NULL)
- error ("Execution is not within a known function.");
+ error (_("Execution is not within a known function."));
step_range_start = SYMBOL_VALUE_ADDRESS (msymbol);
step_range_end = pc;
step_over_calls = STEP_OVER_ALL;
step_frame_id = get_frame_id (frame);
- step_sp = read_sp ();
step_multi = 0; /* Only one call to proceed */
int async_exec = 0;
if (!target_has_execution)
- error ("The program is not running.");
+ error (_("The program is not running."));
/* Find out whether we must run in the background. */
if (arg != NULL)
/* If we must run in the background, but the target can't do it,
error out. */
- if (event_loop_p && async_exec && !target_can_async_p ())
- error ("Asynchronous execution not supported on this target.");
+ if (async_exec && !target_can_async_p ())
+ error (_("Asynchronous execution not supported on this target."));
/* If we are not asked to run in the bg, then prepare to run in the
foreground, synchronously. */
- if (event_loop_p && !async_exec && target_can_async_p ())
+ if (!async_exec && target_can_async_p ())
{
/* Simulate synchronous execution */
async_disable_stdin ();
int async_exec = 0;
if (!target_has_execution)
- error ("The program is not running.");
+ error (_("The program is not running."));
if (arg == NULL)
- error_no_arg ("a location");
+ error_no_arg (_("a location"));
/* Find out whether we must run in the background. */
if (arg != NULL)
/* If we must run in the background, but the target can't do it,
error out. */
- if (event_loop_p && async_exec && !target_can_async_p ())
- error ("Asynchronous execution not supported on this target.");
+ if (async_exec && !target_can_async_p ())
+ error (_("Asynchronous execution not supported on this target."));
/* If we are not asked to run in the bg, then prepare to run in the
foreground, synchronously. */
- if (event_loop_p && !async_exec && target_can_async_p ())
+ if (!async_exec && target_can_async_p ())
{
/* Simulate synchronous execution. */
async_disable_stdin ();
until_break_command (arg, from_tty, 1);
}
\f
+/* Print the result of a function at the end of a 'finish' command. */
-/* Print the result of a function at the end of a 'finish' command. */
static void
-print_return_value (int structure_return, struct type *value_type)
+print_return_value (struct type *value_type)
{
+ struct gdbarch *gdbarch = current_gdbarch;
+ struct cleanup *old_chain;
+ struct ui_stream *stb;
struct value *value;
- static struct ui_stream *stb = NULL;
- if (!structure_return)
+ CHECK_TYPEDEF (value_type);
+ gdb_assert (TYPE_CODE (value_type) != TYPE_CODE_VOID);
+
+ /* FIXME: 2003-09-27: When returning from a nested inferior function
+ call, it's possible (with no help from the architecture vector)
+ to locate and return/print a "struct return" value. This is just
+ a more complicated case of what is already being done in in the
+ inferior function call code. In fact, when inferior function
+ calls are made async, this will likely be made the norm. */
+
+ switch (gdbarch_return_value (gdbarch, value_type, NULL, NULL, NULL))
{
- value = value_being_returned (value_type, stop_registers, structure_return);
+ case RETURN_VALUE_REGISTER_CONVENTION:
+ case RETURN_VALUE_ABI_RETURNS_ADDRESS:
+ case RETURN_VALUE_ABI_PRESERVES_ADDRESS:
+ value = allocate_value (value_type);
+ gdbarch_return_value (gdbarch, value_type, stop_registers,
+ value_contents_raw (value), NULL);
+ break;
+ case RETURN_VALUE_STRUCT_CONVENTION:
+ value = NULL;
+ break;
+ default:
+ internal_error (__FILE__, __LINE__, _("bad switch"));
+ }
+
+ if (value)
+ {
+ /* Print it. */
stb = ui_out_stream_new (uiout);
+ old_chain = make_cleanup_ui_out_stream_delete (stb);
ui_out_text (uiout, "Value returned is ");
- ui_out_field_fmt (uiout, "gdb-result-var", "$%d", record_latest_value (value));
+ ui_out_field_fmt (uiout, "gdb-result-var", "$%d",
+ record_latest_value (value));
ui_out_text (uiout, " = ");
value_print (value, stb->stream, 0, Val_no_prettyprint);
ui_out_field_stream (uiout, "return-value", stb);
ui_out_text (uiout, "\n");
+ do_cleanups (old_chain);
}
else
{
- /* We cannot determine the contents of the structure because
- it is on the stack, and we don't know where, since we did not
- initiate the call, as opposed to the call_function_by_hand case */
-#ifdef VALUE_RETURNED_FROM_STACK
- value = 0;
ui_out_text (uiout, "Value returned has type: ");
ui_out_field_string (uiout, "return-type", TYPE_NAME (value_type));
ui_out_text (uiout, ".");
ui_out_text (uiout, " Cannot determine contents\n");
-#else
- value = value_being_returned (value_type, stop_registers, structure_return);
- stb = ui_out_stream_new (uiout);
- ui_out_text (uiout, "Value returned is ");
- ui_out_field_fmt (uiout, "gdb-result-var", "$%d", record_latest_value (value));
- ui_out_text (uiout, " = ");
- value_print (value, stb->stream, 0, Val_no_prettyprint);
- ui_out_field_stream (uiout, "return-value", stb);
- ui_out_text (uiout, "\n");
-#endif
}
}
/* Stuff that needs to be done by the finish command after the target
- has stopped. In asynchronous mode, we wait for the target to stop in
- the call to poll or select in the event loop, so it is impossible to
- do all the stuff as part of the finish_command function itself. The
- only chance we have to complete this command is in
- fetch_inferior_event, which is called by the event loop as soon as it
- detects that the target has stopped. This function is called via the
- cmd_continuation pointer. */
-void
+ has stopped. In asynchronous mode, we wait for the target to stop
+ in the call to poll or select in the event loop, so it is
+ impossible to do all the stuff as part of the finish_command
+ function itself. The only chance we have to complete this command
+ is in fetch_inferior_event, which is called by the event loop as
+ soon as it detects that the target has stopped. This function is
+ called via the cmd_continuation pointer. */
+
+static void
finish_command_continuation (struct continuation_arg *arg)
{
- register struct symbol *function;
+ struct symbol *function;
struct breakpoint *breakpoint;
struct cleanup *cleanups;
breakpoint = (struct breakpoint *) arg->data.pointer;
- function = (struct symbol *) arg->next->data.pointer;
- cleanups = (struct cleanup *) arg->next->next->data.pointer;
+ function = (struct symbol *) arg->next->data.pointer;
+ cleanups = (struct cleanup *) arg->next->next->data.pointer;
if (bpstat_find_breakpoint (stop_bpstat, breakpoint) != NULL
- && function != 0)
+ && function != NULL)
{
struct type *value_type;
- CORE_ADDR funcaddr;
- int struct_return;
value_type = TYPE_TARGET_TYPE (SYMBOL_TYPE (function));
if (!value_type)
internal_error (__FILE__, __LINE__,
- "finish_command: function has no target type");
-
- if (TYPE_CODE (value_type) == TYPE_CODE_VOID)
- {
- do_exec_cleanups (cleanups);
- return;
- }
-
- funcaddr = BLOCK_START (SYMBOL_BLOCK_VALUE (function));
-
- struct_return = using_struct_return (value_of_variable (function, NULL),
- funcaddr,
- check_typedef (value_type),
- BLOCK_GCC_COMPILED (SYMBOL_BLOCK_VALUE (function)));
+ _("finish_command: function has no target type"));
- print_return_value (struct_return, value_type);
+ if (TYPE_CODE (value_type) != TYPE_CODE_VOID)
+ print_return_value (value_type);
}
+
do_exec_cleanups (cleanups);
}
-/* "finish": Set a temporary breakpoint at the place
- the selected frame will return to, then continue. */
+/* "finish": Set a temporary breakpoint at the place the selected
+ frame will return to, then continue. */
static void
finish_command (char *arg, int from_tty)
{
struct symtab_and_line sal;
- register struct frame_info *frame;
- register struct symbol *function;
+ struct frame_info *frame;
+ struct symbol *function;
struct breakpoint *breakpoint;
struct cleanup *old_chain;
struct continuation_arg *arg1, *arg2, *arg3;
int async_exec = 0;
- /* Find out whether we must run in the background. */
+ /* Find out whether we must run in the background. */
if (arg != NULL)
async_exec = strip_bg_char (&arg);
/* If we must run in the background, but the target can't do it,
- error out. */
- if (event_loop_p && async_exec && !target_can_async_p ())
- error ("Asynchronous execution not supported on this target.");
+ error out. */
+ if (async_exec && !target_can_async_p ())
+ error (_("Asynchronous execution not supported on this target."));
/* If we are not asked to run in the bg, then prepare to run in the
- foreground, synchronously. */
- if (event_loop_p && !async_exec && target_can_async_p ())
+ foreground, synchronously. */
+ if (!async_exec && target_can_async_p ())
{
- /* Simulate synchronous execution */
+ /* Simulate synchronous execution. */
async_disable_stdin ();
}
if (arg)
- error ("The \"finish\" command does not take any arguments.");
+ error (_("The \"finish\" command does not take any arguments."));
if (!target_has_execution)
- error ("The program is not running.");
- if (deprecated_selected_frame == NULL)
- error ("No selected frame.");
+ error (_("The program is not running."));
- frame = get_prev_frame (deprecated_selected_frame);
+ frame = get_prev_frame (get_selected_frame (_("No selected frame.")));
if (frame == 0)
- error ("\"finish\" not meaningful in the outermost frame.");
+ error (_("\"finish\" not meaningful in the outermost frame."));
clear_proceed_status ();
breakpoint = set_momentary_breakpoint (sal, get_frame_id (frame), bp_finish);
- if (!event_loop_p || !target_can_async_p ())
+ if (!target_can_async_p ())
old_chain = make_cleanup_delete_breakpoint (breakpoint);
else
old_chain = make_exec_cleanup_delete_breakpoint (breakpoint);
/* Find the function we will return from. */
- function = find_pc_function (get_frame_pc (deprecated_selected_frame));
+ function = find_pc_function (get_frame_pc (get_selected_frame (NULL)));
- /* Print info on the selected frame, including level number
- but not source. */
+ /* Print info on the selected frame, including level number but not
+ source. */
if (from_tty)
{
- printf_filtered ("Run till exit from ");
- print_stack_frame (deprecated_selected_frame,
- frame_relative_level (deprecated_selected_frame), 0);
+ printf_filtered (_("Run till exit from "));
+ print_stack_frame (get_selected_frame (NULL), 1, LOCATION);
}
/* If running asynchronously and the target support asynchronous
execution, set things up for the rest of the finish command to be
completed later on, when gdb has detected that the target has
- stopped, in fetch_inferior_event. */
- if (event_loop_p && target_can_async_p ())
+ stopped, in fetch_inferior_event. */
+ if (target_can_async_p ())
{
arg1 =
(struct continuation_arg *) xmalloc (sizeof (struct continuation_arg));
add_continuation (finish_command_continuation, arg1);
}
- proceed_to_finish = 1; /* We want stop_registers, please... */
+ proceed_to_finish = 1; /* We want stop_registers, please... */
proceed ((CORE_ADDR) -1, TARGET_SIGNAL_DEFAULT, 0);
/* Do this only if not running asynchronously or if the target
- cannot do async execution. Otherwise, complete this command when
- the target actually stops, in fetch_inferior_event. */
- if (!event_loop_p || !target_can_async_p ())
+ cannot do async execution. Otherwise, complete this command when
+ the target actually stops, in fetch_inferior_event. */
+ if (!target_can_async_p ())
{
-
- /* Did we stop at our breakpoint? */
+ /* Did we stop at our breakpoint? */
if (bpstat_find_breakpoint (stop_bpstat, breakpoint) != NULL
- && function != 0)
+ && function != NULL)
{
struct type *value_type;
- CORE_ADDR funcaddr;
- int struct_return;
value_type = TYPE_TARGET_TYPE (SYMBOL_TYPE (function));
if (!value_type)
internal_error (__FILE__, __LINE__,
- "finish_command: function has no target type");
-
- /* FIXME: Shouldn't we do the cleanups before returning? */
- if (TYPE_CODE (value_type) == TYPE_CODE_VOID)
- return;
+ _("finish_command: function has no target type"));
- funcaddr = BLOCK_START (SYMBOL_BLOCK_VALUE (function));
-
- struct_return =
- using_struct_return (value_of_variable (function, NULL),
- funcaddr,
- check_typedef (value_type),
- BLOCK_GCC_COMPILED (SYMBOL_BLOCK_VALUE (function)));
-
- print_return_value (struct_return, value_type);
+ if (TYPE_CODE (value_type) != TYPE_CODE_VOID)
+ print_return_value (value_type);
}
+
do_cleanups (old_chain);
}
}
\f
-/* ARGSUSED */
+
static void
program_info (char *args, int from_tty)
{
bpstat bs = stop_bpstat;
- int num = bpstat_num (&bs);
+ int num;
+ int stat = bpstat_num (&bs, &num);
if (!target_has_execution)
{
- printf_filtered ("The program being debugged is not being run.\n");
+ printf_filtered (_("The program being debugged is not being run.\n"));
return;
}
target_files_info ();
- printf_filtered ("Program stopped at %s.\n",
- local_hex_string ((unsigned long) stop_pc));
+ printf_filtered (_("Program stopped at %s.\n"),
+ hex_string ((unsigned long) stop_pc));
if (stop_step)
- printf_filtered ("It stopped after being stepped.\n");
- else if (num != 0)
+ printf_filtered (_("It stopped after being stepped.\n"));
+ else if (stat != 0)
{
/* There may be several breakpoints in the same place, so this
isn't as strange as it seems. */
- while (num != 0)
+ while (stat != 0)
{
- if (num < 0)
+ if (stat < 0)
{
- printf_filtered ("It stopped at a breakpoint that has ");
- printf_filtered ("since been deleted.\n");
+ printf_filtered (_("\
+It stopped at a breakpoint that has since been deleted.\n"));
}
else
- printf_filtered ("It stopped at breakpoint %d.\n", num);
- num = bpstat_num (&bs);
+ printf_filtered (_("It stopped at breakpoint %d.\n"), num);
+ stat = bpstat_num (&bs, &num);
}
}
else if (stop_signal != TARGET_SIGNAL_0)
{
- printf_filtered ("It stopped with signal %s, %s.\n",
+ printf_filtered (_("It stopped with signal %s, %s.\n"),
target_signal_to_name (stop_signal),
target_signal_to_string (stop_signal));
}
if (!from_tty)
{
- printf_filtered ("Type \"info stack\" or \"info registers\" ");
- printf_filtered ("for more information.\n");
+ printf_filtered (_("\
+Type \"info stack\" or \"info registers\" for more information.\n"));
}
}
\f
{
if (var)
{
- register char *val = get_in_environ (inferior_environ, var);
+ char *val = get_in_environ (inferior_environ, var);
if (val)
{
puts_filtered (var);
}
else
{
- register char **vector = environ_vector (inferior_environ);
+ char **vector = environ_vector (inferior_environ);
while (*vector)
{
puts_filtered (*vector++);
static void
set_environment_command (char *arg, int from_tty)
{
- register char *p, *val, *var;
+ char *p, *val, *var;
int nullset = 0;
if (arg == 0)
- error_no_arg ("environment variable and value");
+ error_no_arg (_("environment variable and value"));
/* Find seperation between variable name and value */
p = (char *) strchr (arg, '=');
p = val;
if (p == arg)
- error_no_arg ("environment variable to set");
+ error_no_arg (_("environment variable to set"));
if (p == 0 || p[1] == 0)
{
var = savestring (arg, p - arg);
if (nullset)
{
- printf_filtered ("Setting environment variable ");
- printf_filtered ("\"%s\" to null value.\n", var);
+ printf_filtered (_("\
+Setting environment variable \"%s\" to null value.\n"),
+ var);
set_in_environ (inferior_environ, var, "");
}
else
{
/* If there is no argument, delete all environment variables.
Ask for confirmation if reading from the terminal. */
- if (!from_tty || query ("Delete all environment variables? "))
+ if (!from_tty || query (_("Delete all environment variables? ")))
{
free_environ (inferior_environ);
inferior_environ = make_environ ();
static const char path_var_name[] = "PATH";
-/* ARGSUSED */
static void
path_info (char *args, int from_tty)
{
}
\f
-#ifdef REGISTER_NAMES
-char *gdb_register_names[] = REGISTER_NAMES;
-#endif
/* Print out the machine register regnum. If regnum is -1, print all
registers (print_all == 1) or all non-float and non-vector
registers (print_all == 0).
int regnum, int print_all)
{
int i;
- const int numregs = NUM_REGS + NUM_PSEUDO_REGS;
- char *raw_buffer = alloca (MAX_REGISTER_RAW_SIZE);
- char *virtual_buffer = alloca (MAX_REGISTER_VIRTUAL_SIZE);
-
- if (DEPRECATED_DO_REGISTERS_INFO_P ())
- {
- DEPRECATED_DO_REGISTERS_INFO (regnum, print_all);
- return;
- }
+ const int numregs = gdbarch_num_regs (gdbarch)
+ + gdbarch_num_pseudo_regs (gdbarch);
+ gdb_byte buffer[MAX_REGISTER_SIZE];
for (i = 0; i < numregs; i++)
{
/* If the register name is empty, it is undefined for this
processor, so don't display anything. */
- if (REGISTER_NAME (i) == NULL || *(REGISTER_NAME (i)) == '\0')
+ if (gdbarch_register_name (gdbarch, i) == NULL
+ || *(gdbarch_register_name (gdbarch, i)) == '\0')
continue;
- fputs_filtered (REGISTER_NAME (i), file);
- print_spaces_filtered (15 - strlen (REGISTER_NAME (i)), file);
+ fputs_filtered (gdbarch_register_name (gdbarch, i), file);
+ print_spaces_filtered (15 - strlen (gdbarch_register_name
+ (gdbarch, i)), file);
/* Get the data in raw format. */
- if (! frame_register_read (frame, i, raw_buffer))
+ if (! frame_register_read (frame, i, buffer))
{
fprintf_filtered (file, "*value not available*\n");
continue;
}
- /* FIXME: cagney/2002-08-03: This code shouldn't be necessary.
- The function frame_register_read() should have returned the
- pre-cooked register so no conversion is necessary. */
- /* Convert raw data to virtual format if necessary. */
- if (REGISTER_CONVERTIBLE (i))
- {
- REGISTER_CONVERT_TO_VIRTUAL (i, REGISTER_VIRTUAL_TYPE (i),
- raw_buffer, virtual_buffer);
- }
- else
- {
- memcpy (virtual_buffer, raw_buffer,
- REGISTER_VIRTUAL_SIZE (i));
- }
-
/* If virtual format is floating, print it that way, and in raw
hex. */
- if (TYPE_CODE (REGISTER_VIRTUAL_TYPE (i)) == TYPE_CODE_FLT)
+ if (TYPE_CODE (register_type (gdbarch, i)) == TYPE_CODE_FLT)
{
int j;
- val_print (REGISTER_VIRTUAL_TYPE (i), virtual_buffer, 0, 0,
+ val_print (register_type (gdbarch, i), buffer, 0, 0,
file, 0, 1, 0, Val_pretty_default);
fprintf_filtered (file, "\t(raw 0x");
- for (j = 0; j < REGISTER_RAW_SIZE (i); j++)
+ for (j = 0; j < register_size (gdbarch, i); j++)
{
int idx;
- if (TARGET_BYTE_ORDER == BFD_ENDIAN_BIG)
+ if (gdbarch_byte_order (gdbarch) == BFD_ENDIAN_BIG)
idx = j;
else
- idx = REGISTER_RAW_SIZE (i) - 1 - j;
- fprintf_filtered (file, "%02x", (unsigned char) raw_buffer[idx]);
+ idx = register_size (gdbarch, i) - 1 - j;
+ fprintf_filtered (file, "%02x", (unsigned char) buffer[idx]);
}
fprintf_filtered (file, ")");
}
else
{
/* Print the register in hex. */
- val_print (REGISTER_VIRTUAL_TYPE (i), virtual_buffer, 0, 0,
+ val_print (register_type (gdbarch, i), buffer, 0, 0,
file, 'x', 1, 0, Val_pretty_default);
/* If not a vector register, print it also according to its
natural format. */
- if (TYPE_VECTOR (REGISTER_VIRTUAL_TYPE (i)) == 0)
+ if (TYPE_VECTOR (register_type (gdbarch, i)) == 0)
{
fprintf_filtered (file, "\t");
- val_print (REGISTER_VIRTUAL_TYPE (i), virtual_buffer, 0, 0,
+ val_print (register_type (gdbarch, i), buffer, 0, 0,
file, 0, 1, 0, Val_pretty_default);
}
}
void
registers_info (char *addr_exp, int fpregs)
{
+ struct frame_info *frame;
+ struct gdbarch *gdbarch;
int regnum, numregs;
- register char *end;
+ char *end;
if (!target_has_registers)
- error ("The program has no registers now.");
- if (deprecated_selected_frame == NULL)
- error ("No selected frame.");
+ error (_("The program has no registers now."));
+ frame = get_selected_frame (NULL);
+ gdbarch = get_frame_arch (frame);
if (!addr_exp)
{
- gdbarch_print_registers_info (current_gdbarch, gdb_stdout,
- deprecated_selected_frame, -1, fpregs);
+ gdbarch_print_registers_info (gdbarch, gdb_stdout,
+ frame, -1, fpregs);
return;
}
if (addr_exp[0] == '$')
addr_exp++;
if (isspace ((*addr_exp)) || (*addr_exp) == '\0')
- error ("Missing register name");
+ error (_("Missing register name"));
/* Find the start/end of this register name/num/group. */
start = addr_exp;
while ((*addr_exp) != '\0' && !isspace ((*addr_exp)))
addr_exp++;
end = addr_exp;
-
+
/* Figure out what we've found and display it. */
/* A register name? */
{
- int regnum = frame_map_name_to_regnum (start, end - start);
+ int regnum = frame_map_name_to_regnum (frame, start, end - start);
if (regnum >= 0)
{
- gdbarch_print_registers_info (current_gdbarch, gdb_stdout,
- deprecated_selected_frame, regnum, fpregs);
+ /* User registers lie completely outside of the range of
+ normal registers. Catch them early so that the target
+ never sees them. */
+ if (regnum >= gdbarch_num_regs (gdbarch)
+ + gdbarch_num_pseudo_regs (gdbarch))
+ {
+ struct value *val = value_of_user_reg (regnum, frame);
+
+ printf_filtered ("%s: ", start);
+ print_scalar_formatted (value_contents (val),
+ check_typedef (value_type (val)),
+ 'x', 0, gdb_stdout);
+ printf_filtered ("\n");
+ }
+ else
+ gdbarch_print_registers_info (gdbarch, gdb_stdout,
+ frame, regnum, fpregs);
continue;
}
}
-
+
/* A register number? (how portable is this one?). */
{
char *endptr;
int regnum = strtol (start, &endptr, 0);
if (endptr == end
&& regnum >= 0
- && regnum < NUM_REGS + NUM_PSEUDO_REGS)
+ && regnum < gdbarch_num_regs (gdbarch)
+ + gdbarch_num_pseudo_regs (gdbarch))
{
- gdbarch_print_registers_info (current_gdbarch, gdb_stdout,
- deprecated_selected_frame, regnum, fpregs);
+ gdbarch_print_registers_info (gdbarch, gdb_stdout,
+ frame, regnum, fpregs);
continue;
}
}
/* A register group? */
{
- struct reggroup *const *group;
- for (group = reggroups (current_gdbarch);
- (*group) != NULL;
- group++)
+ struct reggroup *group;
+ for (group = reggroup_next (gdbarch, NULL);
+ group != NULL;
+ group = reggroup_next (gdbarch, group))
{
/* Don't bother with a length check. Should the user
enter a short register group name, go with the first
group that matches. */
- if (strncmp (start, reggroup_name ((*group)), end - start) == 0)
+ if (strncmp (start, reggroup_name (group), end - start) == 0)
break;
}
- if ((*group) != NULL)
+ if (group != NULL)
{
int regnum;
- for (regnum = 0; regnum < NUM_REGS + NUM_PSEUDO_REGS; regnum++)
+ for (regnum = 0;
+ regnum < gdbarch_num_regs (gdbarch)
+ + gdbarch_num_pseudo_regs (gdbarch);
+ regnum++)
{
- if (gdbarch_register_reggroup_p (current_gdbarch, regnum,
- (*group)))
- gdbarch_print_registers_info (current_gdbarch,
- gdb_stdout, deprecated_selected_frame,
+ if (gdbarch_register_reggroup_p (gdbarch, regnum, group))
+ gdbarch_print_registers_info (gdbarch,
+ gdb_stdout, frame,
regnum, fpregs);
}
continue;
}
/* Nothing matched. */
- error ("Invalid register `%.*s'", (int) (end - start), start);
+ error (_("Invalid register `%.*s'"), (int) (end - start), start);
}
}
print_vector_info (struct gdbarch *gdbarch, struct ui_file *file,
struct frame_info *frame, const char *args)
{
- if (!target_has_registers)
- error ("The program has no registers now.");
- if (deprecated_selected_frame == NULL)
- error ("No selected frame.");
-
if (gdbarch_print_vector_info_p (gdbarch))
gdbarch_print_vector_info (gdbarch, file, frame, args);
else
int regnum;
int printed_something = 0;
- for (regnum = 0; regnum < NUM_REGS + NUM_PSEUDO_REGS; regnum++)
+ for (regnum = 0;
+ regnum < gdbarch_num_regs (gdbarch)
+ + gdbarch_num_pseudo_regs (gdbarch);
+ regnum++)
{
if (gdbarch_register_reggroup_p (gdbarch, regnum, vector_reggroup))
{
static void
vector_info (char *args, int from_tty)
{
- print_vector_info (current_gdbarch, gdb_stdout, deprecated_selected_frame, args);
+ if (!target_has_registers)
+ error (_("The program has no registers now."));
+
+ print_vector_info (current_gdbarch, gdb_stdout,
+ get_selected_frame (NULL), args);
}
\f
if (query ("A program is being debugged already. Kill it? "))
target_kill ();
else
- error ("Not killed.");
+ error (_("Not killed."));
}
+ /* Clean up any leftovers from other runs. Some other things from
+ this function should probably be moved into target_pre_inferior. */
+ target_pre_inferior (from_tty);
+
+ /* Clear out solib state. Otherwise the solib state of the previous
+ inferior might have survived and is entirely wrong for the new
+ target. This has been observed on GNU/Linux using glibc 2.3. How
+ to reproduce:
+
+ bash$ ./foo&
+ [1] 4711
+ bash$ ./foo&
+ [1] 4712
+ bash$ gdb ./foo
+ [...]
+ (gdb) attach 4711
+ (gdb) detach
+ (gdb) attach 4712
+ Cannot access memory at address 0xdeadbeef
+ */
+ clear_solib ();
+
target_attach (args, from_tty);
/* Set up the "saved terminal modes" of the inferior
based on what modes we are starting it with. */
target_terminal_init ();
- /* Install inferior's terminal modes. */
- target_terminal_inferior ();
-
/* Set up execution context to know that we should return from
wait_for_inferior as soon as the target reports a stop. */
init_wait_for_inferior ();
/* No traps are generated when attaching to inferior under Mach 3
or GNU hurd. */
#ifndef ATTACH_NO_WAIT
- stop_soon_quietly = 1;
+ /* Careful here. See comments in inferior.h. Basically some OSes
+ don't ignore SIGSTOPs on continue requests anymore. We need a
+ way for handle_inferior_event to reset the stop_signal variable
+ after an attach, and this is what STOP_QUIETLY_NO_SIGSTOP is for. */
+ stop_soon = STOP_QUIETLY_NO_SIGSTOP;
wait_for_inferior ();
+ stop_soon = NO_STOP_QUIETLY;
#endif
/*
symbol_file_add_main (full_exec_path, from_tty);
}
}
-
-#ifdef SOLIB_ADD
- /* Add shared library symbols from the newly attached process, if any. */
- SOLIB_ADD ((char *) 0, from_tty, ¤t_target, auto_solib_add);
- re_enable_breakpoints_in_shlibs ();
-#endif
+ else
+ {
+ reopen_exec_file ();
+ reread_symbols ();
+ }
/* Take any necessary post-attaching actions for this platform.
*/
target_post_attach (PIDGET (inferior_ptid));
+ post_create_inferior (¤t_target, from_tty);
+
+ /* Install inferior's terminal modes. */
+ target_terminal_inferior ();
+
normal_stop ();
- if (attach_hook)
- attach_hook ();
+ if (deprecated_attach_hook)
+ deprecated_attach_hook ();
}
/*
static void
detach_command (char *args, int from_tty)
{
- dont_repeat (); /* Not for the faint of heart */
+ dont_repeat (); /* Not for the faint of heart. */
target_detach (args, from_tty);
#if defined(SOLIB_RESTART)
SOLIB_RESTART ();
#endif
- if (detach_hook)
- detach_hook ();
+ if (deprecated_detach_hook)
+ deprecated_detach_hook ();
+}
+
+/* Disconnect from the current target without resuming it (leaving it
+ waiting for a debugger).
+
+ We'd better not have left any breakpoints in the program or the
+ next debugger will get confused. Currently only supported for some
+ remote targets, since the normal attach mechanisms don't work on
+ stopped processes on some native platforms (e.g. GNU/Linux). */
+
+static void
+disconnect_command (char *args, int from_tty)
+{
+ dont_repeat (); /* Not for the faint of heart */
+ target_disconnect (args, from_tty);
+#if defined(SOLIB_RESTART)
+ SOLIB_RESTART ();
+#endif
+ if (deprecated_detach_hook)
+ deprecated_detach_hook ();
}
/* Stop the execution of the target while running in async mode, in
void
interrupt_target_command (char *args, int from_tty)
{
- if (event_loop_p && target_can_async_p ())
+ if (target_can_async_p ())
{
dont_repeat (); /* Not for the faint of heart */
target_stop ();
}
}
-/* ARGSUSED */
static void
print_float_info (struct gdbarch *gdbarch, struct ui_file *file,
struct frame_info *frame, const char *args)
{
- if (!target_has_registers)
- error ("The program has no registers now.");
- if (deprecated_selected_frame == NULL)
- error ("No selected frame.");
-
if (gdbarch_print_float_info_p (gdbarch))
gdbarch_print_float_info (gdbarch, file, frame, args);
else
int regnum;
int printed_something = 0;
- for (regnum = 0; regnum < NUM_REGS + NUM_PSEUDO_REGS; regnum++)
+ for (regnum = 0;
+ regnum < gdbarch_num_regs (gdbarch)
+ + gdbarch_num_pseudo_regs (gdbarch);
+ regnum++)
{
if (gdbarch_register_reggroup_p (gdbarch, regnum, float_reggroup))
{
static void
float_info (char *args, int from_tty)
{
- print_float_info (current_gdbarch, gdb_stdout, deprecated_selected_frame, args);
+ if (!target_has_registers)
+ error (_("The program has no registers now."));
+
+ print_float_info (current_gdbarch, gdb_stdout,
+ get_selected_frame (NULL), args);
}
\f
-/* ARGSUSED */
static void
unset_command (char *args, int from_tty)
{
- printf_filtered ("\"unset\" must be followed by the name of ");
- printf_filtered ("an unset subcommand.\n");
+ printf_filtered (_("\
+\"unset\" must be followed by the name of an unset subcommand.\n"));
help_list (unsetlist, "unset ", -1, gdb_stdout);
}
void
_initialize_infcmd (void)
{
- struct cmd_list_element *c;
-
- c = add_com ("tty", class_run, tty_command,
- "Set terminal for future runs of program being debugged.");
- set_cmd_completer (c, filename_completer);
-
- c = add_set_cmd ("args", class_run, var_string_noescape,
- (char *) &inferior_args,
- "Set argument list to give program being debugged when it is started.\n\
-Follow this command with any number of args, to be passed to the program.",
- &setlist);
- set_cmd_completer (c, filename_completer);
- set_cmd_sfunc (c, notice_args_set);
- c = add_show_from_set (c, &showlist);
- set_cmd_sfunc (c, notice_args_read);
-
- c = add_cmd
- ("environment", no_class, environment_info,
- "The environment to give the program, or one variable's value.\n\
+ struct cmd_list_element *c = NULL;
+
+ /* add the filename of the terminal connected to inferior I/O */
+ add_setshow_filename_cmd ("inferior-tty", class_run,
+ &inferior_io_terminal, _("\
+Set terminal for future runs of program being debugged."), _("\
+Show terminal for future runs of program being debugged."), _("\
+Usage: set inferior-tty /dev/pts/1"), NULL, NULL, &setlist, &showlist);
+ add_com_alias ("tty", "set inferior-tty", class_alias, 0);
+
+ add_setshow_optional_filename_cmd ("args", class_run,
+ &inferior_args, _("\
+Set argument list to give program being debugged when it is started."), _("\
+Show argument list to give program being debugged when it is started."), _("\
+Follow this command with any number of args, to be passed to the program."),
+ notice_args_set,
+ notice_args_read,
+ &setlist, &showlist);
+
+ c = add_cmd ("environment", no_class, environment_info, _("\
+The environment to give the program, or one variable's value.\n\
With an argument VAR, prints the value of environment variable VAR to\n\
give the program being debugged. With no arguments, prints the entire\n\
-environment to be given to the program.", &showlist);
+environment to be given to the program."), &showlist);
set_cmd_completer (c, noop_completer);
add_prefix_cmd ("unset", no_class, unset_command,
- "Complement to certain \"set\" commands.",
+ _("Complement to certain \"set\" commands."),
&unsetlist, "unset ", 0, &cmdlist);
- c = add_cmd ("environment", class_run, unset_environment_command,
- "Cancel environment variable VAR for the program.\n\
-This does not affect the program until the next \"run\" command.",
+ c = add_cmd ("environment", class_run, unset_environment_command, _("\
+Cancel environment variable VAR for the program.\n\
+This does not affect the program until the next \"run\" command."),
&unsetlist);
set_cmd_completer (c, noop_completer);
- c = add_cmd ("environment", class_run, set_environment_command,
- "Set environment variable value to give the program.\n\
+ c = add_cmd ("environment", class_run, set_environment_command, _("\
+Set environment variable value to give the program.\n\
Arguments are VAR VALUE where VAR is variable name and VALUE is value.\n\
VALUES of environment variables are uninterpreted strings.\n\
-This does not affect the program until the next \"run\" command.",
+This does not affect the program until the next \"run\" command."),
&setlist);
set_cmd_completer (c, noop_completer);
- c = add_com ("path", class_files, path_command,
- "Add directory DIR(s) to beginning of search path for object files.\n\
+ c = add_com ("path", class_files, path_command, _("\
+Add directory DIR(s) to beginning of search path for object files.\n\
$cwd in the path means the current working directory.\n\
This path is equivalent to the $PATH shell variable. It is a list of\n\
directories, separated by colons. These directories are searched to find\n\
-fully linked executable files and separately compiled object files as needed.");
+fully linked executable files and separately compiled object files as needed."));
set_cmd_completer (c, filename_completer);
- c = add_cmd ("paths", no_class, path_info,
- "Current search path for finding object files.\n\
+ c = add_cmd ("paths", no_class, path_info, _("\
+Current search path for finding object files.\n\
$cwd in the path means the current working directory.\n\
This path is equivalent to the $PATH shell variable. It is a list of\n\
directories, separated by colons. These directories are searched to find\n\
-fully linked executable files and separately compiled object files as needed.",
+fully linked executable files and separately compiled object files as needed."),
&showlist);
set_cmd_completer (c, noop_completer);
- add_com ("attach", class_run, attach_command,
- "Attach to a process or file outside of GDB.\n\
+ add_com ("attach", class_run, attach_command, _("\
+Attach to a process or file outside of GDB.\n\
This command attaches to another target, of the same type as your last\n\
\"target\" command (\"info files\" will show your target stack).\n\
The command may take as argument a process id or a device file.\n\
program running in the process, looking first in the current working\n\
directory, or (if not found there) using the source file search path\n\
(see the \"directory\" command). You can also use the \"file\" command\n\
-to specify the program, and to load its symbol table.");
+to specify the program, and to load its symbol table."));
- add_com ("detach", class_run, detach_command,
- "Detach a process or file previously attached.\n\
+ add_prefix_cmd ("detach", class_run, detach_command, _("\
+Detach a process or file previously attached.\n\
If a process, it is no longer traced, and it continues its execution. If\n\
-you were debugging a file, the file is closed and gdb no longer accesses it.");
+you were debugging a file, the file is closed and gdb no longer accesses it."),
+ &detachlist, "detach ", 0, &cmdlist);
- add_com ("signal", class_run, signal_command,
- "Continue program giving it signal specified by the argument.\n\
-An argument of \"0\" means continue program without giving it a signal.");
+ add_com ("disconnect", class_run, disconnect_command, _("\
+Disconnect from a target.\n\
+The target will wait for another debugger to connect. Not available for\n\
+all targets."));
- add_com ("stepi", class_run, stepi_command,
- "Step one instruction exactly.\n\
-Argument N means do this N times (or till program stops for another reason).");
+ add_com ("signal", class_run, signal_command, _("\
+Continue program giving it signal specified by the argument.\n\
+An argument of \"0\" means continue program without giving it a signal."));
+
+ add_com ("stepi", class_run, stepi_command, _("\
+Step one instruction exactly.\n\
+Argument N means do this N times (or till program stops for another reason)."));
add_com_alias ("si", "stepi", class_alias, 0);
- add_com ("nexti", class_run, nexti_command,
- "Step one instruction, but proceed through subroutine calls.\n\
-Argument N means do this N times (or till program stops for another reason).");
+ add_com ("nexti", class_run, nexti_command, _("\
+Step one instruction, but proceed through subroutine calls.\n\
+Argument N means do this N times (or till program stops for another reason)."));
add_com_alias ("ni", "nexti", class_alias, 0);
- add_com ("finish", class_run, finish_command,
- "Execute until selected stack frame returns.\n\
-Upon return, the value returned is printed and put in the value history.");
+ add_com ("finish", class_run, finish_command, _("\
+Execute until selected stack frame returns.\n\
+Upon return, the value returned is printed and put in the value history."));
- add_com ("next", class_run, next_command,
- "Step program, proceeding through subroutine calls.\n\
+ add_com ("next", class_run, next_command, _("\
+Step program, proceeding through subroutine calls.\n\
Like the \"step\" command as long as subroutine calls do not happen;\n\
when they do, the call is treated as one instruction.\n\
-Argument N means do this N times (or till program stops for another reason).");
+Argument N means do this N times (or till program stops for another reason)."));
add_com_alias ("n", "next", class_run, 1);
if (xdb_commands)
add_com_alias ("S", "next", class_run, 1);
- add_com ("step", class_run, step_command,
- "Step program until it reaches a different source line.\n\
-Argument N means do this N times (or till program stops for another reason).");
+ add_com ("step", class_run, step_command, _("\
+Step program until it reaches a different source line.\n\
+Argument N means do this N times (or till program stops for another reason)."));
add_com_alias ("s", "step", class_run, 1);
- c = add_com ("until", class_run, until_command,
- "Execute until the program reaches a source line greater than the current\n\
-or a specified location (same args as break command) within the current frame.");
+ c = add_com ("until", class_run, until_command, _("\
+Execute until the program reaches a source line greater than the current\n\
+or a specified location (same args as break command) within the current frame."));
set_cmd_completer (c, location_completer);
add_com_alias ("u", "until", class_run, 1);
- c = add_com ("advance", class_run, advance_command,
- "Continue the program up to the given location (same form as args for break command).\n\
-Execution will also stop upon exit from the current stack frame.");
+ c = add_com ("advance", class_run, advance_command, _("\
+Continue the program up to the given location (same form as args for break command).\n\
+Execution will also stop upon exit from the current stack frame."));
set_cmd_completer (c, location_completer);
- c = add_com ("jump", class_run, jump_command,
- "Continue program being debugged at specified line or address.\n\
+ c = add_com ("jump", class_run, jump_command, _("\
+Continue program being debugged at specified line or address.\n\
Give as argument either LINENUM or *ADDR, where ADDR is an expression\n\
-for an address to start at.");
+for an address to start at."));
set_cmd_completer (c, location_completer);
if (xdb_commands)
{
- c = add_com ("go", class_run, go_command,
- "Usage: go <location>\n\
+ c = add_com ("go", class_run, go_command, _("\
+Usage: go <location>\n\
Continue program being debugged, stopping at specified line or \n\
address.\n\
Give as argument either LINENUM or *ADDR, where ADDR is an \n\
expression for an address to start at.\n\
-This command is a combination of tbreak and jump.");
+This command is a combination of tbreak and jump."));
set_cmd_completer (c, location_completer);
}
if (xdb_commands)
add_com_alias ("g", "go", class_run, 1);
- add_com ("continue", class_run, continue_command,
- "Continue program being debugged, after signal or breakpoint.\n\
+ add_com ("continue", class_run, continue_command, _("\
+Continue program being debugged, after signal or breakpoint.\n\
If proceeding from breakpoint, a number N may be used as an argument,\n\
which means to set the ignore count of that breakpoint to N - 1 (so that\n\
-the breakpoint won't break until the Nth time it is reached).");
+the breakpoint won't break until the Nth time it is reached)."));
add_com_alias ("c", "cont", class_run, 1);
add_com_alias ("fg", "cont", class_run, 1);
- c = add_com ("run", class_run, run_command,
- "Start debugged program. You may specify arguments to give it.\n\
+ c = add_com ("run", class_run, run_command, _("\
+Start debugged program. You may specify arguments to give it.\n\
Args may include \"*\", or \"[...]\"; they are expanded using \"sh\".\n\
Input and output redirection with \">\", \"<\", or \">>\" are also allowed.\n\n\
With no arguments, uses arguments last specified (with \"run\" or \"set args\").\n\
To cancel previous arguments and run with no arguments,\n\
-use \"set args\" without arguments.");
+use \"set args\" without arguments."));
set_cmd_completer (c, filename_completer);
add_com_alias ("r", "run", class_run, 1);
if (xdb_commands)
add_com ("R", class_run, run_no_args_command,
- "Start debugged program with no arguments.");
+ _("Start debugged program with no arguments."));
+
+ c = add_com ("start", class_run, start_command, _("\
+Run the debugged program until the beginning of the main procedure.\n\
+You may specify arguments to give to your program, just as with the\n\
+\"run\" command."));
+ set_cmd_completer (c, filename_completer);
add_com ("interrupt", class_run, interrupt_target_command,
- "Interrupt the execution of the debugged program.");
+ _("Interrupt the execution of the debugged program."));
- add_info ("registers", nofp_registers_info,
- "List of integer registers and their contents, for selected stack frame.\n\
-Register name as argument means describe only that register.");
+ add_info ("registers", nofp_registers_info, _("\
+List of integer registers and their contents, for selected stack frame.\n\
+Register name as argument means describe only that register."));
add_info_alias ("r", "registers", 1);
if (xdb_commands)
- add_com ("lr", class_info, nofp_registers_info,
- "List of integer registers and their contents, for selected stack frame.\n\
- Register name as argument means describe only that register.");
- add_info ("all-registers", all_registers_info,
- "List of all registers and their contents, for selected stack frame.\n\
-Register name as argument means describe only that register.");
+ add_com ("lr", class_info, nofp_registers_info, _("\
+List of integer registers and their contents, for selected stack frame.\n\
+Register name as argument means describe only that register."));
+ add_info ("all-registers", all_registers_info, _("\
+List of all registers and their contents, for selected stack frame.\n\
+Register name as argument means describe only that register."));
add_info ("program", program_info,
- "Execution status of the program.");
+ _("Execution status of the program."));
add_info ("float", float_info,
- "Print the status of the floating point unit\n");
+ _("Print the status of the floating point unit\n"));
add_info ("vector", vector_info,
- "Print the status of the vector unit\n");
+ _("Print the status of the vector unit\n"));
inferior_environ = make_environ ();
init_environ (inferior_environ);