mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-12-15 04:31:49 +08:00
dccbb60975
This commit includes gdb_assert.h in common-defs.h and removes all other inclusions. gdb/ 2014-08-07 Gary Benson <gbenson@redhat.com> * common/common-defs.h: Include gdb_assert.h. * aarch64-tdep.c: Do not include gdb_assert.h. * addrmap.c: Likewise. * aix-thread.c: Likewise. * alpha-linux-tdep.c: Likewise. * alpha-mdebug-tdep.c: Likewise. * alphanbsd-tdep.c: Likewise. * amd64-nat.c: Likewise. * amd64-tdep.c: Likewise. * amd64bsd-nat.c: Likewise. * amd64fbsd-nat.c: Likewise. * amd64fbsd-tdep.c: Likewise. * amd64nbsd-nat.c: Likewise. * amd64nbsd-tdep.c: Likewise. * amd64obsd-nat.c: Likewise. * amd64obsd-tdep.c: Likewise. * arch-utils.c: Likewise. * arm-tdep.c: Likewise. * armbsd-tdep.c: Likewise. * auxv.c: Likewise. * bcache.c: Likewise. * bfin-tdep.c: Likewise. * blockframe.c: Likewise. * breakpoint.c: Likewise. * bsd-kvm.c: Likewise. * bsd-uthread.c: Likewise. * buildsym.c: Likewise. * c-exp.y: Likewise. * c-lang.c: Likewise. * charset.c: Likewise. * cleanups.c: Likewise. * cli-out.c: Likewise. * cli/cli-decode.c: Likewise. * cli/cli-dump.c: Likewise. * cli/cli-logging.c: Likewise. * cli/cli-script.c: Likewise. * cli/cli-utils.c: Likewise. * coffread.c: Likewise. * common/common-utils.c: Likewise. * common/queue.h: Likewise. * common/signals.c: Likewise. * common/vec.h: Likewise. * complaints.c: Likewise. * completer.c: Likewise. * corelow.c: Likewise. * cp-abi.c: Likewise. * cp-name-parser.y: Likewise. * cp-namespace.c: Likewise. * cp-support.c: Likewise. * cris-tdep.c: Likewise. * dbxread.c: Likewise. * dictionary.c: Likewise. * doublest.c: Likewise. * dsrec.c: Likewise. * dummy-frame.c: Likewise. * dwarf2-frame-tailcall.c: Likewise. * dwarf2-frame.c: Likewise. * dwarf2expr.c: Likewise. * dwarf2loc.c: Likewise. * dwarf2read.c: Likewise. * eval.c: Likewise. * event-loop.c: Likewise. * exceptions.c: Likewise. * expprint.c: Likewise. * f-valprint.c: Likewise. * fbsd-nat.c: Likewise. * findvar.c: Likewise. * frame-unwind.c: Likewise. * frame.c: Likewise. * frv-tdep.c: Likewise. * gcore.c: Likewise. * gdb-dlfcn.c: Likewise. * gdb_bfd.c: Likewise. * gdbarch.c: Likewise. * gdbarch.sh: Likewise. * gdbtypes.c: Likewise. * gnu-nat.c: Likewise. * gnu-v3-abi.c: Likewise. * go-lang.c: Likewise. * guile/scm-exception.c: Likewise. * guile/scm-gsmob.c: Likewise. * guile/scm-lazy-string.c: Likewise. * guile/scm-math.c: Likewise. * guile/scm-pretty-print.c: Likewise. * guile/scm-safe-call.c: Likewise. * guile/scm-utils.c: Likewise. * guile/scm-value.c: Likewise. * h8300-tdep.c: Likewise. * hppa-hpux-nat.c: Likewise. * hppa-tdep.c: Likewise. * hppanbsd-tdep.c: Likewise. * hppaobsd-tdep.c: Likewise. * i386-darwin-nat.c: Likewise. * i386-darwin-tdep.c: Likewise. * i386-nto-tdep.c: Likewise. * i386-tdep.c: Likewise. * i386bsd-nat.c: Likewise. * i386fbsd-tdep.c: Likewise. * i386gnu-nat.c: Likewise. * i386nbsd-tdep.c: Likewise. * i386obsd-tdep.c: Likewise. * i387-tdep.c: Likewise. * ia64-libunwind-tdep.c: Likewise. * ia64-tdep.c: Likewise. * inf-ptrace.c: Likewise. * inf-ttrace.c: Likewise. * infcall.c: Likewise. * infcmd.c: Likewise. * infrun.c: Likewise. * inline-frame.c: Likewise. * interps.c: Likewise. * jv-lang.c: Likewise. * jv-typeprint.c: Likewise. * linux-fork.c: Likewise. * linux-nat.c: Likewise. * linux-thread-db.c: Likewise. * m32c-tdep.c: Likewise. * m32r-linux-nat.c: Likewise. * m32r-tdep.c: Likewise. * m68k-tdep.c: Likewise. * m68kbsd-nat.c: Likewise. * m68kbsd-tdep.c: Likewise. * m88k-tdep.c: Likewise. * machoread.c: Likewise. * macroexp.c: Likewise. * macrotab.c: Likewise. * maint.c: Likewise. * mdebugread.c: Likewise. * memory-map.c: Likewise. * mep-tdep.c: Likewise. * mi/mi-common.c: Likewise. * microblaze-tdep.c: Likewise. * mingw-hdep.c: Likewise. * mips-linux-nat.c: Likewise. * mips-linux-tdep.c: Likewise. * mips-tdep.c: Likewise. * mips64obsd-tdep.c: Likewise. * mipsnbsd-tdep.c: Likewise. * mn10300-linux-tdep.c: Likewise. * mn10300-tdep.c: Likewise. * moxie-tdep.c: Likewise. * mt-tdep.c: Likewise. * nat/linux-btrace.c: Likewise. * nat/linux-osdata.c: Likewise. * nat/linux-ptrace.c: Likewise. * nat/mips-linux-watch.c: Likewise. * nios2-linux-tdep.c: Likewise. * nios2-tdep.c: Likewise. * objc-lang.c: Likewise. * objfiles.c: Likewise. * obsd-nat.c: Likewise. * opencl-lang.c: Likewise. * osabi.c: Likewise. * parse.c: Likewise. * ppc-linux-nat.c: Likewise. * ppc-sysv-tdep.c: Likewise. * ppcfbsd-nat.c: Likewise. * ppcfbsd-tdep.c: Likewise. * ppcnbsd-nat.c: Likewise. * ppcnbsd-tdep.c: Likewise. * ppcobsd-nat.c: Likewise. * ppcobsd-tdep.c: Likewise. * printcmd.c: Likewise. * procfs.c: Likewise. * prologue-value.c: Likewise. * psymtab.c: Likewise. * python/py-lazy-string.c: Likewise. * python/py-value.c: Likewise. * regcache.c: Likewise. * reggroups.c: Likewise. * registry.c: Likewise. * remote-sim.c: Likewise. * remote.c: Likewise. * rs6000-aix-tdep.c: Likewise. * rs6000-tdep.c: Likewise. * s390-linux-tdep.c: Likewise. * score-tdep.c: Likewise. * ser-base.c: Likewise. * ser-mingw.c: Likewise. * sh-tdep.c: Likewise. * sh64-tdep.c: Likewise. * solib-darwin.c: Likewise. * solib-spu.c: Likewise. * solib-svr4.c: Likewise. * source.c: Likewise. * sparc-nat.c: Likewise. * sparc-sol2-tdep.c: Likewise. * sparc-tdep.c: Likewise. * sparc64-sol2-tdep.c: Likewise. * sparc64-tdep.c: Likewise. * sparc64fbsd-tdep.c: Likewise. * sparc64nbsd-tdep.c: Likewise. * sparc64obsd-tdep.c: Likewise. * sparcnbsd-tdep.c: Likewise. * sparcobsd-tdep.c: Likewise. * spu-multiarch.c: Likewise. * spu-tdep.c: Likewise. * stabsread.c: Likewise. * stack.c: Likewise. * symfile.c: Likewise. * symtab.c: Likewise. * target-descriptions.c: Likewise. * target-memory.c: Likewise. * target.c: Likewise. * tic6x-linux-tdep.c: Likewise. * tic6x-tdep.c: Likewise. * tilegx-linux-nat.c: Likewise. * tilegx-tdep.c: Likewise. * top.c: Likewise. * tramp-frame.c: Likewise. * tui/tui-out.c: Likewise. * tui/tui-winsource.c: Likewise. * ui-out.c: Likewise. * user-regs.c: Likewise. * utils.c: Likewise. * v850-tdep.c: Likewise. * valops.c: Likewise. * value.c: Likewise. * varobj.c: Likewise. * vax-nat.c: Likewise. * xml-syscall.c: Likewise. * xml-tdesc.c: Likewise. * xstormy16-tdep.c: Likewise. * xtensa-linux-nat.c: Likewise. * xtensa-tdep.c: Likewise. gdb/gdbserver/ 2014-08-07 Gary Benson <gbenson@redhat.com> * server.h: Do not include gdb_assert.h.
420 lines
9.2 KiB
C
420 lines
9.2 KiB
C
/* Output generating routines for GDB CLI.
|
|
|
|
Copyright (C) 1999-2014 Free Software Foundation, Inc.
|
|
|
|
Contributed by Cygnus Solutions.
|
|
Written by Fernando Nasser for Cygnus.
|
|
|
|
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 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
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, see <http://www.gnu.org/licenses/>. */
|
|
|
|
#include "defs.h"
|
|
#include "ui-out.h"
|
|
#include "cli-out.h"
|
|
#include <string.h>
|
|
#include "vec.h"
|
|
|
|
typedef struct cli_ui_out_data cli_out_data;
|
|
|
|
|
|
/* Prototypes for local functions */
|
|
|
|
static void cli_text (struct ui_out *uiout, const char *string);
|
|
|
|
static void field_separator (void);
|
|
|
|
static void out_field_fmt (struct ui_out *uiout, int fldno,
|
|
const char *fldname,
|
|
const char *format,...) ATTRIBUTE_PRINTF (4, 5);
|
|
|
|
/* The destructor. */
|
|
|
|
static void
|
|
cli_uiout_dtor (struct ui_out *ui_out)
|
|
{
|
|
cli_out_data *data = ui_out_data (ui_out);
|
|
|
|
VEC_free (ui_filep, data->streams);
|
|
xfree (data);
|
|
}
|
|
|
|
/* These are the CLI output functions */
|
|
|
|
/* Mark beginning of a table */
|
|
|
|
static void
|
|
cli_table_begin (struct ui_out *uiout, int nbrofcols,
|
|
int nr_rows,
|
|
const char *tblid)
|
|
{
|
|
cli_out_data *data = ui_out_data (uiout);
|
|
|
|
if (nr_rows == 0)
|
|
data->suppress_output = 1;
|
|
else
|
|
/* Only the table suppresses the output and, fortunately, a table
|
|
is not a recursive data structure. */
|
|
gdb_assert (data->suppress_output == 0);
|
|
}
|
|
|
|
/* Mark beginning of a table body */
|
|
|
|
static void
|
|
cli_table_body (struct ui_out *uiout)
|
|
{
|
|
cli_out_data *data = ui_out_data (uiout);
|
|
|
|
if (data->suppress_output)
|
|
return;
|
|
/* first, close the table header line */
|
|
cli_text (uiout, "\n");
|
|
}
|
|
|
|
/* Mark end of a table */
|
|
|
|
static void
|
|
cli_table_end (struct ui_out *uiout)
|
|
{
|
|
cli_out_data *data = ui_out_data (uiout);
|
|
|
|
data->suppress_output = 0;
|
|
}
|
|
|
|
/* Specify table header */
|
|
|
|
static void
|
|
cli_table_header (struct ui_out *uiout, int width, enum ui_align alignment,
|
|
const char *col_name,
|
|
const char *colhdr)
|
|
{
|
|
cli_out_data *data = ui_out_data (uiout);
|
|
|
|
if (data->suppress_output)
|
|
return;
|
|
|
|
/* Always go through the function pointer (virtual function call).
|
|
We may have been extended. */
|
|
uo_field_string (uiout, 0, width, alignment, 0, colhdr);
|
|
}
|
|
|
|
/* Mark beginning of a list */
|
|
|
|
static void
|
|
cli_begin (struct ui_out *uiout,
|
|
enum ui_out_type type,
|
|
int level,
|
|
const char *id)
|
|
{
|
|
cli_out_data *data = ui_out_data (uiout);
|
|
|
|
if (data->suppress_output)
|
|
return;
|
|
}
|
|
|
|
/* Mark end of a list */
|
|
|
|
static void
|
|
cli_end (struct ui_out *uiout,
|
|
enum ui_out_type type,
|
|
int level)
|
|
{
|
|
cli_out_data *data = ui_out_data (uiout);
|
|
|
|
if (data->suppress_output)
|
|
return;
|
|
}
|
|
|
|
/* output an int field */
|
|
|
|
static void
|
|
cli_field_int (struct ui_out *uiout, int fldno, int width,
|
|
enum ui_align alignment,
|
|
const char *fldname, int value)
|
|
{
|
|
char buffer[20]; /* FIXME: how many chars long a %d can become? */
|
|
cli_out_data *data = ui_out_data (uiout);
|
|
|
|
if (data->suppress_output)
|
|
return;
|
|
xsnprintf (buffer, sizeof (buffer), "%d", value);
|
|
|
|
/* Always go through the function pointer (virtual function call).
|
|
We may have been extended. */
|
|
uo_field_string (uiout, fldno, width, alignment, fldname, buffer);
|
|
}
|
|
|
|
/* used to ommit a field */
|
|
|
|
static void
|
|
cli_field_skip (struct ui_out *uiout, int fldno, int width,
|
|
enum ui_align alignment,
|
|
const char *fldname)
|
|
{
|
|
cli_out_data *data = ui_out_data (uiout);
|
|
|
|
if (data->suppress_output)
|
|
return;
|
|
|
|
/* Always go through the function pointer (virtual function call).
|
|
We may have been extended. */
|
|
uo_field_string (uiout, fldno, width, alignment, fldname, "");
|
|
}
|
|
|
|
/* other specific cli_field_* end up here so alignment and field
|
|
separators are both handled by cli_field_string */
|
|
|
|
static void
|
|
cli_field_string (struct ui_out *uiout,
|
|
int fldno,
|
|
int width,
|
|
enum ui_align align,
|
|
const char *fldname,
|
|
const char *string)
|
|
{
|
|
int before = 0;
|
|
int after = 0;
|
|
cli_out_data *data = ui_out_data (uiout);
|
|
|
|
if (data->suppress_output)
|
|
return;
|
|
|
|
if ((align != ui_noalign) && string)
|
|
{
|
|
before = width - strlen (string);
|
|
if (before <= 0)
|
|
before = 0;
|
|
else
|
|
{
|
|
if (align == ui_right)
|
|
after = 0;
|
|
else if (align == ui_left)
|
|
{
|
|
after = before;
|
|
before = 0;
|
|
}
|
|
else
|
|
/* ui_center */
|
|
{
|
|
after = before / 2;
|
|
before -= after;
|
|
}
|
|
}
|
|
}
|
|
|
|
if (before)
|
|
ui_out_spaces (uiout, before);
|
|
if (string)
|
|
out_field_fmt (uiout, fldno, fldname, "%s", string);
|
|
if (after)
|
|
ui_out_spaces (uiout, after);
|
|
|
|
if (align != ui_noalign)
|
|
field_separator ();
|
|
}
|
|
|
|
/* This is the only field function that does not align. */
|
|
|
|
static void ATTRIBUTE_PRINTF (6, 0)
|
|
cli_field_fmt (struct ui_out *uiout, int fldno,
|
|
int width, enum ui_align align,
|
|
const char *fldname,
|
|
const char *format,
|
|
va_list args)
|
|
{
|
|
cli_out_data *data = ui_out_data (uiout);
|
|
struct ui_file *stream;
|
|
|
|
if (data->suppress_output)
|
|
return;
|
|
|
|
stream = VEC_last (ui_filep, data->streams);
|
|
vfprintf_filtered (stream, format, args);
|
|
|
|
if (align != ui_noalign)
|
|
field_separator ();
|
|
}
|
|
|
|
static void
|
|
cli_spaces (struct ui_out *uiout, int numspaces)
|
|
{
|
|
cli_out_data *data = ui_out_data (uiout);
|
|
struct ui_file *stream;
|
|
|
|
if (data->suppress_output)
|
|
return;
|
|
|
|
stream = VEC_last (ui_filep, data->streams);
|
|
print_spaces_filtered (numspaces, stream);
|
|
}
|
|
|
|
static void
|
|
cli_text (struct ui_out *uiout, const char *string)
|
|
{
|
|
cli_out_data *data = ui_out_data (uiout);
|
|
struct ui_file *stream;
|
|
|
|
if (data->suppress_output)
|
|
return;
|
|
|
|
stream = VEC_last (ui_filep, data->streams);
|
|
fputs_filtered (string, stream);
|
|
}
|
|
|
|
static void ATTRIBUTE_PRINTF (3, 0)
|
|
cli_message (struct ui_out *uiout, int verbosity,
|
|
const char *format, va_list args)
|
|
{
|
|
cli_out_data *data = ui_out_data (uiout);
|
|
|
|
if (data->suppress_output)
|
|
return;
|
|
|
|
if (ui_out_get_verblvl (uiout) >= verbosity)
|
|
{
|
|
struct ui_file *stream = VEC_last (ui_filep, data->streams);
|
|
|
|
vfprintf_unfiltered (stream, format, args);
|
|
}
|
|
}
|
|
|
|
static void
|
|
cli_wrap_hint (struct ui_out *uiout, char *identstring)
|
|
{
|
|
cli_out_data *data = ui_out_data (uiout);
|
|
|
|
if (data->suppress_output)
|
|
return;
|
|
wrap_here (identstring);
|
|
}
|
|
|
|
static void
|
|
cli_flush (struct ui_out *uiout)
|
|
{
|
|
cli_out_data *data = ui_out_data (uiout);
|
|
struct ui_file *stream = VEC_last (ui_filep, data->streams);
|
|
|
|
gdb_flush (stream);
|
|
}
|
|
|
|
/* OUTSTREAM as non-NULL will push OUTSTREAM on the stack of output streams
|
|
and make it therefore active. OUTSTREAM as NULL will pop the last pushed
|
|
output stream; it is an internal error if it does not exist. */
|
|
|
|
static int
|
|
cli_redirect (struct ui_out *uiout, struct ui_file *outstream)
|
|
{
|
|
cli_out_data *data = ui_out_data (uiout);
|
|
|
|
if (outstream != NULL)
|
|
VEC_safe_push (ui_filep, data->streams, outstream);
|
|
else
|
|
VEC_pop (ui_filep, data->streams);
|
|
|
|
return 0;
|
|
}
|
|
|
|
/* local functions */
|
|
|
|
/* Like cli_field_fmt, but takes a variable number of args
|
|
and makes a va_list and does not insert a separator. */
|
|
|
|
/* VARARGS */
|
|
static void
|
|
out_field_fmt (struct ui_out *uiout, int fldno,
|
|
const char *fldname,
|
|
const char *format,...)
|
|
{
|
|
cli_out_data *data = ui_out_data (uiout);
|
|
struct ui_file *stream = VEC_last (ui_filep, data->streams);
|
|
va_list args;
|
|
|
|
va_start (args, format);
|
|
vfprintf_filtered (stream, format, args);
|
|
|
|
va_end (args);
|
|
}
|
|
|
|
/* Access to ui_out format private members. */
|
|
|
|
static void
|
|
field_separator (void)
|
|
{
|
|
cli_out_data *data = ui_out_data (current_uiout);
|
|
struct ui_file *stream = VEC_last (ui_filep, data->streams);
|
|
|
|
fputc_filtered (' ', stream);
|
|
}
|
|
|
|
/* This is the CLI ui-out implementation functions vector */
|
|
|
|
const struct ui_out_impl cli_ui_out_impl =
|
|
{
|
|
cli_table_begin,
|
|
cli_table_body,
|
|
cli_table_end,
|
|
cli_table_header,
|
|
cli_begin,
|
|
cli_end,
|
|
cli_field_int,
|
|
cli_field_skip,
|
|
cli_field_string,
|
|
cli_field_fmt,
|
|
cli_spaces,
|
|
cli_text,
|
|
cli_message,
|
|
cli_wrap_hint,
|
|
cli_flush,
|
|
cli_redirect,
|
|
cli_uiout_dtor,
|
|
0, /* Does not need MI hacks (i.e. needs CLI hacks). */
|
|
};
|
|
|
|
/* Constructor for a `cli_out_data' object. */
|
|
|
|
void
|
|
cli_out_data_ctor (cli_out_data *self, struct ui_file *stream)
|
|
{
|
|
gdb_assert (stream != NULL);
|
|
|
|
self->streams = NULL;
|
|
VEC_safe_push (ui_filep, self->streams, stream);
|
|
|
|
self->suppress_output = 0;
|
|
}
|
|
|
|
/* Initialize private members at startup. */
|
|
|
|
struct ui_out *
|
|
cli_out_new (struct ui_file *stream)
|
|
{
|
|
int flags = ui_source_list;
|
|
cli_out_data *data = XNEW (cli_out_data);
|
|
|
|
cli_out_data_ctor (data, stream);
|
|
return ui_out_new (&cli_ui_out_impl, data, flags);
|
|
}
|
|
|
|
struct ui_file *
|
|
cli_out_set_stream (struct ui_out *uiout, struct ui_file *stream)
|
|
{
|
|
cli_out_data *data = ui_out_data (uiout);
|
|
struct ui_file *old;
|
|
|
|
old = VEC_pop (ui_filep, data->streams);
|
|
VEC_quick_push (ui_filep, data->streams, stream);
|
|
|
|
return old;
|
|
}
|