70ba0933ad
This replaces XMALLOC with XNEW, and removes XMALLOC. The only non-mechanical bit here was remembering to edit gdbarch.sh. 2014-01-13 Tom Tromey <tromey@redhat.com> * defs.h (XMALLOC): Remove. * avr-tdep.c (avr_gdbarch_init): Use XNEW, not XMALLOC. * bfin-tdep.c (bfin_gdbarch_init): Likewise. * cli-out.c (struct ui_out *): Likewise. * cli/cli-dump.c (add_dump_command): Likewise. (add_dump_command): Likewise. * complaints.c (get_complaints): Likewise. (find_complaint): Likewise. * dwarf2-frame.c (execute_cfa_program): Likewise. * dwarf2read.c (abbrev_table_read_table): Likewise. * gdbarch.sh: Likewise. * gdbarch.c: Rebuild. * inf-ttrace.c (inf_ttrace_add_page): Likewise. * interps.c (interp_new): Likewise. * lm32-tdep.c (lm32_gdbarch_init): Likewise. * m32r-tdep.c (m32r_gdbarch_init): Likewise. * mi/mi-console.c (mi_console_file_new): Likewise. * mi/mi-interp.c (mi_interpreter_init): Likewise. * mi/mi-out.c (mi_out_new): Likewise. * mi/mi-parse.c (mi_parse): Likewise. * microblaze-tdep.c (microblaze_gdbarch_init): Likewise. * moxie-tdep.c (moxie_gdbarch_init): Likewise. * observer.c (xalloc_observer_list_node): Likewise. * regcache.c (regcache_xmalloc_1): Likewise. * reggroups.c (reggroup_new): Likewise. (_initialize_reggroup): Likewise. * registry.c (register_data_with_cleanup): Likewise. * remote.c (remote_notif_stop_alloc_reply): Likewise. * ser-base.c (serial_ttystate): Likewise. * ser-mingw.c (make_pipe_state): Likewise. * ser-pipe.c (pipe_open): Likewise. * serial.c (serial_open): Likewise. * sh64-tdep.c (sh64_gdbarch_init): Likewise. * tui/tui-data.c (tui_alloc_generic_win_info): Likewise. (tui_alloc_win_info): Likewise. (tui_add_content_elements): Likewise. * tui/tui-file.c (tui_file_new): Likewise. * tui/tui-out.c (tui_out_new): Likewise. * ui-file.c (mem_file_new): Likewise. * ui-out.c (push_level): Likewise. (make_cleanup_ui_out_end): Likewise. (append_header_to_list): Likewise. (ui_out_new): Likewise. * user-regs.c (user_reg_add_builtin): Likewise.
181 lines
4.2 KiB
C
181 lines
4.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 "tui.h"
|
|
#include <string.h>
|
|
#include "gdb_assert.h"
|
|
|
|
struct tui_ui_out_data
|
|
{
|
|
struct cli_ui_out_data base;
|
|
|
|
int line;
|
|
int start_of_line;
|
|
};
|
|
typedef struct tui_ui_out_data tui_out_data;
|
|
|
|
/* This is the TUI ui-out implementation functions vector. It is
|
|
initialized below in _initialize_tui_out, inheriting the CLI
|
|
version, and overriding a few methods. */
|
|
|
|
static struct ui_out_impl tui_ui_out_impl;
|
|
|
|
/* Output an int field. */
|
|
|
|
static void
|
|
tui_field_int (struct ui_out *uiout,
|
|
int fldno, int width,
|
|
enum ui_align alignment,
|
|
const char *fldname,
|
|
int value)
|
|
{
|
|
tui_out_data *data = ui_out_data (uiout);
|
|
|
|
if (data->base.suppress_output)
|
|
return;
|
|
|
|
/* Don't print line number, keep it for later. */
|
|
if (data->start_of_line == 0 && strcmp (fldname, "line") == 0)
|
|
{
|
|
data->start_of_line ++;
|
|
data->line = value;
|
|
return;
|
|
}
|
|
data->start_of_line ++;
|
|
|
|
(*cli_ui_out_impl.field_int) (uiout, fldno,
|
|
width, alignment, fldname, value);
|
|
}
|
|
|
|
/* Other cli_field_* end up here so alignment and field separators are
|
|
both handled by tui_field_string. */
|
|
|
|
static void
|
|
tui_field_string (struct ui_out *uiout,
|
|
int fldno, int width,
|
|
enum ui_align align,
|
|
const char *fldname,
|
|
const char *string)
|
|
{
|
|
tui_out_data *data = ui_out_data (uiout);
|
|
|
|
if (data->base.suppress_output)
|
|
return;
|
|
|
|
if (fldname && data->line > 0 && strcmp (fldname, "fullname") == 0)
|
|
{
|
|
data->start_of_line ++;
|
|
if (data->line > 0)
|
|
{
|
|
tui_show_source (string, data->line);
|
|
}
|
|
return;
|
|
}
|
|
|
|
data->start_of_line++;
|
|
|
|
(*cli_ui_out_impl.field_string) (uiout, fldno,
|
|
width, align,
|
|
fldname, string);
|
|
}
|
|
|
|
/* This is the only field function that does not align. */
|
|
|
|
static void
|
|
tui_field_fmt (struct ui_out *uiout, int fldno,
|
|
int width, enum ui_align align,
|
|
const char *fldname,
|
|
const char *format,
|
|
va_list args)
|
|
{
|
|
tui_out_data *data = ui_out_data (uiout);
|
|
|
|
if (data->base.suppress_output)
|
|
return;
|
|
|
|
data->start_of_line++;
|
|
|
|
(*cli_ui_out_impl.field_fmt) (uiout, fldno,
|
|
width, align,
|
|
fldname, format, args);
|
|
}
|
|
|
|
static void
|
|
tui_text (struct ui_out *uiout, const char *string)
|
|
{
|
|
tui_out_data *data = ui_out_data (uiout);
|
|
|
|
if (data->base.suppress_output)
|
|
return;
|
|
data->start_of_line ++;
|
|
if (data->line > 0)
|
|
{
|
|
if (strchr (string, '\n') != 0)
|
|
{
|
|
data->line = -1;
|
|
data->start_of_line = 0;
|
|
}
|
|
return;
|
|
}
|
|
if (strchr (string, '\n'))
|
|
data->start_of_line = 0;
|
|
|
|
(*cli_ui_out_impl.text) (uiout, string);
|
|
}
|
|
|
|
struct ui_out *
|
|
tui_out_new (struct ui_file *stream)
|
|
{
|
|
int flags = 0;
|
|
|
|
tui_out_data *data = XNEW (tui_out_data);
|
|
|
|
/* Initialize base "class". */
|
|
cli_out_data_ctor (&data->base, stream);
|
|
|
|
/* Initialize our fields. */
|
|
data->line = -1;
|
|
data->start_of_line = 0;
|
|
|
|
return ui_out_new (&tui_ui_out_impl, data, flags);
|
|
}
|
|
|
|
/* Standard gdb initialization hook. */
|
|
|
|
extern void _initialize_tui_out (void);
|
|
|
|
void
|
|
_initialize_tui_out (void)
|
|
{
|
|
/* Inherit the CLI version. */
|
|
tui_ui_out_impl = cli_ui_out_impl;
|
|
|
|
/* Override a few methods. */
|
|
tui_ui_out_impl.field_int = tui_field_int;
|
|
tui_ui_out_impl.field_string = tui_field_string;
|
|
tui_ui_out_impl.field_fmt = tui_field_fmt;
|
|
tui_ui_out_impl.text = tui_text;
|
|
}
|