Changeset 3653 for trunk

Timestamp:

Jan 26, 2009, 12:32:48 AM (17 years ago)

Author:

bird

Message:

listomf: Parse LPUBDEF (watcom emits them) and use symbolic constants where possible.

File:

• trunk/emx/src/emxomf/listomf.c (modified) (17 diffs)

trunk/emx/src/emxomf/listomf.c

@@ -496 +496 @@
   switch (rec)
     {
-    case 0x00:
+    case CLASS_TRANS:
       len = rec_len - rec_idx;
       get_mem (string, len);
@@ -504 +504 @@
       break;
 
-    case 0x9d:
+    case CLASS_MODEL:
       {
         const char *model = "N/A";
@@ -540 +540 @@
       }
 
-    case 0x9e:
+    case CLASS_DOSSEG:
       printf ("DOSSEG\n");
       break;
 
-    case 0x9f:
+    case CLASS_DEFLIB:
       len = rec_len - rec_idx;
       get_mem (string, len);
@@ -552 +552 @@
       break;
 
-    case 0xa0:
+    case CLASS_OMFEXT:
       subrec = get_byte ();
       switch (subrec)
         {
-        case 0x01:
+        case OMFEXT_IMPDEF:
           printf ("IMPDEF ");
           flag = get_byte ();
@@ -575 +575 @@
           break;
 
-        case 0x02:
+        case OMFEXT_EXPDEF:
           printf ("EXPDEF ");
           flag = get_byte ();
@@ -596 +596 @@
           break;
 
-        case 0x04:
+        case OMFEXT_PROTLIB:
           printf ("Protected DLL\n");
           break;
@@ -607 +607 @@
       break;
 
-    case 0xa1:
+    case CLASS_DBGTYPE:
       if (rec_idx + 3 > rec_len) /* Borland vs. IBM clash */
         goto generic;
@@ -628 +628 @@
       break;
 
-    case 0xa2:
+    case CLASS_PASS:
       flag = get_byte ();
       if (flag == 1)
@@ -636 +636 @@
       break;
 
-    case 0xa3:
+    case CLASS_LIBMOD:
       get_string (string);
       printf ("LIBMOD ");
@@ -642 +642 @@
       break;
 
-    case 0xa8:
+    case CLASS_WKEXT:
       ext1 = get_index ();
       ext2 = get_index ();
@@ -651 +651 @@
       break;
 
-    case 0xad:
+    case CLASS_DBGPACK:
       get_string (string);
       printf ("debug pack DLL: ");
@@ -657 +657 @@
       break;
 
-    case 0xaf:
+    case CLASS_IDMDLL:
       get_string (string);
       printf ("Identifier manipulator DLL: ");
@@ -666 +666 @@
       break;
 
-    case 0xe9:
+    case CLASS_DEP_FILE:
       len = rec_len - rec_idx;
-        if (len)
+      if (len)
         {
           /* wDosTime, wDosDate, Name */
@@ -866 +866 @@
 
 
-static void list_pubdef (void)
+static void list_pubdef_or_lpubdef (int is_lpubdef)
 {
   int type, group, seg;
@@ -872 +872 @@
   byte name[256];
 
-  show_record ("PUBDEF");
+  if (!is_lpubdef)
+    show_record ("PUBDEF");
+  else
+    show_record ("LPUBDEF");
   group = get_index ();
   seg = get_index ();
@@ -2437 +2440 @@
         case PUBDEF:
         case PUBDEF|REC32:
-          list_pubdef ();
+          list_pubdef_or_lpubdef (0 /* not lpubdef */);
           break;
         case LINNUM:
@@ -2488 +2491 @@
           list_alias ();
           break;
+        case LPUBDEF:
+        case LPUBDEF|REC32:
+          list_pubdef_or_lpubdef (1 /* lpubdef */);
+          break;
+
         default:
           printf ("Unknown record type at %ld: %.2x\n",