* mips.h (CPU_RM9000): Define.

[binutils.git] / gdb / ui-out.h

diff --git a/gdb/ui-out.h b/gdb/ui-out.h
index cc7ddaca51eee8ea7e2f9247e90906276069d3d8..5e19aff9a89bc32aa689425d7674dd4523b14889 100644 (file)
--- a/gdb/ui-out.h
+++ b/gdb/ui-out.h
@@ -27,7 +27,7 @@
 
 struct ui_out;
 struct ui_out_data;
-
+struct ui_file;
 
 /* the current ui_out */
 
@@ -84,32 +84,24 @@ 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, ... }, ... ] }'' */
-
-extern void ui_out_table_begin (struct ui_out *uiout, int nbrofcols,
-                               const char *tblid);
-
+/* 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, const 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);
-
-/* Compatibility wrappers, new code should use ui_out_begin() and
-   ui_out_end(). */
-
-extern void ui_out_list_begin (struct ui_out *uiout);
-
-extern void ui_out_list_end (struct ui_out *uiout);
-
-extern struct cleanup *make_cleanup_ui_out_list_begin_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_tuple_begin (struct ui_out *uiout, const char *id);
-
-extern void ui_out_tuple_end (struct ui_out *uiout);
+extern struct cleanup *make_cleanup_ui_out_list_begin_end (struct ui_out *uiout,
+                                                          const char *id);
 
 extern struct cleanup *make_cleanup_ui_out_tuple_begin_end (struct ui_out *uiout,
                                                            const char *id);
@@ -117,6 +109,10 @@ extern struct cleanup *make_cleanup_ui_out_tuple_begin_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_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, const char *fldname,
                                    CORE_ADDR address);
 
@@ -182,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 */
@@ -191,11 +194,12 @@ 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, const 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,
+                                  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. */
@@ -227,6 +231,8 @@ typedef void (message_ftype) (struct ui_out * uiout, int verbosity,
                              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 */
 
@@ -250,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);
@@ -261,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 */