[NIOS2] Fix disassembly of br.n instruction.

[deliverable/binutils-gdb.git] / gdb / cli-out.h

diff --git a/gdb/cli-out.h b/gdb/cli-out.h
index fd1d6274a9f719c277bda11ab10f37b5559d76c8..cf9abedd46422603bfda01929b235177543170f3 100644 (file)
--- a/gdb/cli-out.h
+++ b/gdb/cli-out.h
@@ -1,5 +1,5 @@
 /* Output generating routines for GDB CLI.
-   Copyright (C) 1999-2019 Free Software Foundation, Inc.
+   Copyright (C) 1999-2021 Free Software Foundation, Inc.
    Contributed by Cygnus Solutions.
 
    This file is part of GDB.
@@ -32,6 +32,8 @@ public:
 
   ui_file *set_stream (ui_file *stream);
 
+  bool can_emit_style_escape () const override;
+
 protected:
 
   virtual void do_table_begin (int nbrofcols, int nr_rows,
@@ -45,8 +47,8 @@ protected:
      zero.  */
   virtual void do_begin (ui_out_type type, const char *id) override;
   virtual void do_end (ui_out_type type) override;
-  virtual void do_field_int (int fldno, int width, ui_align align,
-                            const char *fldname, int value) override;
+  virtual void do_field_signed (int fldno, int width, ui_align align,
+                               const char *fldname, LONGEST value) override;
   virtual void do_field_unsigned (int fldno, int width, ui_align align,
                                  const char *fldname, ULONGEST value)
     override;
@@ -55,19 +57,24 @@ protected:
   virtual void do_field_string (int fldno, int width, ui_align align,
                                const char *fldname,
                                const char *string,
-                               ui_out_style_kind style) override;
+                               const ui_file_style &style) override;
   virtual void do_field_fmt (int fldno, int width, ui_align align,
-                            const char *fldname, const char *format,
-                            va_list args)
-    override ATTRIBUTE_PRINTF (6,0);
+                            const char *fldname, const ui_file_style &style,
+                            const char *format, va_list args)
+    override ATTRIBUTE_PRINTF (7, 0);
   virtual void do_spaces (int numspaces) override;
   virtual void do_text (const char *string) override;
-  virtual void do_message (const char *format, va_list args) override
-    ATTRIBUTE_PRINTF (2,0);
+  virtual void do_message (const ui_file_style &style,
+                          const char *format, va_list args) override
+    ATTRIBUTE_PRINTF (3,0);
   virtual void do_wrap_hint (const char *identstring) override;
   virtual void do_flush () override;
   virtual void do_redirect (struct ui_file *outstream) override;
 
+  virtual void do_progress_start (const std::string &, bool) override;
+  virtual void do_progress_notify (double) override;
+  virtual void do_progress_end () override;
+
   bool suppress_output ()
   { return m_suppress_output; }
 
@@ -77,6 +84,33 @@ private:
 
   std::vector<ui_file *> m_streams;
   bool m_suppress_output;
+
+  /* Represents the printing state of a progress meter.  */
+  enum meter_state
+  {
+    /* Printing will start with the next output.  */
+    START,
+    /* Printing has already started.  */
+    WORKING,
+    /* Progress printing has already started.  */
+    PROGRESS,
+    /* Printing should not be done.  */
+    NO_PRINT
+  };
+
+  /* The state of a recent progress meter.  */
+  struct cli_progress_info
+  {
+    /* The current state.  */
+    enum meter_state printing;
+    /* The name to print.  */
+    std::string name;
+    /* The last notification value.  */
+    double last_value;
+  };
+
+  /* Stack of progress meters.  */
+  std::vector<cli_progress_info> m_meters;
 };
 
 extern cli_ui_out *cli_out_new (struct ui_file *stream);