mirror/binutils-gdb
2
0
Fork 0
mirror of https://sourceware.org/git/binutils-gdb.git synced 2024-11-21 01:12:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

* Many places: replace "the inferior" in messages with "the program"

Browse Source 
or "the program being debugged".
	* inflow.c (try_writing_regs): Remove; it's been #if 0'd forever
	and I'm getting sick of maintaining it.
This commit is contained in:
Jim Kingdon 1993-05-25 16:22:41 +00:00
parent 30ffb593f8
commit 6fe90fc83f
13 changed files with 68 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gdb/ChangeLog
View File

@ -1,5 +1,10 @@
Tue May 25 09:36:13 1993 Jim Kingdon (kingdon@lioth.cygnus.com)
* Many places: replace "the inferior" in messages with "the program"
or "the program being debugged".
* inflow.c (try_writing_regs): Revove; it's been #if 0'd forever
and I'm getting sick of maintaining it.
* config/i386/linux.mh: Don't use \ newline; the awk scripts don't
support it.

2
gdb/altos-xdep.c
View File

@ -80,7 +80,7 @@ core_file_command (filename, from_tty)
make_cleanup (free, filename);
if (have_inferior_p ())
error ("To look at a core file, you must kill the inferior with \"kill\".");
error ("To look at a core file, you must kill the program with \"kill\".");
corechan = open (filename, O_RDONLY, 0);
if (corechan < 0)
perror_with_name (filename);

2
gdb/arm-xdep.c
View File

@ -187,7 +187,7 @@ core_file_command (filename, from_tty)
make_cleanup (free, filename);
if (have_inferior_p ())
error ("To look at a core file, you must kill the inferior with \"kill\".");
error ("To look at a core file, you must kill the program with \"kill\".");
corechan = open (filename, O_RDONLY, 0);
if (corechan < 0)
perror_with_name (filename);

2
gdb/convex-xdep.c
View File

@ -826,7 +826,7 @@ core_file_command (filename, from_tty)
make_cleanup (free, filename);
if (have_inferior_p ())
error ("To look at a core file, you must kill the inferior with \"kill\".");
error ("To look at a core file, you must kill the program with \"kill\".");
corechan = open (filename, O_RDONLY, 0);
if (corechan < 0)
perror_with_name (filename);

2
gdb/gould-xdep.c
View File

@ -69,7 +69,7 @@ core_file_command (filename, from_tty)
make_cleanup (free, filename);
if (have_inferior_p ())
error ("To look at a core file, you must kill the inferior with \"kill\".");
error ("To look at a core file, you must kill the program with \"kill\".");
corechan = open (filename, O_RDONLY, 0);
if (corechan < 0)
perror_with_name (filename);

39
gdb/main.c
View File

@ -169,7 +169,8 @@ source_cleanup PARAMS ((FILE *));
#ifndef GDBINIT_FILENAME
#define GDBINIT_FILENAME ".gdbinit"
#endif
char gdbinit[] = GDBINIT_FILENAME;
static char gdbinit[] = GDBINIT_FILENAME;
static int inhibit_gdbinit = 0;
#define ALL_CLEANUPS ((struct cleanup *)0)
@ -384,7 +385,8 @@ static void
disconnect (signo)
int signo;
{
catch_errors (quit_cover, NULL, "Could not kill inferior process");
catch_errors (quit_cover, NULL,
"Could not kill the program being debugged");
signal (SIGHUP, SIG_DFL);
kill (getpid (), SIGHUP);
}
@ -431,7 +433,6 @@ main (argc, argv)
char **argv;
{
int count;
static int inhibit_gdbinit = 0;
static int quiet = 0;
static int batch = 0;
@ -1454,7 +1455,7 @@ command_line_input (prrompt, repeat)
}
#ifdef STOP_SIGNAL
signal (SIGTSTP, SIG_DFL);
signal (STOP_SIGNAL, SIG_DFL);
#endif
immediate_quit--;
@ -1893,7 +1894,7 @@ print_gdb_version (stream)
FILE *stream;
{
fprintf_filtered (stream, "\
GDB %s, Copyright 1992 Free Software Foundation, Inc.",
GDB %s, Copyright 1993 Free Software Foundation, Inc.",
version);
}
@ -1926,15 +1927,20 @@ quit_command (args, from_tty)
{
if (inferior_pid != 0 && target_has_execution)
{
if (query ("The program is running. Quit anyway? "))
if (attach_flag)
{
if (attach_flag)
if (query ("The program is running. Quit anyway (and detach it)? "))
target_detach (args, from_tty);
else
target_kill ();
error ("Not confirmed.");
}
else
error ("Not confirmed.");
{
if (query ("The program is running. Quit anyway (and kill it)? "))
target_kill ();
else
error ("Not confirmed.");
}
}
/* Save the history information if it is appropriate to do so. */
if (write_history_p && history_filename)
@ -2043,14 +2049,15 @@ source_command (args, from_tty)
struct cleanup *cleanups;
char *file = args;
if (file == 0)
/* Let source without arguments read .gdbinit. */
file = gdbinit;
if (file == NULL)
{
error ("source command requires pathname of file to source.");
}
file = tilde_expand (file);
make_cleanup (free, file);
stream = fopen (file, "r");
stream = fopen (file, FOPEN_RT);
if (stream == 0)
perror_with_name (file);
@ -2184,13 +2191,13 @@ set_history_size_command (args, from_tty, c)
int from_tty;
struct cmd_list_element *c;
{
if (history_size == UINT_MAX)
if (history_size == INT_MAX)
unstifle_history ();
else if (history_size >= 0)
stifle_history (history_size);
else
{
history_size = UINT_MAX;
history_size = INT_MAX;
error ("History size must be non-negative");
}
}
@ -2453,7 +2460,7 @@ Use \"on\" to enable to enable the saving, and \"off\" to disable it.\n\
Without an argument, saving is enabled.", &sethistlist),
&showhistlist);
c = add_set_cmd ("size", no_class, var_uinteger, (char *)&history_size,
c = add_set_cmd ("size", no_class, var_integer, (char *)&history_size,
"Set the size of the command history, \n\
ie. the number of previous commands to keep a record of.", &sethistlist);
add_show_from_set (c, &showhistlist);

92
gdb/printcmd.c
View File

@ -218,7 +218,7 @@ decode_format (string_ptr, oformat, osize)
{
if (*p == 'b' || *p == 'h' || *p == 'w' || *p == 'g')
val.size = *p++;
#ifdef LONG_LONG
#ifdef CC_HAS_LONG_LONG
else if (*p == 'l')
{
val.size = 'g';
@ -231,7 +231,7 @@ decode_format (string_ptr, oformat, osize)
break;
}
#ifndef LONG_LONG
#ifndef CC_HAS_LONG_LONG
/* Make sure 'g' size is not used on integer types.
Well, actually, we can handle hex. */
if (val.size == 'g' && val.format != 'f' && val.format != 'x')
@ -398,75 +398,33 @@ print_scalar_formatted (valaddr, type, format, size, stream)
if (!size)
{
/* no size specified, like in print. Print varying # of digits. */
#if defined (LONG_LONG)
fprintf_filtered (stream, local_hex_format_custom("ll"), val_long);
#else /* not LONG_LONG. */
fprintf_filtered (stream, local_hex_format_custom("l"), val_long);
#endif /* not LONG_LONG. */
print_longest (stream, 'x', 1, val_long);
}
else
#if defined (LONG_LONG)
switch (size)
{
case 'b':
fprintf_filtered (stream, local_hex_format_custom("02ll"), val_long);
break;
case 'h':
fprintf_filtered (stream, local_hex_format_custom("04ll"), val_long);
break;
case 'w':
fprintf_filtered (stream, local_hex_format_custom("08ll"), val_long);
break;
case 'g':
fprintf_filtered (stream, local_hex_format_custom("016ll"), val_long);
break;
default:
error ("Undefined output size \"%c\".", size);
}
#else /* not LONG_LONG. */
switch (size)
{
case 'b':
fprintf_filtered (stream, local_hex_format_custom("02"), val_long);
break;
case 'h':
fprintf_filtered (stream, local_hex_format_custom("04"), val_long);
break;
case 'w':
fprintf_filtered (stream, local_hex_format_custom("08"), val_long);
break;
case 'g':
fprintf_filtered (stream, local_hex_format_custom("016"), val_long);
break;
default:
error ("Undefined output size \"%c\".", size);
}
#endif /* not LONG_LONG */
switch (size)
{
case 'b':
case 'h':
case 'w':
case 'g':
print_longest (stream, size, 1, val_long);
break;
default:
error ("Undefined output size \"%c\".", size);
}
break;
case 'd':
#ifdef LONG_LONG
fprintf_filtered (stream, local_decimal_format_custom("ll"), val_long);
#else
fprintf_filtered (stream, local_decimal_format(), val_long);
#endif
print_longest (stream, 'd', 1, val_long);
break;
case 'u':
#ifdef LONG_LONG
fprintf_filtered (stream, "%llu", val_long);
#else
fprintf_filtered (stream, "%u", val_long);
#endif
print_longest (stream, 'u', 0, val_long);
break;
case 'o':
if (val_long)
#ifdef LONG_LONG
fprintf_filtered (stream, local_octal_format_custom("ll"), val_long);
#else
fprintf_filtered (stream, local_octal_format(), val_long);
#endif
print_longest (stream, 'o', 1, val_long);
else
fprintf_filtered (stream, "0");
break;
@ -619,7 +577,7 @@ print_address_symbolic (addr, stream, do_demangle, leadin)
fputs_filtered ("<", stream);
fputs_filtered (name, stream);
if (addr != name_location)
fprintf_filtered (stream, "+%d>", (int)(addr - name_location));
fprintf_filtered (stream, "+%u>", (unsigned int)(addr - name_location));
else
fputs_filtered (">", stream);
}
@ -695,7 +653,7 @@ do_examine (fmt, addr)
else if (size == 'w')
val_type = builtin_type_long;
else if (size == 'g')
#ifndef LONG_LONG
#ifndef CC_HAS_LONG_LONG
val_type = builtin_type_double;
#else
val_type = builtin_type_long_long;
@ -1553,8 +1511,8 @@ print_frame_args (func, fi, num, stream)
and it is passed as a double and converted to float by
the prologue (in the latter case the type of the LOC_ARG
symbol is double and the type of the LOC_LOCAL symbol is
float). It's possible this should be dealt with in
symbol reading the way it now is for LOC_REGPARM. */
float). There are also LOC_ARG/LOC_REGISTER pairs which
are not combined in symbol-reading. */
/* But if the parameter name is null, don't try it.
Null parameter names occur on the RS/6000, for traceback tables.
FIXME, should we even print them? */
@ -1835,11 +1793,11 @@ printf_command (arg, from_tty)
argindex += sizeof (double);
}
else
#ifdef LONG_LONG
#ifdef CC_HAS_LONG_LONG
if (argclass[i] == long_long_arg)
{
*(long long *) &arg_bytes[argindex] = value_as_long (val_args[i]);
argindex += sizeof (long long);
*(LONGEST *) &arg_bytes[argindex] = value_as_long (val_args[i]);
argindex += sizeof (LONGEST);
}
else
#endif
@ -2059,7 +2017,7 @@ You can see these environment settings with the \"show\" command.",
/* "call" is the same as "set", but handy for dbx users to call fns. */
add_com ("call", class_vars, call_command,
"Call a function in the inferior process.\n\
"Call a function in the program.\n\
The argument is the function name and arguments, in the notation of the\n\
current working language. The result is printed and saved in the value\n\
history, if it is not void.");

3
gdb/procfs.c
View File

@ -2961,7 +2961,8 @@ info_proc (args, from_tty)
if (!pip -> valid)
{
error ("No process. Run an inferior or specify an explicit pid.");
error ("\
No process. Start debugging a program or specify an explicit process ID.");
}
if (ioctl (pip -> fd, PIOCSTATUS, &(pip -> prstatus)) < 0)
{

6
gdb/pyr-xdep.c
View File

@ -49,13 +49,13 @@ fetch_inferior_registers (regno)
reg_buf[regno] = ptrace (3, inferior_pid, (PTRACE_ARG3_TYPE) regno, 0);
#if defined(PYRAMID_CONTROL_FRAME_DEBUGGING)
printf ("Fetching %s from inferior, got %0x\n",
printf ("Fetching register %s, got %0x\n",
reg_names[regno],
reg_buf[regno]);
#endif /* PYRAMID_CONTROL_FRAME_DEBUGGING */
if (reg_buf[regno] == -1 && errno == EIO) {
printf("fetch_interior_registers: fetching %s from inferior\n",
printf("fetch_interior_registers: fetching register %s\n",
reg_names[regno]);
errno = 0;
}
@ -231,7 +231,7 @@ core_file_command (filename, from_tty)
make_cleanup (free, filename);
if (have_inferior_p ())
error ("To look at a core file, you must kill the inferior with \"kill\".");
error ("To look at a core file, you must kill the program with \"kill\".");
corechan = open (filename, O_RDONLY, 0);
if (corechan < 0)
perror_with_name (filename);

6
gdb/stack.c
View File

@ -388,7 +388,7 @@ frame_info (addr_exp, from_tty)
enum language funlang = language_unknown;
if (!target_has_stack)
error ("No inferior or core file.");
error ("No stack.");
frame = parse_frame_specification (addr_exp);
if (!frame)
@ -897,8 +897,8 @@ print_frame_arg_vars (frame, stream)
and it is passed as a double and converted to float by
the prologue (in the latter case the type of the LOC_ARG
symbol is double and the type of the LOC_LOCAL symbol is
float). It's possible this should be dealt with in
symbol reading the way it now is for LOC_REGPARM. */
float). There are also LOC_ARG/LOC_REGISTER pairs which
are not combined in symbol-reading. */
sym2 = lookup_symbol (SYMBOL_NAME (sym),
b, VAR_NAMESPACE, (int *)NULL, (struct symtab **)NULL);

2
gdb/sun386-nat.c
View File

@ -77,7 +77,7 @@ core_file_command (filename, from_tty)
make_cleanup (free, filename);
if (have_inferior_p ())
error ("To look at a core file, you must kill the inferior with \"kill\".");
error ("To look at a core file, you must kill the program with \"kill\".");
corechan = open (filename, O_RDONLY, 0);
if (corechan < 0)
perror_with_name (filename);

2
gdb/symm-xdep.c
View File

@ -179,7 +179,7 @@ core_file_command (filename, from_tty)
make_cleanup (free, filename);
if (have_inferior_p ())
error ("To look at a core file, you must kill the inferior with \"kill\".");
error ("To look at a core file, you must kill the program with \"kill\".");
corechan = open (filename, O_RDONLY, 0);
if (corechan < 0)
perror_with_name (filename);

2
gdb/umax-xdep.c
View File

@ -70,7 +70,7 @@ core_file_command (filename, from_tty)
make_cleanup (free, filename);
if (have_inferior_p ())
error ("To look at a core file, you must kill the inferior with \"kill\".");
error ("To look at a core file, you must kill the program with \"kill\".");
corechan = open (filename, O_RDONLY, 0);
if (corechan < 0)
perror_with_name (filename);