Changeset 351

Timestamp:

Jul 11, 2003, 9:04:05 AM (22 years ago)

Author:

bird

Message:

#559: corrected linenumber interpretation.

File:

• trunk/src/emx/src/emxomf/listomf.c (modified) (3 diffs, 1 prop)

trunk/src/emx/src/emxomf/listomf.c

@@ -97 +97 @@
 static int linnum_started;
 static byte linnum_entry_type;
+static int linnum_file_idx;
+static int linnum_files;
 static word page_size;
 static word dict_blocks;
@@ -2106 +2108 @@
               line_count, (line_count == 1 ? "" : "s"), segment, names_length);
       linnum_started = TRUE;
+      linnum_files = linnum_file_idx = 0;
     }
   printf ("\n");
-  while (rec_idx < rec_len && line_count != 0)
-    {
-      switch (linnum_entry_type)
+
+  if (!linnum_files && (linnum_entry_type == 3 || linnum_entry_type == 4))
+    {
+      printf ("  No line numbers\n");
+      line_count = 0;
+    }
+  else
+    {
+      while (rec_idx < rec_len && line_count != 0)
         {
-        case 0x00:
-          src_line = get_word ();
-          index = get_word ();
-          addr = get_dword ();
-          printf ("  Line %6u of file %u at 0x%.8lx", src_line, index, addr);
-          break;
-        case 0x01:
-          lst_line = get_dword ();
-          stmt = get_dword ();
-          addr = get_dword ();
-          printf ("  Line %6lu, statement %6lu at 0x%.8lx",
-                  lst_line, stmt, addr);
-          break;
-        case 0x02:
-          src_line = get_word ();
-          index = get_word ();
-          lst_line = get_dword ();
-          stmt = get_dword ();
-          addr = get_dword ();
-          printf ("  Line %6u of file %u, ", src_line, index);
-          printf ("listing line %6lu, statement %6lu at 0x%.8lx",
-                  lst_line, stmt, addr);
-          break;
-        case 0x03:
-        case 0x04:
-          printf ("  No line numbers");
-          break;
-        default:
-          printf ("  ????");
-          break;
+          switch (linnum_entry_type)
+            {
+            case 0x00:
+              src_line = get_word ();
+              index = get_word ();
+              addr = get_dword ();
+              printf ("  Line %6u of file %u at 0x%.8lx", src_line, index, addr);
+              break;
+            case 0x01:
+              lst_line = get_dword ();
+              stmt = get_dword ();
+              addr = get_dword ();
+              printf ("  Line %6lu, statement %6lu at 0x%.8lx",
+                      lst_line, stmt, addr);
+              break;
+            case 0x02:
+              src_line = get_word ();
+              index = get_word ();
+              lst_line = get_dword ();
+              stmt = get_dword ();
+              addr = get_dword ();
+              printf ("  Line %6u of file %u, ", src_line, index);
+              printf ("listing line %6lu, statement %6lu at 0x%.8lx",
+                      lst_line, stmt, addr);
+              break;
+            case 0x03:
+            case 0x04:
+              printf ("  No line numbers");
+              break;
+            default:
+              printf ("  ????");
+              break;
+            }
+          printf ("\n");
+          --line_count;
         }
-      printf ("\n");
-      --line_count;
-    }
+    }
+  if (line_count == 0)
+    linnum_started = FALSE;
 
   /* Path table comes next, ignored... */
@@ -2153 +2167 @@
   if (rec_idx < rec_len)
     {
-      first_col = get_dword ();
-      num_cols = get_dword ();
-      files = get_dword ();
-      printf ("  first column: %lu, columns: %lu, number of files: %ld\n",
-              first_col, num_cols, files);
-      for (i = 0; i < files; ++i)
+      if (!linnum_files/*|| (linnum_entry_type != 3 && linnum_entry_type != 4)*/)
         {
-          printf ("  #%lu: ", i + 1);
+          first_col = get_dword ();
+          num_cols = get_dword ();
+          linnum_files = get_dword ();
+          printf ("  first column: %lu, columns: %lu, number of files: %ld\n",
+                  first_col, num_cols, files);
+          linnum_file_idx = 0;
+        }
+
+      for (; linnum_file_idx < linnum_files && rec_idx < rec_len; ++linnum_file_idx)
+        {
+          printf ("  #%lu: ", linnum_file_idx + 1);
           get_string (name);
           show_string (name);
           printf ("\n");
         }
-    }
-  if (line_count == 0)
-    linnum_started = FALSE;
+
+      linnum_started = (linnum_file_idx < linnum_files);
+    }
 }