#include "signals.h"
#include "gdbcmd.h"
+#include "serial.h"
+#if 0
+/* No longer needed, I suspect. */
#include "terminal.h"
+#endif
#include "bfd.h"
#include "target.h"
#include "demangle.h"
+#include "expression.h"
+#include "language.h"
/* Prototypes for local functions */
-#if !defined (NO_MALLOC_CHECK)
+#if defined (NO_MMALLOC) || defined (NO_MMALLOC_CHECK)
+#else
static void
malloc_botch PARAMS ((void));
-#endif /* NO_MALLOC_CHECK */
+#endif /* NO_MMALLOC, etc */
static void
fatal_dump_core (); /* Can't prototype with <varargs.h> usage... */
static void
set_width_command PARAMS ((char *, int, struct cmd_list_element *));
-static void
-vfprintf_filtered PARAMS ((FILE *, char *, va_list));
-
/* If this definition isn't overridden by the header files, assume
that isatty and fileno exist on this system. */
#ifndef ISATTY
int quit_flag;
-/* Nonzero means quit immediately if Control-C is typed now,
- rather than waiting until QUIT is executed. */
+/* Nonzero means quit immediately if Control-C is typed now, rather
+ than waiting until QUIT is executed. Be careful in setting this;
+ code which executes with immediate_quit set has to be very careful
+ about being able to deal with being interrupted at any time. It is
+ almost always better to use QUIT; the only exception I can think of
+ is being able to quit out of a system call (using EINTR loses if
+ the SIGINT happens between the previous QUIT and the system call).
+ To immediately quit in the case in which a SIGINT happens between
+ the previous QUIT and setting immediate_quit (desirable anytime we
+ expect to block), call QUIT after setting immediate_quit. */
int immediate_quit;
vfprintf_filtered (stderr, string, args);
fprintf_filtered (stderr, "\n");
va_end (args);
- return_to_top_level ();
+ return_to_top_level (RETURN_ERROR);
}
/* Print an error message and exit reporting failure.
void
quit ()
{
+ serial_t stdout_serial = serial_fdopen (1);
+
target_terminal_ours ();
wrap_here ((char *)0); /* Force out any pending output */
-#if !defined(__GO32__)
-#ifdef HAVE_TERMIO
- ioctl (fileno (stdout), TCFLSH, 1);
-#else /* not HAVE_TERMIO */
- ioctl (fileno (stdout), TIOCFLUSH, 0);
-#endif /* not HAVE_TERMIO */
-#ifdef TIOCGPGRP
- error ("Quit");
-#else
- error ("Quit (expect signal %d when inferior is resumed)", SIGINT);
-#endif /* TIOCGPGRP */
-#endif
+
+ SERIAL_FLUSH_OUTPUT (stdout_serial);
+
+ SERIAL_UN_FDOPEN (stdout_serial);
+
+ /* Don't use *_filtered; we don't want to prompt the user to continue. */
+ if (error_pre_print)
+ fprintf (stderr, error_pre_print);
+
+ if (job_control
+ /* If there is no terminal switching for this target, then we can't
+ possibly get screwed by the lack of job control. */
+ || current_target->to_terminal_ours == NULL)
+ fprintf (stderr, "Quit\n");
+ else
+ fprintf (stderr,
+ "Quit (expect signal SIGINT when the program is resumed)\n");
+ return_to_top_level (RETURN_QUIT);
}
+
+#ifdef __GO32__
+
+/* In the absence of signals, poll keyboard for a quit.
+ Called from #define QUIT pollquit() in xm-go32.h. */
+
+void
+pollquit()
+{
+ if (kbhit ())
+ {
+ int k = getkey ();
+ if (k == 1)
+ quit_flag = 1;
+ else if (k == 2)
+ immediate_quit = 1;
+ quit ();
+ }
+}
+
+#endif
+
/* Control C comes here */
void
fflush (stdout);
va_start (args);
ctlstr = va_arg (args, char *);
- energize_query (ctlstr, args);
vfprintf_filtered (stdout, ctlstr, args);
+ va_end (args);
printf_filtered ("(y or n) ");
- if (energize)
- {
- char *buf;
-
- buf = energize_command_line_input(0, 0);
- answer = buf ? *buf : 'Y';
- energize_acknowledge_query(buf);
- }
- else
- {
- fflush (stdout);
- answer = fgetc (stdin);
- clearerr (stdin); /* in case of C-d */
- if (answer == EOF) /* C-d */
- return 1;
- if (answer != '\n') /* Eat rest of input line, to EOF or newline */
- do
- {
- ans2 = fgetc (stdin);
- clearerr (stdin);
- }
- while (ans2 != EOF && ans2 != '\n');
- }
+ fflush (stdout);
+ answer = fgetc (stdin);
+ clearerr (stdin); /* in case of C-d */
+ if (answer == EOF) /* C-d */
+ return 1;
+ if (answer != '\n') /* Eat rest of input line, to EOF or newline */
+ do
+ {
+ ans2 = fgetc (stdin);
+ clearerr (stdin);
+ }
+ while (ans2 != EOF && ans2 != '\n');
if (answer >= 'a')
answer -= 040;
if (answer == 'Y')
if (answer == 'N')
return 0;
printf_filtered ("Please answer y or n.\n");
- va_end (args);
}
}
}
}
\f
-/* Print the character C on STREAM as part of the contents
- of a literal string whose delimiter is QUOTER. */
+/* Print the character C on STREAM as part of the contents of a literal
+ string whose delimiter is QUOTER. Note that this routine should only
+ be call for printing things which are independent of the language
+ of the program being debugged. */
void
-printchar (c, stream, quoter)
+gdb_printchar (c, stream, quoter)
register int c;
FILE *stream;
int quoter;
spit it out and forget about the wrap_here(). If we see another
wrap_here(), we spit it out and remember the newer one. If we see
the end of the line, we spit out a newline, the indent, and then
- the buffered output.
+ the buffered output. */
+
+/* Malloc'd buffer with chars_per_line+2 bytes. Contains characters which
+ are waiting to be output (they have already been counted in chars_printed).
+ When wrap_buffer[0] is null, the buffer is empty. */
+static char *wrap_buffer;
- wrap_column is the column number on the screen where wrap_buffer begins.
- When wrap_column is zero, wrapping is not in effect.
- wrap_buffer is malloc'd with chars_per_line+2 bytes.
- When wrap_buffer[0] is null, the buffer is empty.
- wrap_pointer points into it at the next character to fill.
- wrap_indent is the string that should be used as indentation if the
- wrap occurs. */
+/* Pointer in wrap_buffer to the next character to fill. */
+static char *wrap_pointer;
-static char *wrap_buffer, *wrap_pointer, *wrap_indent;
+/* String to indent by if the wrap occurs. Must not be NULL if wrap_column
+ is non-zero. */
+static char *wrap_indent;
+
+/* Column number on the screen where wrap_buffer begins, or 0 if wrapping
+ is not in effect. */
static int wrap_column;
/* ARGSUSED */
wrap_pointer = wrap_buffer; /* Start it at the beginning */
}
+/* Wait, so the user can read what's on the screen. Prompt the user
+ to continue by pressing RETURN. */
+
static void
prompt_for_continue ()
{
char *ignore;
+ /* We must do this *before* we call gdb_readline, else it will eventually
+ call us -- thinking that we're trying to print beyond the end of the
+ screen. */
+ reinitialize_more_filter ();
+
immediate_quit++;
- ignore = gdb_readline ("---Type <return> to continue---");
+ /* On a real operating system, the user can quit with SIGINT.
+ But not on GO32.
+
+ 'q' is provided on all systems so users don't have to change habits
+ from system to system, and because telling them what to do in
+ the prompt is more user-friendly than expecting them to think of
+ SIGINT. */
+ ignore =
+ gdb_readline ("---Type <return> to continue, or q <return> to quit---");
if (ignore)
- free (ignore);
- chars_printed = lines_printed = 0;
+ {
+ char *p = ignore;
+ while (*p == ' ' || *p == '\t')
+ ++p;
+ if (p[0] == 'q')
+ request_quit (SIGINT);
+ free (ignore);
+ }
immediate_quit--;
+
+ /* Now we have to do this again, so that GDB will know that it doesn't
+ need to save the ---Type <return>--- line at the top of the screen. */
+ reinitialize_more_filter ();
+
dont_repeat (); /* Forget prev cmd -- CR won't repeat it. */
}
/* Indicate that if the next sequence of characters overflows the line,
a newline should be inserted here rather than when it hits the end.
- If INDENT is nonzero, it is a string to be printed to indent the
+ If INDENT is non-null, it is a string to be printed to indent the
wrapped part on the next line. INDENT must remain accessible until
the next call to wrap_here() or until a newline is printed through
fputs_filtered().
we must not wrap words, but should still keep track of newlines
that were explicitly printed.
- INDENT should not contain tabs, as that
- will mess up the char count on the next line. FIXME. */
+ INDENT should not contain tabs, as that will mess up the char count
+ on the next line. FIXME.
+
+ This routine is guaranteed to force out any output which has been
+ squirreled away in the wrap_buffer, so wrap_here ((char *)0) can be
+ used to force out output from the wrap_buffer. */
void
wrap_here(indent)
- char *indent;
+ char *indent;
{
if (wrap_buffer[0])
{
else if (chars_printed >= chars_per_line)
{
puts_filtered ("\n");
- puts_filtered (indent);
+ if (indent != NULL)
+ puts_filtered (indent);
wrap_column = 0;
}
else
{
wrap_column = chars_printed;
- wrap_indent = indent;
+ if (indent == NULL)
+ wrap_indent = "";
+ else
+ wrap_indent = indent;
+ }
+}
+
+/* Ensure that whatever gets printed next, using the filtered output
+ commands, starts at the beginning of the line. I.E. if there is
+ any pending output for the current line, flush it and start a new
+ line. Otherwise do nothing. */
+
+void
+begin_line ()
+{
+ if (chars_printed > 0)
+ {
+ puts_filtered ("\n");
}
}
if (linebuffer == 0)
return;
- if (energize)
- {
- energize_fputs(linebuffer);
- return;
- }
-
/* Don't do any filtering if it is disabled. */
if (stream != stdout
|| (lines_per_page == UINT_MAX && chars_per_line == UINT_MAX))
/* Now output indentation and wrapped string */
if (wrap_column)
{
- if (wrap_indent)
- fputs (wrap_indent, stream);
+ fputs (wrap_indent, stream);
*wrap_pointer = '\0'; /* Null-terminate saved stuff */
fputs (wrap_buffer, stream); /* and eject it */
/* FIXME, this strlen is what prevents wrap_indent from
}
}
-
-/* fputs_demangled is a variant of fputs_filtered that
- demangles g++ names.*/
-
-void
-fputs_demangled (linebuffer, stream, arg_mode)
- char *linebuffer;
- FILE *stream;
- int arg_mode;
-{
-#define SYMBOL_MAX 1024
-
-#define SYMBOL_CHAR(c) (isascii(c) \
- && (isalnum(c) || (c) == '_' || (c) == CPLUS_MARKER))
-
- char buf[SYMBOL_MAX+1];
-# define DMSLOP 5 /* How much room to leave in buf */
- char *p;
-
- if (linebuffer == NULL)
- return;
-
- /* If user wants to see raw output, no problem. */
- if (!demangle) {
- fputs_filtered (linebuffer, stream);
- return;
- }
-
- p = linebuffer;
-
- while ( *p != (char) 0 ) {
- int i = 0;
-
- /* collect non-interesting characters into buf */
- while (*p != (char) 0 && !SYMBOL_CHAR(*p) && i < (int)sizeof(buf)-DMSLOP ) {
- buf[i++] = *p;
- p++;
- }
- if (i > 0) {
- /* output the non-interesting characters without demangling */
- buf[i] = (char) 0;
- fputs_filtered(buf, stream);
- i = 0; /* reset buf */
- }
-
- /* and now the interesting characters */
- while (i < SYMBOL_MAX
- && *p != (char) 0
- && SYMBOL_CHAR(*p)
- && i < (int)sizeof(buf) - DMSLOP) {
- buf[i++] = *p;
- p++;
- }
- buf[i] = (char) 0;
- if (i > 0) {
- char * result;
-
- if ( (result = cplus_demangle(buf, arg_mode)) != NULL ) {
- fputs_filtered(result, stream);
- free(result);
- }
- else {
- fputs_filtered(buf, stream);
- }
- }
- }
-}
-
/* Print a variable number of ARGS using format FORMAT. If this
information is going to put the amount written (since the last call
- to INITIALIZE_MORE_FILTER or the last page break) over the page size,
+ to REINITIALIZE_MORE_FILTER or the last page break) over the page size,
print out a pause message and do a gdb_readline to get the users
permision to continue.
(since prompt_for_continue may do so) so this routine should not be
called when cleanups are not in place. */
-static void
+#define MIN_LINEBUF 255
+
+void
vfprintf_filtered (stream, format, args)
FILE *stream;
char *format;
va_list args;
{
- static char *linebuffer = (char *) 0;
- static int line_size;
+ char line_buf[MIN_LINEBUF+10];
+ char *linebuffer = line_buf;
int format_length;
format_length = strlen (format);
- /* Allocated linebuffer for the first time. */
- if (!linebuffer)
- {
- linebuffer = (char *) xmalloc (255);
- line_size = 255;
- }
-
/* Reallocate buffer to a larger size if this is necessary. */
- if (format_length * 2 > line_size)
+ if (format_length * 2 > MIN_LINEBUF)
{
- line_size = format_length * 2;
-
- /* You don't have to copy. */
- free (linebuffer);
- linebuffer = (char *) xmalloc (line_size);
+ linebuffer = alloca (10 + format_length * 2);
}
-
/* This won't blow up if the restrictions described above are
followed. */
vsprintf (linebuffer, format, args);
fputs_filtered (linebuffer, stream);
}
+void
+vprintf_filtered (format, args)
+ char *format;
+ va_list args;
+{
+ vfprintf_filtered (stdout, format, args);
+}
+
/* VARARGS */
void
fprintf_filtered (va_alist)
va_end (args);
}
-/* Easy */
+/* Easy -- but watch out!
+
+ This routine is *not* a replacement for puts()! puts() appends a newline.
+ This one doesn't, and had better not! */
void
puts_filtered (string)
\f
/* C++ demangler stuff. */
-/* Make a copy of a symbol, applying C++ demangling if demangling is enabled
- and a demangled version exists. Note that the value returned from
- cplus_demangle is already allocated in malloc'd memory. */
-
-char *
-strdup_demangled (name)
- const char *name;
-{
- char *demangled = NULL;
+/* fprintf_symbol_filtered attempts to demangle NAME, a symbol in language
+ LANG, using demangling args ARG_MODE, and print it filtered to STREAM.
+ If the name is not mangled, or the language for the name is unknown, or
+ demangling is off, the name is printed in its "raw" form. */
- if (demangle)
- {
- demangled = cplus_demangle (name, DMGL_PARAMS | DMGL_ANSI);
- }
- return ((demangled != NULL) ? demangled : strdup (name));
-}
-
-
-/* Print NAME on STREAM, demangling if necessary. */
void
-fprint_symbol (stream, name)
+fprintf_symbol_filtered (stream, name, lang, arg_mode)
FILE *stream;
char *name;
+ enum language lang;
+ int arg_mode;
{
char *demangled;
- if ((!demangle)
- || NULL == (demangled = cplus_demangle (name, DMGL_PARAMS | DMGL_ANSI)))
- fputs_filtered (name, stream);
- else
+
+ if (name != NULL)
{
- fputs_filtered (demangled, stream);
- free (demangled);
+ /* If user wants to see raw output, no problem. */
+ if (!demangle)
+ {
+ fputs_filtered (name, stream);
+ }
+ else
+ {
+ switch (lang)
+ {
+ case language_cplus:
+ demangled = cplus_demangle (name, arg_mode);
+ break;
+ case language_chill:
+ demangled = chill_demangle (name);
+ break;
+ default:
+ demangled = NULL;
+ break;
+ }
+ fputs_filtered (demangled ? demangled : name, stream);
+ if (demangled != NULL)
+ {
+ free (demangled);
+ }
+ }
}
}
don't (slightly different than strcmp()'s range of return values).
As an extra hack, string1=="FOO(ARGS)" matches string2=="FOO".
- This "feature" is useful for demangle_and_match(), which is used
- when searching for matching C++ function names (such as if the
- user types 'break FOO', where FOO is a mangled C++ function). */
+ This "feature" is useful when searching for matching C++ function names
+ (such as if the user types 'break FOO', where FOO is a mangled C++
+ function). */
-static int
+int
strcmp_iw (string1, string2)
const char *string1;
const char *string2;
return (*string1 != '\0' && *string1 != '(') || (*string2 != '\0');
}
-/* Demangle NAME and compare the result with LOOKFOR, ignoring any differences
- in whitespace.
-
- If a match is found, returns a pointer to the demangled version of NAME
- in malloc'd memory, which needs to be freed by the caller after use.
- If a match is not found, returns NULL.
-
- OPTIONS is a flags word that controls the demangling process and is just
- passed on to the demangler.
-
- When the caller sees a non-NULL result, it knows that NAME is the mangled
- equivalent of LOOKFOR, and it can use either NAME, the "official demangled"
- version of NAME (the return value) or the "unofficial demangled" version
- of NAME (LOOKFOR, which it already knows). */
-
-char *
-demangle_and_match (name, lookfor, options)
- const char *name;
- const char *lookfor;
- int options;
-{
- char *demangled;
-
- if ((demangled = cplus_demangle (name, options)) != NULL)
- {
- if (strcmp_iw (demangled, lookfor) != 0)
- {
- free (demangled);
- demangled = NULL;
- }
- }
- return (demangled);
-}
-
\f
void
_initialize_utils ()
#ifdef SIGWINCH_HANDLER_BODY
SIGWINCH_HANDLER_BODY
#endif
+
projects / deliverable / binutils-gdb.git / blobdiff