2004-02-11 Jeff Johnston <[email protected]>

[binutils.git] / gdb / monitor.h

diff --git a/gdb/monitor.h b/gdb/monitor.h
index afdc3b207e8cd405c49f4a9a8189bd9075ab4f0b..2f8ca22a454e3b86e3f74727bb73ec30610ea47f 100644 (file)
--- a/gdb/monitor.h
+++ b/gdb/monitor.h
@@ -21,6 +21,10 @@
    Boston, MA 02111-1307, USA.
  */
 
+#ifndef MONITOR_H
+#define MONITOR_H
+
+struct target_waitstatus;
 struct serial;
 
 /* This structure describes the strings necessary to give small command
@@ -113,6 +117,9 @@ struct monitor_ops
     struct target_ops *target; /* target operations */
     int stopbits;              /* number of stop bits */
     char **regnames;           /* array of register names in ascii */
+                                /* deprecated: use regname instead */
+    const char *(*regname) (int index); 
+                                /* function for dynamic regname array */
     int num_breakpoints;       /* If set_break != NULL, number of supported
                                   breakpoints */
     int magic;                 /* Check value */
@@ -238,12 +245,16 @@ extern void monitor_close (int quitting);
 extern char *monitor_supply_register (int regno, char *valstr);
 extern int monitor_expect (char *prompt, char *buf, int buflen);
 extern int monitor_expect_prompt (char *buf, int buflen);
-extern void monitor_printf (char *, ...) ATTR_FORMAT (printf, 1, 2);
-extern void
-monitor_printf_noecho (char *, ...)
-ATTR_FORMAT (printf, 1, 2);
+/* Note: The variable argument functions monitor_printf and
+   monitor_printf_noecho vararg do not take take standard format style
+   arguments.  Instead they take custom formats interpretered directly
+   by monitor_vsprintf.  */
+extern void monitor_printf (char *, ...);
+extern void monitor_printf_noecho (char *, ...);
 extern void monitor_write (char *buf, int buflen);
 extern int monitor_readchar (void);
 extern char *monitor_get_dev_name (void);
 extern void init_monitor_ops (struct target_ops *);
 extern int monitor_dump_reg_block (char *dump_cmd);
+
+#endif