X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fui-out.h;h=3102e750ca5db400a2634a66303ddafac419d303;hb=0fac0b4199c69f27906e7343e434dd0b98e5163e;hp=bb5834f5481041926e275667a31792301e0ef792;hpb=b6ba6518e9254bc25f88088228e93ac966ebccd1;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/ui-out.h b/gdb/ui-out.h index bb5834f548..3102e750ca 100644 --- a/gdb/ui-out.h +++ b/gdb/ui-out.h @@ -25,10 +25,8 @@ /* The ui_out structure */ -#if __STDC__ struct ui_out; struct ui_out_data; -#endif /* the current ui_out */ @@ -67,44 +65,74 @@ struct ui_stream /* Prototypes for ui-out API. */ -extern void ui_out_table_begin (struct ui_out *uiout, int nbrofcols, - char *tblid); +/* A result is a recursive data structure consisting of lists and + tuples. */ + +enum ui_out_type + { + ui_out_type_tuple, + ui_out_type_list + }; + +extern void ui_out_begin (struct ui_out *uiout, + enum ui_out_type level_type, + const char *id); + +extern void ui_out_end (struct ui_out *uiout, enum ui_out_type type); +extern struct cleanup *ui_out_begin_cleanup_end (struct ui_out *uiout, + enum ui_out_type level_type, + const char *id); + +/* A table can be considered a special tuple/list combination with the + implied structure: ``table = { hdr = { header, ... } , body = [ { + field, ... }, ... ] }''. If NR_ROWS is negative then there is at + least one row. */ extern void ui_out_table_header (struct ui_out *uiout, int width, - enum ui_align align, char *colhdr); + enum ui_align align, const char *col_name, + const char *colhdr); extern void ui_out_table_body (struct ui_out *uiout); -extern void ui_out_table_end (struct ui_out *uiout); +extern struct cleanup *make_cleanup_ui_out_table_begin_end (struct ui_out *ui_out, + int nr_cols, + int nr_rows, + const char *tblid); +/* Compatibility wrappers. */ -extern void ui_out_list_begin (struct ui_out *uiout, char *lstid); +extern struct cleanup *make_cleanup_ui_out_list_begin_end (struct ui_out *uiout, + const char *id); -extern void ui_out_list_end (struct ui_out *uiout); +extern struct cleanup *make_cleanup_ui_out_tuple_begin_end (struct ui_out *uiout, + const char *id); -extern struct cleanup *make_cleanup_ui_out_list_end (struct ui_out *uiout); +extern void ui_out_field_int (struct ui_out *uiout, const char *fldname, + int value); -extern void ui_out_field_int (struct ui_out *uiout, char *fldname, int value); +extern void ui_out_field_fmt_int (struct ui_out *uiout, int width, + enum ui_align align, const char *fldname, + int value); -extern void ui_out_field_core_addr (struct ui_out *uiout, char *fldname, +extern void ui_out_field_core_addr (struct ui_out *uiout, const char *fldname, CORE_ADDR address); -extern void ui_out_field_string (struct ui_out * uiout, char *fldname, +extern void ui_out_field_string (struct ui_out * uiout, const char *fldname, const char *string); -extern void ui_out_field_stream (struct ui_out *uiout, char *fldname, +extern void ui_out_field_stream (struct ui_out *uiout, const char *fldname, struct ui_stream *buf); -extern void ui_out_field_fmt (struct ui_out *uiout, char *fldname, - char *format, ...); +extern void ui_out_field_fmt (struct ui_out *uiout, const char *fldname, + const char *format, ...); -extern void ui_out_field_skip (struct ui_out *uiout, char *fldname); +extern void ui_out_field_skip (struct ui_out *uiout, const char *fldname); extern void ui_out_spaces (struct ui_out *uiout, int numspaces); -extern void ui_out_text (struct ui_out *uiout, char *string); +extern void ui_out_text (struct ui_out *uiout, const char *string); extern void ui_out_message (struct ui_out *uiout, int verbosity, - char *format, ...); + const char *format, ...); extern struct ui_stream *ui_out_stream_new (struct ui_out *uiout); @@ -150,6 +178,13 @@ extern void gdb_error (struct ui_out *uiout, int severity, char *format, ...); extern void gdb_query (struct ui_out *uiout, int qflags, char *qprompt); #endif +/* HACK: Code in GDB is currently checking to see the type of ui_out + builder when determining which output to produce. This function is + a hack to encapsulate that test. Once GDB manages to separate the + CLI/MI from the core of GDB the problem should just go away .... */ + +extern int ui_out_is_mi_like_p (struct ui_out *uiout); + /* From here on we have things that are only needed by implementation routines and main.c. We should pehaps have a separate file for that, like a ui-out-impl.h file */ @@ -159,30 +194,45 @@ extern void gdb_query (struct ui_out *uiout, int qflags, char *qprompt); /* Type definition of all implementation functions. */ typedef void (table_begin_ftype) (struct ui_out * uiout, - int nbrofcols, char *tblid); + int nbrofcols, int nr_rows, + const char *tblid); typedef void (table_body_ftype) (struct ui_out * uiout); typedef void (table_end_ftype) (struct ui_out * uiout); typedef void (table_header_ftype) (struct ui_out * uiout, int width, - enum ui_align align, char *colhdr); -typedef void (list_begin_ftype) (struct ui_out * uiout, - int list_flag, char *lstid); -typedef void (list_end_ftype) (struct ui_out * uiout, int list_flag); + enum ui_align align, const char *col_name, + const char *colhdr); +/* Note: level 0 is the top-level so LEVEL is always greater than + zero. */ +typedef void (ui_out_begin_ftype) (struct ui_out *uiout, + enum ui_out_type type, + int level, const char *id); +typedef void (ui_out_end_ftype) (struct ui_out *uiout, + enum ui_out_type type, + int level); typedef void (field_int_ftype) (struct ui_out * uiout, int fldno, int width, - enum ui_align align, char *fldname, int value); + enum ui_align align, + const char *fldname, int value); typedef void (field_skip_ftype) (struct ui_out * uiout, int fldno, int width, - enum ui_align align, char *fldname); + enum ui_align align, + const char *fldname); typedef void (field_string_ftype) (struct ui_out * uiout, int fldno, int width, - enum ui_align align, char *fldname, + enum ui_align align, + const char *fldname, const char *string); typedef void (field_fmt_ftype) (struct ui_out * uiout, int fldno, int width, - enum ui_align align, char *fldname, - char *format, va_list args); + enum ui_align align, + const char *fldname, + const char *format, + va_list args); typedef void (spaces_ftype) (struct ui_out * uiout, int numspaces); -typedef void (text_ftype) (struct ui_out * uiout, char *string); +typedef void (text_ftype) (struct ui_out * uiout, + const char *string); typedef void (message_ftype) (struct ui_out * uiout, int verbosity, - char *format, va_list args); + const char *format, va_list args); typedef void (wrap_hint_ftype) (struct ui_out * uiout, char *identstring); typedef void (flush_ftype) (struct ui_out * uiout); +typedef int (redirect_ftype) (struct ui_out * uiout, + struct ui_file * outstream); /* ui-out-impl */ @@ -195,8 +245,8 @@ struct ui_out_impl table_body_ftype *table_body; table_end_ftype *table_end; table_header_ftype *table_header; - list_begin_ftype *list_begin; - list_end_ftype *list_end; + ui_out_begin_ftype *begin; + ui_out_end_ftype *end; field_int_ftype *field_int; field_skip_ftype *field_skip; field_string_ftype *field_string; @@ -206,6 +256,8 @@ struct ui_out_impl message_ftype *message; wrap_hint_ftype *wrap_hint; flush_ftype *flush; + redirect_ftype *redirect; + int is_mi_like_p; }; extern struct ui_out_data *ui_out_data (struct ui_out *uiout); @@ -217,4 +269,8 @@ extern struct ui_out *ui_out_new (struct ui_out_impl *impl, struct ui_out_data *data, int flags); +/* Redirect the ouptut of a ui_out object temporarily. */ + +extern int ui_out_redirect (struct ui_out *uiout, struct ui_file *outstream); + #endif /* UI_OUT_H */