Change the stream argument to _filtered to GDB_FILE *.
Change all references to stdout/stderr to gdb_stdout/gdb_stderr. Replace all calls to stdio output functions with calls to corresponding _unfiltered functions (`fprintf_unfiltered') Replaced calls to fopen for output to gdb_fopen. Added sufficient goo to utils.c and defs.h to make the above work. The net effect is that stdio output functions are only directly used in utils.c. Elsewhere, the _unfiltered and _filtered functions and GDB_FILE type are used. In the near future, GDB_FILE will stop being equivalant to FILE. The semantics of some commands has changed in a very subtle way: called in the right context, they may cause new occurences of prompt_for_continue() behavior. The testsuite doesn't notice anything like this, though. Please respect this change by not reintroducing stdio output dependencies in the main body of gdb code. All output from commands should go to a GDB_FILE. Target-specific code can still use stdio directly to communicate with targets.
This commit is contained in:
Thomas Lord
parent
b3c0fc577b
commit
199b2450f6
121 changed files with 1751 additions and 1236 deletions
|
|
@ -34,7 +34,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
|
|||
/* Prototypes for local functions */
|
||||
|
||||
static void
|
||||
print_hex_chars PARAMS ((FILE *, unsigned char *, unsigned int));
|
||||
print_hex_chars PARAMS ((GDB_FILE *, unsigned char *, unsigned int));
|
||||
|
||||
static void
|
||||
show_print PARAMS ((char *, int));
|
||||
|
|
@ -61,7 +61,7 @@ static void
|
|||
set_output_radix_1 PARAMS ((int, unsigned));
|
||||
|
||||
static void
|
||||
value_print_array_elements PARAMS ((value, FILE *, int, enum val_prettyprint));
|
||||
value_print_array_elements PARAMS ((value, GDB_FILE *, int, enum val_prettyprint));
|
||||
|
||||
/* Maximum number of chars to print for a string pointer value or vector
|
||||
contents, or UINT_MAX for no limit. Note that "set print elements 0"
|
||||
|
|
@ -121,7 +121,7 @@ val_print (type, valaddr, address, stream, format, deref_ref, recurse, pretty)
|
|||
struct type *type;
|
||||
char *valaddr;
|
||||
CORE_ADDR address;
|
||||
FILE *stream;
|
||||
GDB_FILE *stream;
|
||||
int format;
|
||||
int deref_ref;
|
||||
int recurse;
|
||||
|
|
@ -143,7 +143,7 @@ val_print (type, valaddr, address, stream, format, deref_ref, recurse, pretty)
|
|||
if (TYPE_FLAGS (type) & TYPE_FLAG_STUB)
|
||||
{
|
||||
fprintf_filtered (stream, "<incomplete type>");
|
||||
fflush (stream);
|
||||
gdb_flush (stream);
|
||||
return (0);
|
||||
}
|
||||
|
||||
|
|
@ -159,7 +159,7 @@ val_print (type, valaddr, address, stream, format, deref_ref, recurse, pretty)
|
|||
int
|
||||
value_print (val, stream, format, pretty)
|
||||
value val;
|
||||
FILE *stream;
|
||||
GDB_FILE *stream;
|
||||
int format;
|
||||
enum val_prettyprint pretty;
|
||||
{
|
||||
|
|
@ -236,7 +236,7 @@ void
|
|||
val_print_type_code_int (type, valaddr, stream)
|
||||
struct type *type;
|
||||
char *valaddr;
|
||||
FILE *stream;
|
||||
GDB_FILE *stream;
|
||||
{
|
||||
char *p;
|
||||
/* Pointer to first (i.e. lowest address) nonzero character. */
|
||||
|
|
@ -258,7 +258,7 @@ val_print_type_code_int (type, valaddr, stream)
|
|||
p++)
|
||||
#else /* Little endian. */
|
||||
first_addr = valaddr;
|
||||
for (p = valaddr + TYPE_LENGTH (type);
|
||||
for (p = valaddr + TYPE_LENGTH (type) - 1;
|
||||
len > sizeof (LONGEST) && p >= valaddr;
|
||||
p--)
|
||||
#endif /* Little endian. */
|
||||
|
|
@ -317,7 +317,7 @@ val_print_type_code_int (type, valaddr, stream)
|
|||
|
||||
void
|
||||
print_longest (stream, format, use_local, val_long)
|
||||
FILE *stream;
|
||||
GDB_FILE *stream;
|
||||
int format;
|
||||
int use_local;
|
||||
LONGEST val_long;
|
||||
|
|
@ -331,7 +331,7 @@ print_longest (stream, format, use_local, val_long)
|
|||
if ((format == 'd' && (val_long < INT_MIN || val_long > INT_MAX))
|
||||
|| ((format == 'u' || format == 'x') && val_long > UINT_MAX))
|
||||
{
|
||||
fprintf_filtered (stream, "0x%x%08x", vtop, vbot);
|
||||
fprintf_filtered (stream, "0x%lx%08lx", vtop, vbot);
|
||||
return;
|
||||
}
|
||||
#endif
|
||||
|
|
@ -431,7 +431,7 @@ void
|
|||
print_floating (valaddr, type, stream)
|
||||
char *valaddr;
|
||||
struct type *type;
|
||||
FILE *stream;
|
||||
GDB_FILE *stream;
|
||||
{
|
||||
double doub;
|
||||
int inv;
|
||||
|
|
@ -447,43 +447,48 @@ print_floating (valaddr, type, stream)
|
|||
representation, but is not IEEE conforming. */
|
||||
|
||||
{
|
||||
long low, high;
|
||||
unsigned long low, high;
|
||||
/* Is the sign bit 0? */
|
||||
int nonnegative;
|
||||
/* Is it is a NaN (i.e. the exponent is all ones and
|
||||
the fraction is nonzero)? */
|
||||
int is_nan;
|
||||
|
||||
if (len == sizeof (float))
|
||||
if (len == 4)
|
||||
{
|
||||
/* It's single precision. */
|
||||
memcpy ((char *) &low, valaddr, sizeof (low));
|
||||
/* target -> host. */
|
||||
SWAP_TARGET_AND_HOST (&low, sizeof (float));
|
||||
/* It's single precision. */
|
||||
/* Assume that floating point byte order is the same as
|
||||
integer byte order. */
|
||||
low = extract_unsigned_integer (valaddr, 4);
|
||||
nonnegative = low >= 0;
|
||||
is_nan = ((((low >> 23) & 0xFF) == 0xFF)
|
||||
&& 0 != (low & 0x7FFFFF));
|
||||
low &= 0x7fffff;
|
||||
high = 0;
|
||||
}
|
||||
else
|
||||
else if (len == 8)
|
||||
{
|
||||
/* It's double precision. Get the high and low words. */
|
||||
|
||||
/* Assume that floating point byte order is the same as
|
||||
integer byte order. */
|
||||
#if TARGET_BYTE_ORDER == BIG_ENDIAN
|
||||
memcpy (&low, valaddr+4, sizeof (low));
|
||||
memcpy (&high, valaddr+0, sizeof (high));
|
||||
low = extract_unsigned_integer (valaddr + 4, 4);
|
||||
high = extract_unsigned_integer (valaddr, 4);
|
||||
#else
|
||||
memcpy (&low, valaddr+0, sizeof (low));
|
||||
memcpy (&high, valaddr+4, sizeof (high));
|
||||
low = extract_unsigned_integer (valaddr, 4);
|
||||
high = extract_unsigned_integer (valaddr + 4, 4);
|
||||
#endif
|
||||
SWAP_TARGET_AND_HOST (&low, sizeof (low));
|
||||
SWAP_TARGET_AND_HOST (&high, sizeof (high));
|
||||
nonnegative = high >= 0;
|
||||
is_nan = (((high >> 20) & 0x7ff) == 0x7ff
|
||||
&& ! ((((high & 0xfffff) == 0)) && (low == 0)));
|
||||
high &= 0xfffff;
|
||||
}
|
||||
else
|
||||
/* Extended. We can't detect NaNs for extendeds yet. Also note
|
||||
that currently extendeds get nuked to double in
|
||||
REGISTER_CONVERTIBLE. */
|
||||
is_nan = 0;
|
||||
|
||||
if (is_nan)
|
||||
{
|
||||
|
|
@ -512,7 +517,7 @@ print_floating (valaddr, type, stream)
|
|||
|
||||
static void
|
||||
print_hex_chars (stream, valaddr, len)
|
||||
FILE *stream;
|
||||
GDB_FILE *stream;
|
||||
unsigned char *valaddr;
|
||||
unsigned len;
|
||||
{
|
||||
|
|
@ -551,7 +556,7 @@ val_print_array_elements (type, valaddr, address, stream, format, deref_ref,
|
|||
struct type *type;
|
||||
char *valaddr;
|
||||
CORE_ADDR address;
|
||||
FILE *stream;
|
||||
GDB_FILE *stream;
|
||||
int format;
|
||||
int deref_ref;
|
||||
int recurse;
|
||||
|
|
@ -621,7 +626,7 @@ val_print_array_elements (type, valaddr, address, stream, format, deref_ref,
|
|||
static void
|
||||
value_print_array_elements (val, stream, format, pretty)
|
||||
value val;
|
||||
FILE *stream;
|
||||
GDB_FILE *stream;
|
||||
int format;
|
||||
enum val_prettyprint pretty;
|
||||
{
|
||||
|
|
@ -657,7 +662,7 @@ value_print_array_elements (val, stream, format, pretty)
|
|||
val_print (VALUE_TYPE (val), VALUE_CONTENTS (val) + typelen * i,
|
||||
VALUE_ADDRESS (val) + typelen * i, stream, format, 1,
|
||||
0, pretty);
|
||||
fprintf (stream, " <repeats %u times>", reps);
|
||||
fprintf_unfiltered (stream, " <repeats %u times>", reps);
|
||||
i = rep1 - 1;
|
||||
things_printed += repeat_count_threshold;
|
||||
}
|
||||
|
|
@ -684,9 +689,8 @@ int
|
|||
val_print_string (addr, len, stream)
|
||||
CORE_ADDR addr;
|
||||
unsigned int len;
|
||||
FILE *stream;
|
||||
GDB_FILE *stream;
|
||||
{
|
||||
int first_addr_err = 0; /* Nonzero if first address out of bounds. */
|
||||
int force_ellipsis = 0; /* Force ellipsis to be printed if nonzero. */
|
||||
int errcode; /* Errno returned from bad reads. */
|
||||
unsigned int fetchlimit; /* Maximum number of bytes to fetch. */
|
||||
|
|
@ -696,7 +700,7 @@ val_print_string (addr, len, stream)
|
|||
char *buffer = NULL; /* Dynamically growable fetch buffer. */
|
||||
char *bufptr; /* Pointer to next available byte in buffer. */
|
||||
char *limit; /* First location past end of fetch buffer. */
|
||||
struct cleanup *old_chain; /* Top of the old cleanup chain. */
|
||||
struct cleanup *old_chain = NULL; /* Top of the old cleanup chain. */
|
||||
char peekchar; /* Place into which we can read one char. */
|
||||
|
||||
/* First we need to figure out the limit on the number of characters we are
|
||||
|
|
@ -799,15 +803,18 @@ val_print_string (addr, len, stream)
|
|||
{
|
||||
if (errcode == EIO)
|
||||
{
|
||||
fprintf_filtered (stream, " <Address 0x%x out of bounds>", addr);
|
||||
fprintf_filtered (stream,
|
||||
" <Address 0x%lx out of bounds>",
|
||||
(unsigned long) addr);
|
||||
}
|
||||
else
|
||||
{
|
||||
error ("Error reading memory address 0x%x: %s.", addr,
|
||||
error ("Error reading memory address 0x%lx: %s.",
|
||||
(unsigned long) addr,
|
||||
safe_strerror (errcode));
|
||||
}
|
||||
}
|
||||
fflush (stream);
|
||||
gdb_flush (stream);
|
||||
do_cleanups (old_chain);
|
||||
return (bufptr - buffer);
|
||||
}
|
||||
|
|
@ -950,9 +957,9 @@ set_print (arg, from_tty)
|
|||
char *arg;
|
||||
int from_tty;
|
||||
{
|
||||
printf (
|
||||
printf_unfiltered (
|
||||
"\"set print\" must be followed by the name of a print subcommand.\n");
|
||||
help_list (setprintlist, "set print ", -1, stdout);
|
||||
help_list (setprintlist, "set print ", -1, gdb_stdout);
|
||||
}
|
||||
|
||||
/*ARGSUSED*/
|
||||
|
|
@ -973,8 +980,9 @@ _initialize_valprint ()
|
|||
"Generic command for setting how things print.",
|
||||
&setprintlist, "set print ", 0, &setlist);
|
||||
add_alias_cmd ("p", "print", no_class, 1, &setlist);
|
||||
add_alias_cmd ("pr", "print", no_class, 1, &setlist); /* prefer set print
|
||||
to set prompt */
|
||||
/* prefer set print to set prompt */
|
||||
add_alias_cmd ("pr", "print", no_class, 1, &setlist);
|
||||
|
||||
add_prefix_cmd ("print", no_class, show_print,
|
||||
"Generic command for showing print settings.",
|
||||
&showprintlist, "show print ", 0, &showlist);
|
||||
|
|
@ -1027,14 +1035,14 @@ _initialize_valprint ()
|
|||
"Set default input radix for entering numbers.",
|
||||
&setlist);
|
||||
add_show_from_set (c, &showlist);
|
||||
c->function = set_input_radix;
|
||||
c->function.sfunc = set_input_radix;
|
||||
|
||||
c = add_set_cmd ("output-radix", class_support, var_uinteger,
|
||||
(char *)&output_radix,
|
||||
"Set default output radix for printing of values.",
|
||||
&setlist);
|
||||
add_show_from_set (c, &showlist);
|
||||
c->function = set_output_radix;
|
||||
c->function.sfunc = set_output_radix;
|
||||
|
||||
/* The "set radix" and "show radix" commands are special in that they are
|
||||
like normal set and show commands but allow two normally independent
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue