sim: igen: mark output funcs with printf attribute

... and fix the legitimate bug that it catches.

diff --git a/sim/igen/ld-insn.c b/sim/igen/ld-insn.c
index aa9688dda9559a3076a9bf98efe2da4897fa32df..a823b3f6cf608658f1152cb3a5c2a9f3118ec585 100644 (file)
--- a/sim/igen/ld-insn.c
+++ b/sim/igen/ld-insn.c
@@ -448,7 +448,7 @@ parse_insn_words (insn_entry * insn, char *formats)
                                   the same size */
                                if (f->width != refered_field->width)
                                  error (insn->line,
-                                        "Conditional `%s' of field `%s' should be of size %s\n",
+                                        "Conditional `%s' of field `%s' should be of size %i\n",
                                         cond->string, f->val_string,
                                         refered_field->width);
                              }

diff --git a/sim/igen/misc.h b/sim/igen/misc.h
index 163ffe498fca0eff3c35973356a2c4279688484d..0515c5a52793da5edc57af794450380f5b71682d 100644 (file)
--- a/sim/igen/misc.h
+++ b/sim/igen/misc.h
@@ -36,11 +36,7 @@ enum
 #include <stdlib.h>
 #include <string.h>
 
-#if !defined (__attribute__) && (!defined(__GNUC__) || __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7))
-#define __attribute__(arg)
-#endif
-
-
+#include "ansidecl.h"
 
 #include "filter_host.h"
 
@@ -52,7 +48,8 @@ struct _line_ref
 };
 
 /* Error appends a new line, warning and notify do not */
-typedef void error_func (const line_ref *line, const char *msg, ...);
+typedef void error_func (const line_ref *line, const char *msg, ...)
+  ATTRIBUTE_PRINTF (2, 3);
 
 extern error_func error;
 extern error_func warning;