Changeset 682

Timestamp:

Sep 10, 2003, 4:39:18 PM (22 years ago)

Author:

bird

Message:

Offsets.

File:

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

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

@@ -153 +153 @@
   if (show_addr)
     printf ("%ld: %s", rec_pos, name);
+  else if (hex_dump)
+    printf ("%08lx: %s", rec_pos, name);
   else
     printf ("%s", name);
@@ -379 +381 @@
 
 
-static void dump_block (int count, int indent)
+static void dump_block (int count, int indent, int foff)
 {
   int x;
@@ -389 +391 @@
       unsigned int ui = rec_buf[rec_idx++];
       --count;
+
       if (x >= 16)
         {
@@ -399 +402 @@
       ascii[x] = ui;
       if (x == 0)
-        printf ("%*s", indent, "");
+        {
+          if (foff)
+            printf ("%*s%08lx %03lx:", indent, "", 
+                    rec_pos + rec_idx - 1 + sizeof (struct omf_rec),
+                    rec_idx - 1 + sizeof (struct omf_rec));
+          else
+            printf ("%*s", indent, "");
+        }
       if (x != 8)
         printf (" %.2x", ui);
@@ -421 +431 @@
 static void dump_rest (void)
 {
-  dump_block (rec_len - rec_idx, 2);
+  dump_block (rec_len - rec_idx, 2, 0);
 }
 
@@ -1277 +1287 @@
           printf ("  hexdump:\n");
           rec_idx = start;
-          dump_block (len, 3);
+          dump_block (len, 3, 1);
         }
     }
@@ -1835 +1845 @@
           printf ("  hexdump:\n");
           rec_idx = start;
-          dump_block (len, 3);
+          dump_block (len, 3, 1);
         }
     }
@@ -1881 +1891 @@
       printf ("%*sRepeat count: %lu, data length: %d\n",
               indent, "", rep_count, len);
-      dump_block (len, indent + 2);
+      dump_block (len, indent + 2, 0);
     }
   else
@@ -2305 +2315 @@
     {
       int skip_hexdump = 0;
-      if (show_addr)
+      if (show_addr || hex_dump)
         rec_pos = ftell (f);
       if (fread (&rec, sizeof (rec), 1, f) != 1)
@@ -2417 +2427 @@
           rec_len = rec.rec_len - 1; /* skip crc */
           rec_idx = 0;
-          dump_block (rec_len, 2);
+          dump_block (rec_len, 2, 1);
         }
     } while (!done);