mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-12-15 04:31:49 +08:00
f486487f55
This is a patch I extracted from Pedro's C++ branch. It contains the most trivial enum fixes, where an integer type/value was used instead of the appropriate enum type/value. It fixes many C++ errors, since in C++ you can't mix integers and enums implicitely. Regardless of the C++ conversion, I think this is a good cleanup to make use of the appropriate enum types. Regression-tested on native x86_64. gdb/ChangeLog: * aarch64-linux-nat.c (aarch64_linux_can_use_hw_breakpoint): Use enum type or value instead of integer. (aarch64_linux_insert_watchpoint): Likewise. (aarch64_linux_remove_watchpoint): Likewise. * ada-lang.c (ada_op_print_tab): Likewise. * amd64-linux-tdep.c (amd64_canonicalize_syscall): Likewise. (amd64_linux_syscall_record_common): Likewise. * arch-utils.c (target_byte_order_user): Likewise. (default_byte_order): Likewise. * arm-linux-nat.c (arm_linux_can_use_hw_breakpoint): Likewise. (arm_linux_get_hwbp_type): Likewise. (arm_linux_hw_watchpoint_initialize): Likewise. (arm_linux_insert_watchpoint): Likewise. * arm-linux-tdep.c (arm_canonicalize_syscall): Likewise. (arm_linux_syscall_record): Likewise. * breakpoint.c (update_watchpoint): Likewise. (breakpoint_here_p): Likewise. (bpstat_print): Likewise. (enable_breakpoint_disp): Likewise. * c-lang.c (c_op_print_tab): Likewise. * cli/cli-decode.c (add_info_alias): Likewise. * d-lang.c (d_op_print_tab): Likewise. * eval.c (evaluate_subexp_standard): Likewise. * f-exp.y (dot_ops): Likewise. (f77_keywords): Likewise. * f-lang.c (f_op_print_tab): Likewise. * go-lang.c (go_op_print_tab): Likewise. * guile/scm-breakpoint.c (gdbscm_make_breakpoint): Likewise. * guile/scm-cmd.c (gdbscm_make_command): Likewise. * guile/scm-param.c (gdbscm_make_parameter): Likewise. * guile/scm-pretty-print.c (gdbscm_apply_val_pretty_printer): Likewise. * guile/scm-string.c (struct scm_to_stringn_data): Likewise. (struct scm_from_stringn_data): Likewise. * i386-linux-tdep.c (i386_canonicalize_syscall): Likewise. * ia64-linux-nat.c (ia64_linux_insert_watchpoint): Likewise. (ia64_linux_remove_watchpoint): Likewise. (ia64_linux_can_use_hw_breakpoint): Likewise. * infrun.c (print_stop_event): Likewise. * jv-lang.c (java_op_print_tab): Likewise. * linux-nat.c (linux_proc_xfer_partial): Likewise. * linux-nat.h (struct lwp_info): Likewise. * linux-thread-db.c (enable_thread_event): Likewise. * m2-lang.c (m2_op_print_tab): Likewise. * mi/mi-cmd-stack.c (mi_cmd_stack_list_locals): Likewise. (mi_cmd_stack_list_variables): Likewise. * mi/mi-main.c (mi_cmd_trace_frame_collected): Likewise. * mi/mi-out.c (mi_table_begin): Likewise. (mi_table_header): Likewise. * mips-linux-nat.c (mips_linux_can_use_hw_breakpoint): Likewise. (mips_linux_insert_watchpoint): Likewise. (mips_linux_remove_watchpoint): Likewise. * nat/mips-linux-watch.c (mips_linux_watch_type_to_irw): Likewise. * nat/mips-linux-watch.h (struct mips_watchpoint): Likewise. (mips_linux_watch_type_to_irw): Likewise. * nto-procfs.c (procfs_can_use_hw_breakpoint): Likewise. (procfs_insert_hw_watchpoint): Likewise. (procfs_remove_hw_watchpoint): Likewise. (procfs_hw_watchpoint): Likewise. (procfs_can_use_hw_breakpoint): Likewise. (procfs_remove_hw_watchpoint): Likewise. (procfs_insert_hw_watchpoint): Likewise. * p-lang.c (pascal_op_print_tab): Likewise. * ppc-linux-nat.c (ppc_linux_can_use_hw_breakpoint): Likewise. * ppc-linux-tdep.c (ppu2spu_unwind_register): Likewise. * ppc-sysv-tdep.c (get_decimal_float_return_value): Likewise. * procfs.c (procfs_can_use_hw_breakpoint): Likewise. (procfs_insert_watchpoint): Likewise. (procfs_remove_watchpoint): Likewise. * psymtab.c (recursively_search_psymtabs): Likewise. * remote-m32r-sdi.c (m32r_can_use_hw_watchpoint): Likewise. (m32r_insert_watchpoint): Likewise. * remote-mips.c (mips_can_use_watchpoint): Likewise. (mips_insert_watchpoint): Likewise. (mips_remove_watchpoint): Likewise. * remote.c (watchpoint_to_Z_packet): Likewise. (remote_insert_watchpoint): Likewise. (remote_remove_watchpoint): Likewise. (remote_check_watch_resources): Likewise. * s390-linux-nat.c (s390_insert_watchpoint): Likewise. (s390_remove_watchpoint): Likewise. (s390_can_use_hw_breakpoint): Likewise. * s390-linux-tdep.c (s390_gdbarch_init): Likewise. * spu-linux-nat.c (spu_can_use_hw_breakpoint): Likewise. * target.h (struct target_ops): Likewise. * tilegx-tdep.c (tilegx_analyze_prologue): Likewise. * ui-out.c (struct ui_out_hdr): Likewise. (append_header_to_list): Likewise. (get_next_header): Likewise. (verify_field): Likewise. (ui_out_begin): Likewise. (ui_out_field_int): Likewise. (ui_out_field_fmt_int): Likewise. (ui_out_field_skip): Likewise. (ui_out_field_string): Likewise. (ui_out_field_fmt): Likewise. * varobj.c (new_variable): Likewise. * x86-nat.c (x86_insert_watchpoint): Likewise. (x86_remove_watchpoint): Likewise. (x86_can_use_hw_breakpoint): Likewise. * xtensa-tdep.h (struct gdbarch_tdep): Likewise. * inflow.c (enum gdb_has_a_terminal_flag_enum): Add name to previously anonymous enumeration type.. * linux-record.h (enum gdb_syscall): Add gdb_sys_no_syscall value. * target-debug.h (target_debug_print_enum_target_hw_bp_type): New. (target_debug_print_enum_bptype): New. * target-delegates.c: Regenerate.
414 lines
10 KiB
C
414 lines
10 KiB
C
/* MI Command Set - output generating routines.
|
|
|
|
Copyright (C) 2000-2015 Free Software Foundation, Inc.
|
|
|
|
Contributed by Cygnus Solutions (a Red Hat company).
|
|
|
|
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 "mi-out.h"
|
|
|
|
struct ui_out_data
|
|
{
|
|
int suppress_field_separator;
|
|
int suppress_output;
|
|
int mi_version;
|
|
struct ui_file *buffer;
|
|
struct ui_file *original_buffer;
|
|
};
|
|
typedef struct ui_out_data mi_out_data;
|
|
|
|
/* These are the MI output functions */
|
|
|
|
static void mi_table_begin (struct ui_out *uiout, int nbrofcols,
|
|
int nr_rows, const char *tblid);
|
|
static void mi_table_body (struct ui_out *uiout);
|
|
static void mi_table_end (struct ui_out *uiout);
|
|
static void mi_table_header (struct ui_out *uiout, int width,
|
|
enum ui_align alig, const char *col_name,
|
|
const char *colhdr);
|
|
static void mi_begin (struct ui_out *uiout, enum ui_out_type type,
|
|
int level, const char *id);
|
|
static void mi_end (struct ui_out *uiout, enum ui_out_type type, int level);
|
|
static void mi_field_int (struct ui_out *uiout, int fldno, int width,
|
|
enum ui_align alig, const char *fldname, int value);
|
|
static void mi_field_skip (struct ui_out *uiout, int fldno, int width,
|
|
enum ui_align alig, const char *fldname);
|
|
static void mi_field_string (struct ui_out *uiout, int fldno, int width,
|
|
enum ui_align alig, const char *fldname,
|
|
const char *string);
|
|
static void mi_field_fmt (struct ui_out *uiout, int fldno,
|
|
int width, enum ui_align align,
|
|
const char *fldname, const char *format,
|
|
va_list args) ATTRIBUTE_PRINTF (6, 0);
|
|
static void mi_spaces (struct ui_out *uiout, int numspaces);
|
|
static void mi_text (struct ui_out *uiout, const char *string);
|
|
static void mi_message (struct ui_out *uiout, int verbosity,
|
|
const char *format, va_list args)
|
|
ATTRIBUTE_PRINTF (3, 0);
|
|
static void mi_wrap_hint (struct ui_out *uiout, char *identstring);
|
|
static void mi_flush (struct ui_out *uiout);
|
|
static int mi_redirect (struct ui_out *uiout, struct ui_file *outstream);
|
|
|
|
/* This is the MI ui-out implementation functions vector */
|
|
|
|
static const struct ui_out_impl mi_ui_out_impl =
|
|
{
|
|
mi_table_begin,
|
|
mi_table_body,
|
|
mi_table_end,
|
|
mi_table_header,
|
|
mi_begin,
|
|
mi_end,
|
|
mi_field_int,
|
|
mi_field_skip,
|
|
mi_field_string,
|
|
mi_field_fmt,
|
|
mi_spaces,
|
|
mi_text,
|
|
mi_message,
|
|
mi_wrap_hint,
|
|
mi_flush,
|
|
mi_redirect,
|
|
0,
|
|
1, /* Needs MI hacks. */
|
|
};
|
|
|
|
/* Prototypes for local functions */
|
|
|
|
extern void _initialize_mi_out (void);
|
|
static void field_separator (struct ui_out *uiout);
|
|
static void mi_open (struct ui_out *uiout, const char *name,
|
|
enum ui_out_type type);
|
|
static void mi_close (struct ui_out *uiout, enum ui_out_type type);
|
|
|
|
/* Mark beginning of a table. */
|
|
|
|
void
|
|
mi_table_begin (struct ui_out *uiout,
|
|
int nr_cols,
|
|
int nr_rows,
|
|
const char *tblid)
|
|
{
|
|
mi_open (uiout, tblid, ui_out_type_tuple);
|
|
mi_field_int (uiout, -1, -1, ui_left, "nr_rows", nr_rows);
|
|
mi_field_int (uiout, -1, -1, ui_left, "nr_cols", nr_cols);
|
|
mi_open (uiout, "hdr", ui_out_type_list);
|
|
}
|
|
|
|
/* Mark beginning of a table body. */
|
|
|
|
void
|
|
mi_table_body (struct ui_out *uiout)
|
|
{
|
|
mi_out_data *data = ui_out_data (uiout);
|
|
|
|
if (data->suppress_output)
|
|
return;
|
|
/* close the table header line if there were any headers */
|
|
mi_close (uiout, ui_out_type_list);
|
|
mi_open (uiout, "body", ui_out_type_list);
|
|
}
|
|
|
|
/* Mark end of a table. */
|
|
|
|
void
|
|
mi_table_end (struct ui_out *uiout)
|
|
{
|
|
mi_out_data *data = ui_out_data (uiout);
|
|
|
|
data->suppress_output = 0;
|
|
mi_close (uiout, ui_out_type_list); /* body */
|
|
mi_close (uiout, ui_out_type_tuple);
|
|
}
|
|
|
|
/* Specify table header. */
|
|
|
|
void
|
|
mi_table_header (struct ui_out *uiout, int width, enum ui_align alignment,
|
|
const char *col_name, const char *colhdr)
|
|
{
|
|
mi_out_data *data = ui_out_data (uiout);
|
|
|
|
if (data->suppress_output)
|
|
return;
|
|
|
|
mi_open (uiout, NULL, ui_out_type_tuple);
|
|
mi_field_int (uiout, 0, 0, ui_center, "width", width);
|
|
mi_field_int (uiout, 0, 0, ui_center, "alignment", alignment);
|
|
mi_field_string (uiout, 0, 0, ui_center, "col_name", col_name);
|
|
mi_field_string (uiout, 0, width, alignment, "colhdr", colhdr);
|
|
mi_close (uiout, ui_out_type_tuple);
|
|
}
|
|
|
|
/* Mark beginning of a list. */
|
|
|
|
void
|
|
mi_begin (struct ui_out *uiout, enum ui_out_type type, int level,
|
|
const char *id)
|
|
{
|
|
mi_out_data *data = ui_out_data (uiout);
|
|
|
|
if (data->suppress_output)
|
|
return;
|
|
|
|
mi_open (uiout, id, type);
|
|
}
|
|
|
|
/* Mark end of a list. */
|
|
|
|
void
|
|
mi_end (struct ui_out *uiout, enum ui_out_type type, int level)
|
|
{
|
|
mi_out_data *data = ui_out_data (uiout);
|
|
|
|
if (data->suppress_output)
|
|
return;
|
|
|
|
mi_close (uiout, type);
|
|
}
|
|
|
|
/* Output an int field. */
|
|
|
|
static void
|
|
mi_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? */
|
|
mi_out_data *data = ui_out_data (uiout);
|
|
|
|
if (data->suppress_output)
|
|
return;
|
|
|
|
xsnprintf (buffer, sizeof (buffer), "%d", value);
|
|
mi_field_string (uiout, fldno, width, alignment, fldname, buffer);
|
|
}
|
|
|
|
/* Used to omit a field. */
|
|
|
|
void
|
|
mi_field_skip (struct ui_out *uiout, int fldno, int width,
|
|
enum ui_align alignment, const char *fldname)
|
|
{
|
|
}
|
|
|
|
/* Other specific mi_field_* end up here so alignment and field
|
|
separators are both handled by mi_field_string. */
|
|
|
|
void
|
|
mi_field_string (struct ui_out *uiout, int fldno, int width,
|
|
enum ui_align align, const char *fldname, const char *string)
|
|
{
|
|
mi_out_data *data = ui_out_data (uiout);
|
|
|
|
if (data->suppress_output)
|
|
return;
|
|
|
|
field_separator (uiout);
|
|
if (fldname)
|
|
fprintf_unfiltered (data->buffer, "%s=", fldname);
|
|
fprintf_unfiltered (data->buffer, "\"");
|
|
if (string)
|
|
fputstr_unfiltered (string, '"', data->buffer);
|
|
fprintf_unfiltered (data->buffer, "\"");
|
|
}
|
|
|
|
/* This is the only field function that does not align. */
|
|
|
|
void
|
|
mi_field_fmt (struct ui_out *uiout, int fldno, int width,
|
|
enum ui_align align, const char *fldname,
|
|
const char *format, va_list args)
|
|
{
|
|
mi_out_data *data = ui_out_data (uiout);
|
|
|
|
if (data->suppress_output)
|
|
return;
|
|
|
|
field_separator (uiout);
|
|
if (fldname)
|
|
fprintf_unfiltered (data->buffer, "%s=\"", fldname);
|
|
else
|
|
fputs_unfiltered ("\"", data->buffer);
|
|
vfprintf_unfiltered (data->buffer, format, args);
|
|
fputs_unfiltered ("\"", data->buffer);
|
|
}
|
|
|
|
void
|
|
mi_spaces (struct ui_out *uiout, int numspaces)
|
|
{
|
|
}
|
|
|
|
void
|
|
mi_text (struct ui_out *uiout, const char *string)
|
|
{
|
|
}
|
|
|
|
void
|
|
mi_message (struct ui_out *uiout, int verbosity,
|
|
const char *format, va_list args)
|
|
{
|
|
}
|
|
|
|
void
|
|
mi_wrap_hint (struct ui_out *uiout, char *identstring)
|
|
{
|
|
wrap_here (identstring);
|
|
}
|
|
|
|
void
|
|
mi_flush (struct ui_out *uiout)
|
|
{
|
|
mi_out_data *data = ui_out_data (uiout);
|
|
|
|
gdb_flush (data->buffer);
|
|
}
|
|
|
|
int
|
|
mi_redirect (struct ui_out *uiout, struct ui_file *outstream)
|
|
{
|
|
mi_out_data *data = ui_out_data (uiout);
|
|
|
|
if (outstream != NULL)
|
|
{
|
|
data->original_buffer = data->buffer;
|
|
data->buffer = outstream;
|
|
}
|
|
else if (data->original_buffer != NULL)
|
|
{
|
|
data->buffer = data->original_buffer;
|
|
data->original_buffer = NULL;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
/* local functions */
|
|
|
|
/* access to ui_out format private members */
|
|
|
|
static void
|
|
field_separator (struct ui_out *uiout)
|
|
{
|
|
mi_out_data *data = ui_out_data (uiout);
|
|
|
|
if (data->suppress_field_separator)
|
|
data->suppress_field_separator = 0;
|
|
else
|
|
fputc_unfiltered (',', data->buffer);
|
|
}
|
|
|
|
static void
|
|
mi_open (struct ui_out *uiout, const char *name, enum ui_out_type type)
|
|
{
|
|
mi_out_data *data = ui_out_data (uiout);
|
|
|
|
field_separator (uiout);
|
|
data->suppress_field_separator = 1;
|
|
if (name)
|
|
fprintf_unfiltered (data->buffer, "%s=", name);
|
|
switch (type)
|
|
{
|
|
case ui_out_type_tuple:
|
|
fputc_unfiltered ('{', data->buffer);
|
|
break;
|
|
case ui_out_type_list:
|
|
fputc_unfiltered ('[', data->buffer);
|
|
break;
|
|
default:
|
|
internal_error (__FILE__, __LINE__, _("bad switch"));
|
|
}
|
|
}
|
|
|
|
static void
|
|
mi_close (struct ui_out *uiout, enum ui_out_type type)
|
|
{
|
|
mi_out_data *data = ui_out_data (uiout);
|
|
|
|
switch (type)
|
|
{
|
|
case ui_out_type_tuple:
|
|
fputc_unfiltered ('}', data->buffer);
|
|
break;
|
|
case ui_out_type_list:
|
|
fputc_unfiltered (']', data->buffer);
|
|
break;
|
|
default:
|
|
internal_error (__FILE__, __LINE__, _("bad switch"));
|
|
}
|
|
data->suppress_field_separator = 0;
|
|
}
|
|
|
|
/* Add a string to the buffer. */
|
|
|
|
void
|
|
mi_out_buffered (struct ui_out *uiout, char *string)
|
|
{
|
|
mi_out_data *data = ui_out_data (uiout);
|
|
|
|
fprintf_unfiltered (data->buffer, "%s", string);
|
|
}
|
|
|
|
/* Clear the buffer. */
|
|
|
|
void
|
|
mi_out_rewind (struct ui_out *uiout)
|
|
{
|
|
mi_out_data *data = ui_out_data (uiout);
|
|
|
|
ui_file_rewind (data->buffer);
|
|
}
|
|
|
|
/* Dump the buffer onto the specified stream. */
|
|
|
|
void
|
|
mi_out_put (struct ui_out *uiout, struct ui_file *stream)
|
|
{
|
|
mi_out_data *data = ui_out_data (uiout);
|
|
|
|
ui_file_put (data->buffer, ui_file_write_for_put, stream);
|
|
ui_file_rewind (data->buffer);
|
|
}
|
|
|
|
/* Return the current MI version. */
|
|
|
|
int
|
|
mi_version (struct ui_out *uiout)
|
|
{
|
|
mi_out_data *data = ui_out_data (uiout);
|
|
|
|
return data->mi_version;
|
|
}
|
|
|
|
/* Initialize private members at startup. */
|
|
|
|
struct ui_out *
|
|
mi_out_new (int mi_version)
|
|
{
|
|
int flags = 0;
|
|
|
|
mi_out_data *data = XNEW (mi_out_data);
|
|
data->suppress_field_separator = 0;
|
|
data->suppress_output = 0;
|
|
data->mi_version = mi_version;
|
|
/* FIXME: This code should be using a ``string_file'' and not the
|
|
TUI buffer hack. */
|
|
data->buffer = mem_fileopen ();
|
|
return ui_out_new (&mi_ui_out_impl, data, flags);
|
|
}
|