-/* Memory-access and commands for "inferior" (child) process, for GDB.
- Copyright 1986, 1987, 1988, 1989, 1991, 1992 Free Software Foundation, Inc.
+/* Memory-access and commands for "inferior" process, for GDB.
+ Copyright 1986, 1987, 1988, 1989, 1991, 1992, 1995, 1996 Free Software Foundation, Inc.
This file is part of GDB.
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., 675 Mass Ave, Cambridge, MA 02139, USA. */
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
#include "defs.h"
#include <signal.h>
#include <sys/param.h>
-#include <string.h>
+#include "gdb_string.h"
#include "symtab.h"
#include "gdbtypes.h"
#include "frame.h"
#include "target.h"
#include "language.h"
-static void
-continue_command PARAMS ((char *, int));
+static void continue_command PARAMS ((char *, int));
-static void
-until_next_command PARAMS ((int));
+static void until_next_command PARAMS ((int));
-static void
-until_command PARAMS ((char *, int));
+static void until_command PARAMS ((char *, int));
-static void
-path_info PARAMS ((char *, int));
+static void path_info PARAMS ((char *, int));
-static void
-path_command PARAMS ((char *, int));
+static void path_command PARAMS ((char *, int));
-static void
-unset_command PARAMS ((char *, int));
+static void unset_command PARAMS ((char *, int));
-static void
-float_info PARAMS ((char *, int));
+static void float_info PARAMS ((char *, int));
-static void
-detach_command PARAMS ((char *, int));
+static void detach_command PARAMS ((char *, int));
-static void
-nofp_registers_info PARAMS ((char *, int));
+static void nofp_registers_info PARAMS ((char *, int));
-static void
-all_registers_info PARAMS ((char *, int));
+static void all_registers_info PARAMS ((char *, int));
-static void
-registers_info PARAMS ((char *, int));
+static void registers_info PARAMS ((char *, int));
-static void
-do_registers_info PARAMS ((int, int));
+#if !defined (DO_REGISTERS_INFO)
+static void do_registers_info PARAMS ((int, int));
+#endif
-static void
-unset_environment_command PARAMS ((char *, int));
+static void unset_environment_command PARAMS ((char *, int));
-static void
-set_environment_command PARAMS ((char *, int));
+static void set_environment_command PARAMS ((char *, int));
-static void
-environment_info PARAMS ((char *, int));
+static void environment_info PARAMS ((char *, int));
-static void
-program_info PARAMS ((char *, int));
+static void program_info PARAMS ((char *, int));
-static void
-finish_command PARAMS ((char *, int));
+static void finish_command PARAMS ((char *, int));
-static void
-signal_command PARAMS ((char *, int));
+static void signal_command PARAMS ((char *, int));
-static void
-jump_command PARAMS ((char *, int));
+static void jump_command PARAMS ((char *, int));
-static void
-step_1 PARAMS ((int, int, char *));
+static void step_1 PARAMS ((int, int, char *));
-static void
-nexti_command PARAMS ((char *, int));
+static void nexti_command PARAMS ((char *, int));
-static void
-stepi_command PARAMS ((char *, int));
+static void stepi_command PARAMS ((char *, int));
-static void
-next_command PARAMS ((char *, int));
+static void next_command PARAMS ((char *, int));
-static void
-step_command PARAMS ((char *, int));
+static void step_command PARAMS ((char *, int));
-static void
-run_command PARAMS ((char *, int));
+static void run_command PARAMS ((char *, int));
+
+#ifdef CALL_DUMMY_BREAKPOINT_OFFSET
+static void breakpoint_auto_delete_contents PARAMS ((PTR));
+#endif
#define ERROR_NO_INFERIOR \
if (!target_has_execution) error ("The program is not being run.");
/* Last signal that the inferior received (why it stopped). */
-int stop_signal;
+enum target_signal stop_signal;
/* Address at which inferior stopped. */
CORE_ADDR stop_pc;
-/* Stack frame when program stopped. */
-
-FRAME_ADDR stop_frame_address;
-
/* Chain containing status of breakpoint(s) that we have stopped at. */
bpstat stop_bpstat;
This is how we know when we step into a subroutine call,
and how to set the frame for the breakpoint used to step out. */
-FRAME_ADDR step_frame_address;
+CORE_ADDR step_frame_address;
+
+/* Our notion of the current stack pointer. */
+
+CORE_ADDR step_sp;
/* 1 means step over all subroutine calls.
0 means don't step over calls (used by stepi).
dont_repeat ();
- /* Shouldn't this be target_has_execution? FIXME. */
- if (inferior_pid)
+ if (inferior_pid != 0 && target_has_execution)
{
if (
!query ("The program being debugged has been started already.\n\
target_kill ();
}
+ clear_breakpoint_hit_counts ();
+
exec_file = (char *) get_exec_file (0);
/* The exec file is re-read every time we do a generic_mourn_inferior, so
clear_proceed_status ();
- proceed ((CORE_ADDR) -1, -1, 0);
+ proceed ((CORE_ADDR) -1, TARGET_SIGNAL_DEFAULT, 0);
}
\f
/* Step until outside of current statement. */
char *count_string;
{
register int count = 1;
- FRAME fr;
+ struct frame_info *frame;
struct cleanup *cleanups = 0;
ERROR_NO_INFERIOR;
{
clear_proceed_status ();
- fr = get_current_frame ();
- if (!fr) /* Avoid coredump here. Why tho? */
+ frame = get_current_frame ();
+ if (!frame) /* Avoid coredump here. Why tho? */
error ("No current frame");
- step_frame_address = FRAME_FP (fr);
+ step_frame_address = FRAME_FP (frame);
+ step_sp = read_sp ();
if (! single_inst)
{
printf_filtered ("\
Single stepping until exit from function %s, \n\
which has no line number information.\n", name);
- gdb_flush (gdb_stdout);
}
}
else
step_over_calls = 1;
step_multi = (count > 1);
- proceed ((CORE_ADDR) -1, -1, 1);
+ proceed ((CORE_ADDR) -1, TARGET_SIGNAL_DEFAULT, 1);
if (! stop_step)
break;
addr = sal.pc;
if (from_tty)
- printf_filtered ("Continuing at %s.\n",
- local_hex_string((unsigned long) addr));
+ {
+ printf_filtered ("Continuing at ");
+ print_address_numeric (addr, 1, gdb_stdout);
+ printf_filtered (".\n");
+ }
clear_proceed_status ();
- proceed (addr, 0, 0);
+ proceed (addr, TARGET_SIGNAL_0, 0);
}
/* Continue program giving it specified signal. */
char *signum_exp;
int from_tty;
{
- register int signum;
+ enum target_signal oursig;
dont_repeat (); /* Too dangerous. */
ERROR_NO_INFERIOR;
/* 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
assign them to convenience variables. */
- signum = strtosigno (signum_exp);
+ oursig = target_signal_from_name (signum_exp);
- if (signum == 0)
- /* Not found as a name, try it as an expression. */
- signum = parse_and_eval_address (signum_exp);
+ if (oursig == TARGET_SIGNAL_UNKNOWN)
+ {
+ /* No, try numeric. */
+ int num = parse_and_eval_address (signum_exp);
+
+ if (num == 0)
+ oursig = TARGET_SIGNAL_0;
+ else
+ oursig = target_signal_from_command (num);
+ }
if (from_tty)
{
- char *signame = strsigno (signum);
- printf_filtered ("Continuing with signal ");
- if (signame == NULL || signum == 0)
- printf_filtered ("%d.\n", signum);
+ if (oursig == TARGET_SIGNAL_0)
+ printf_filtered ("Continuing with no signal.\n");
else
- /* Do we need to print the number as well as the name? */
- printf_filtered ("%s (%d).\n", signame, signum);
+ printf_filtered ("Continuing with signal %s.\n",
+ target_signal_to_name (oursig));
}
clear_proceed_status ();
- proceed (stop_pc, signum, 0);
+ /* "signal 0" should not get stuck if we are stopped at a breakpoint.
+ FIXME: Neither should "signal foo" but when I tried passing
+ (CORE_ADDR)-1 unconditionally I got a testsuite failure which I haven't
+ tried to track down yet. */
+ 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 *). */
-void
+
+#ifdef CALL_DUMMY_BREAKPOINT_OFFSET
+
+static void
breakpoint_auto_delete_contents (arg)
PTR arg;
{
breakpoint_auto_delete (*(bpstat *)arg);
}
+#endif /* CALL_DUMMY_BREAKPOINT_OFFSET */
+
/* Execute a "stack dummy", a piece of code stored in the stack
by the debugger to be executed in the inferior.
#if CALL_DUMMY_LOCATION != AT_ENTRY_POINT
sal.pc = addr - CALL_DUMMY_START_OFFSET + CALL_DUMMY_BREAKPOINT_OFFSET;
#else
- sal.pc = entry_point_address ();
+ sal.pc = CALL_DUMMY_ADDRESS ();
#endif
sal.symtab = NULL;
sal.line = 0;
bpt = set_momentary_breakpoint (sal,
get_current_frame (),
bp_call_dummy);
- bpt->disposition = delete;
+ bpt->disposition = 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
#endif /* CALL_DUMMY_BREAKPOINT_OFFSET. */
proceed_to_finish = 1; /* We want stop_registers, please... */
- proceed (addr, 0, 0);
+ proceed (addr, TARGET_SIGNAL_0, 0);
discard_cleanups (old_cleanups);
Note that eventually this command should probably be changed so
that only source lines are printed out when we hit the breakpoint
- we set. I'm going to postpone this until after a hopeful rewrite
- of wait_for_inferior and the proceed status code. -- randy */
+ we set. This may involve changes to wait_for_inferior and the
+ proceed status code. */
/* ARGSUSED */
static void
until_next_command (from_tty)
int from_tty;
{
- FRAME frame;
+ struct frame_info *frame;
CORE_ADDR pc;
struct symbol *func;
struct symtab_and_line sal;
step_over_calls = 1;
step_frame_address = FRAME_FP (frame);
-
+ step_sp = read_sp ();
+
step_multi = 0; /* Only one call to proceed */
- proceed ((CORE_ADDR) -1, -1, 1);
+ proceed ((CORE_ADDR) -1, TARGET_SIGNAL_DEFAULT, 1);
}
static void
int from_tty;
{
struct symtab_and_line sal;
- register FRAME frame;
- struct frame_info *fi;
+ register struct frame_info *frame;
register struct symbol *function;
struct breakpoint *breakpoint;
struct cleanup *old_chain;
clear_proceed_status ();
- fi = get_frame_info (frame);
- sal = find_pc_line (fi->pc, 0);
- sal.pc = fi->pc;
+ sal = find_pc_line (frame->pc, 0);
+ sal.pc = frame->pc;
breakpoint = set_momentary_breakpoint (sal, frame, bp_finish);
/* Find the function we will return from. */
- fi = get_frame_info (selected_frame);
- function = find_pc_function (fi->pc);
+ function = find_pc_function (selected_frame->pc);
/* Print info on the selected frame, including level number
but not source. */
}
proceed_to_finish = 1; /* We want stop_registers, please... */
- proceed ((CORE_ADDR) -1, -1, 0);
+ proceed ((CORE_ADDR) -1, TARGET_SIGNAL_DEFAULT, 0);
/* Did we stop at our breakpoint? */
if (bpstat_find_breakpoint(stop_bpstat, breakpoint) != NULL
&& function != 0)
{
struct type *value_type;
- register value val;
+ register value_ptr val;
CORE_ADDR funcaddr;
value_type = TYPE_TARGET_TYPE (SYMBOL_TYPE (function));
val = value_being_returned (value_type, stop_registers,
using_struct_return (value_of_variable (function, NULL),
funcaddr,
- value_type,
+ check_typedef (value_type),
BLOCK_GCC_COMPILED (SYMBOL_BLOCK_VALUE (function))));
printf_filtered ("Value returned is $%d = ", record_latest_value (val));
num = bpstat_num (&bs);
}
}
- else if (stop_signal)
+ else if (stop_signal != TARGET_SIGNAL_0)
{
-#ifdef PRINT_RANDOM_SIGNAL
- PRINT_RANDOM_SIGNAL (stop_signal);
-#else
- char *signame = strsigno (stop_signal);
- printf_filtered ("It stopped with signal ");
- if (signame == NULL)
- printf_filtered ("%d", stop_signal);
- else
- /* Do we need to print the number as well as the name? */
- printf_filtered ("%s (%d)", signame, stop_signal);
- printf_filtered (", %s.\n", safe_strsignal (stop_signal));
-#endif
- }
+ 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\" for more information.\n");
int from_tty;
{
char *exec_path;
-
+ char *env;
dont_repeat ();
- exec_path = strsave (get_in_environ (inferior_environ, path_var_name));
+ env = get_in_environ (inferior_environ, path_var_name);
+ /* Can be null if path is not set */
+ if (!env)
+ env = "";
+ exec_path = strsave (env);
mod_path (dirname, &exec_path);
set_in_environ (inferior_environ, path_var_name, exec_path);
free (exec_path);
path_info ((char *)NULL, from_tty);
}
\f
-/* This routine is getting awfully cluttered with #if's. It's probably
- time to turn this into READ_PC and define it in the tm.h file.
- Ditto for write_pc. */
+/* The array of register names. */
-CORE_ADDR
-read_pc ()
-{
-#ifdef TARGET_READ_PC
- return TARGET_READ_PC ();
-#else
- return ADDR_BITS_REMOVE ((CORE_ADDR) read_register (PC_REGNUM));
-#endif
-}
-
-void
-write_pc (val)
- CORE_ADDR val;
-{
-#ifdef TARGET_WRITE_PC
- TARGET_WRITE_PC (val);
-#else
- write_register (PC_REGNUM, (long) val);
-#ifdef NPC_REGNUM
- write_register (NPC_REGNUM, (long) val + 4);
-#ifdef NNPC_REGNUM
- write_register (NNPC_REGNUM, (long) val + 8);
-#endif
-#endif
-#endif
-}
-
-/* Cope with strage ways of getting to the stack and frame pointers */
-
-CORE_ADDR
-read_sp ()
-{
-#ifdef TARGET_READ_SP
- return TARGET_READ_SP ();
-#else
- return read_register (SP_REGNUM);
-#endif
-}
-
-void
-write_sp (val)
- CORE_ADDR val;
-{
-#ifdef TARGET_WRITE_SP
- TARGET_WRITE_SP (val);
-#else
- write_register (SP_REGNUM, val);
-#endif
-}
-
-
-CORE_ADDR
-read_fp ()
-{
-#ifdef TARGET_READ_FP
- return TARGET_READ_FP ();
-#else
- return read_register (FP_REGNUM);
-#endif
-}
-
-void
-write_fp (val)
- CORE_ADDR val;
-{
-#ifdef TARGET_WRITE_FP
- TARGET_WRITE_FP (val);
-#else
- write_register (FP_REGNUM, val);
-#endif
-}
-
-const char * const reg_names[] = REGISTER_NAMES;
+char *reg_names[] = REGISTER_NAMES;
/* Print out the machine register regnum. If regnum is -1,
print all registers (fpregs == 1) or all non-float registers
to provide that format. */
#if !defined (DO_REGISTERS_INFO)
+
#define DO_REGISTERS_INFO(regnum, fp) do_registers_info(regnum, fp)
+
static void
do_registers_info (regnum, fpregs)
int regnum;
int fpregs;
{
register int i;
+ int numregs = ARCH_NUM_REGS;
- for (i = 0; i < NUM_REGS; i++)
+ for (i = 0; i < numregs; i++)
{
char raw_buffer[MAX_REGISTER_RAW_SIZE];
char virtual_buffer[MAX_REGISTER_VIRTUAL_SIZE];
continue;
}
+ /* If the register name is empty, it is undefined for this
+ processor, so don't display anything. */
+ if (reg_names[i] == NULL || *(reg_names[i]) == '\0')
+ continue;
+
fputs_filtered (reg_names[i], gdb_stdout);
print_spaces_filtered (15 - strlen (reg_names[i]), gdb_stdout);
- /* Get the data in raw format, then convert also to virtual format. */
+ /* Get the data in raw format. */
if (read_relative_register_raw_bytes (i, raw_buffer))
{
printf_filtered ("Invalid register contents\n");
continue;
}
-
- REGISTER_CONVERT_TO_VIRTUAL (i, raw_buffer, virtual_buffer);
+
+ /* Convert raw data to virtual format if necessary. */
+#ifdef REGISTER_CONVERTIBLE
+ if (REGISTER_CONVERTIBLE (i))
+ {
+ REGISTER_CONVERT_TO_VIRTUAL (i, REGISTER_VIRTUAL_TYPE (i),
+ raw_buffer, virtual_buffer);
+ }
+ else
+#endif
+ 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
- && ! INVALID_FLOAT (virtual_buffer, REGISTER_VIRTUAL_SIZE (i)))
+ if (TYPE_CODE (REGISTER_VIRTUAL_TYPE (i)) == TYPE_CODE_FLT)
{
register int j;
- val_print (REGISTER_VIRTUAL_TYPE (i), virtual_buffer, 0,
- gdb_stdout, 0, 1, 0, Val_pretty_default);
+#ifdef INVALID_FLOAT
+ if (INVALID_FLOAT (virtual_buffer, REGISTER_VIRTUAL_SIZE (i)))
+ printf_filtered ("<invalid float>");
+ else
+#endif
+ val_print (REGISTER_VIRTUAL_TYPE (i), virtual_buffer, 0,
+ gdb_stdout, 0, 1, 0, Val_pretty_default);
printf_filtered ("\t(raw 0x");
for (j = 0; j < REGISTER_RAW_SIZE (i); j++)
- printf_filtered ("%02x", (unsigned char)raw_buffer[j]);
+ {
+ register int idx = TARGET_BYTE_ORDER == BIG_ENDIAN ? j
+ : REGISTER_RAW_SIZE (i) - 1 - j;
+ printf_filtered ("%02x", (unsigned char)raw_buffer[idx]);
+ }
printf_filtered (")");
}
/* Else if virtual format is too long for printf,
print in hex a byte at a time. */
- else if (REGISTER_VIRTUAL_SIZE (i) > sizeof (long))
+ else if (REGISTER_VIRTUAL_SIZE (i) > (int) sizeof (long))
{
register int j;
printf_filtered ("0x");
char *addr_exp;
int fpregs;
{
- int regnum;
+ int regnum, numregs;
register char *end;
if (!target_has_registers)
error ("The program has no registers now.");
+ if (selected_frame == NULL)
+ error ("No selected frame.");
if (!addr_exp)
{
end = addr_exp;
while (*end != '\0' && *end != ' ' && *end != '\t')
++end;
- for (regnum = 0; regnum < NUM_REGS; regnum++)
+ numregs = ARCH_NUM_REGS;
+ for (regnum = 0; regnum < numregs; regnum++)
if (!strncmp (addr_exp, reg_names[regnum], end - addr_exp)
&& strlen (reg_names[regnum]) == end - addr_exp)
goto found;
if (*addr_exp >= '0' && *addr_exp <= '9')
regnum = atoi (addr_exp); /* Take a number */
- if (regnum >= NUM_REGS) /* Bad name, or bad number */
+ if (regnum >= numregs) /* Bad name, or bad number */
error ("%.*s: invalid register", end - addr_exp, addr_exp);
found:
char *args;
int from_tty;
{
+#ifdef SOLIB_ADD
+ extern int auto_solib_add;
+#endif
+
dont_repeat (); /* Not for the faint of heart */
if (target_has_execution)
clear_proceed_status ();
stop_soon_quietly = 1;
+ /* No traps are generated when attaching to inferior under Mach 3
+ or GNU hurd. */
+#ifndef ATTACH_NO_WAIT
wait_for_inferior ();
+#endif
#ifdef SOLIB_ADD
- /* Add shared library symbols from the newly attached process, if any. */
- SOLIB_ADD ((char *)0, from_tty, (struct target_ops *)0);
+ if (auto_solib_add)
+ {
+ /* Add shared library symbols from the newly attached process, if any. */
+ SOLIB_ADD ((char *)0, from_tty, (struct target_ops *)0);
+ re_enable_breakpoints_in_shlibs ();
+ }
#endif
normal_stop ();
were debugging a file, the file is closed and gdb no longer accesses it.");
add_com ("signal", class_run, signal_command,
- "Continue program giving it signal number SIGNUMBER.");
+ "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\
projects / deliverable / binutils-gdb.git / blobdiff