Changeset 3920 for branches/libc-0.6

Timestamp:

Oct 25, 2014, 7:11:49 PM (11 years ago)

Author:

bird

Message:

trunk,0.6: Reduce stabs -> hll conversion warnings to a single warning per file by default, use new '-v' option to get all warnings and '-q' to shut them up completely.

Location:

branches/libc-0.6/src/emx/src/emxomf

Files:

• emxomf.c (modified) (6 diffs)
• emxomf.h (modified) (1 diff)
• stabshll.c (modified) (1 diff)

branches/libc-0.6/src/emx/src/emxomf/emxomf.c

@@ -197 +197 @@
    of the input file or a library name plus module name:
    library(module). */
-static const char *error_fname;
+const char *error_fname;
 
 /* The output directory.  This is set by the -O option. */
@@ -405 +405 @@
 static int unknown_stabs = FALSE;
 
-/* Supress certain warnings if this variable is TRUE (-q option). */
-static int quiet = FALSE;
+/* Warning level (-q & -v options). */
+int warning_level = 1;
 
 /* The libreq_head variable contains a pointer to the head of the list
@@ -603 +603 @@
         {
           s_pszComplainedFor = error_fname;
-          warning ("Input file '%s' has more HLL debug types than we can index in PUBDEF and EXTDEF records.", error_fname);
+          if (warning_level >= 1)
+            warning("Input file '%s' has more HLL debug types than we can index in PUBDEF and EXTDEF records.",
+                    error_fname);
         }
       hll_type = 0;
@@ -1846 +1848 @@
             {
               ok = FALSE;
-              if (!quiet)
+              if (warning_level > 0)
                 warning ("Internal PC-relative relocation ignored");
             }
@@ -4240 +4242 @@
         break;
       case 'q':
-        quiet = TRUE;
+        warning_level--;
         break;
       case 'O':
@@ -4260 +4262 @@
         unknown_stabs = TRUE;
         break;
+      case 'v':
+        warning_level++;
+        break;
       case 'x':
         opt_x = TRUE;

branches/libc-0.6/src/emx/src/emxomf/emxomf.h

@@ -49 +49 @@
 extern int *tt_boundary;
 extern int hll_version;
+extern const char *error_fname;
+extern int warning_level;

branches/libc-0.6/src/emx/src/emxomf/stabshll.c

@@ -403 +403 @@
   va_list args;
 
-  va_start (args, pszFormat);
-  fprintf (stderr, "emxomf warning: ");
-  vfprintf (stderr, pszFormat, args);
-  va_end (args);
-  fputc ('\n', stderr);
-
-
-  if (parse_ptr && parse_start && parse_ptr >= parse_start)
-    {
-      if (parse_pindex && *parse_pindex >= 0 && *parse_pindex < sym_count)
-        fprintf (stderr, "emxomf info: parsing sym no.%d type=%d at char '%c' in position %d:\n%s\n",
-                 *parse_pindex, sym_ptr[*parse_pindex].n_type,
-                 *parse_ptr, parse_ptr - parse_start, parse_start);
-      else
-        fprintf (stderr, "emxomf info: parsing '%c' at position %d:\n%s\n",
-                 *parse_ptr, parse_ptr - parse_start, parse_start);
+  if (warning_level < 2)
+    {
+      static const char *s_pszComplainedFor = NULL;
+      if (warning_level == 1 && s_pszComplainedFor == error_fname)
+        {
+          s_pszComplainedFor = error_fname;
+          fprintf (stderr, "emxomf warning: debug info conversion issues for '%s'. (-v for details.)\n", error_fname);
+        }
+    }
+  else
+    {
+      va_start(args, pszFormat);
+      fprintf (stderr, "emxomf warning: ");
+      vfprintf (stderr, pszFormat, args);
+      va_end (args);
+      fputc ('\n', stderr);
+
+      if (parse_ptr && parse_start && parse_ptr >= parse_start)
+        {
+          if (parse_pindex && *parse_pindex >= 0 && *parse_pindex < sym_count)
+            fprintf (stderr, "emxomf info: parsing sym no.%d type=%d at char '%c' in position %d:\n%s\n",
+                     *parse_pindex, sym_ptr[*parse_pindex].n_type,
+                     *parse_ptr, parse_ptr - parse_start, parse_start);
+          else
+            fprintf (stderr, "emxomf info: parsing '%c' at position %d:\n%s\n",
+                     *parse_ptr, parse_ptr - parse_start, parse_start);
+        }
     }
 }