Changeset 13827

Timestamp:

Mar 27, 2000, 2:36:17 PM (25 years ago)

Author:

bird

Message:

Removed ulReserved from HLLHDR.
ulReserved from HLLDIR is two shorts, cb and cbEntry.

Location:

tags/trunk/tools/dbginfo

Files:

• dbgLXDumper.c (modified) (3 diffs)
• hll.h (modified) (3 diffs)
• kHll.cpp (modified) (3 diffs)

tags/trunk/tools/dbginfo/dbgLXDumper.c ¶

@@ -1 @@
-/* $Id: dbgLXDumper.c,v 1.4 2000-03-27 10:20:42 bird Exp $
+/* $Id: dbgLXDumper.c,v 1.5 2000-03-27 12:36:16 bird Exp $
  *
  * dbgLXDumper - reads and interprets the debuginfo found in an LX executable.
@@ -190 +190 @@
             "    Signature          %.4s\n"
             "    Directory offset   0x%08x (%d)\n"
-            "    reserved           0x%08x (%d)\n"
             "\n",
             pHdr->achSignature,
             pHdr->offDirectory,
-            pHdr->offDirectory,
-            pHdr->ulReserved,
-            pHdr->ulReserved);
+            pHdr->offDirectory);
 
 
@@ -211 +208 @@
     fprintf(phOut,
             "- HLL Directory -\n"
-            "    Reserved           0x%08x (%d)\n"
-            "    Number of entries  0x%08x (%d)\n",
-            pDir->ulReserved,
-            pDir->ulReserved,
+            "    Size of this struct  0x%02x (%d)\n"
+            "    Size directory entry 0x%02x (%d)\n"
+            "    Number of entries    0x%08x (%d)\n",
+            pDir->cb,
+            pDir->cb,
+            pDir->cbEntry,
+            pDir->cbEntry,
             pDir->cEntries,
             pDir->cEntries);

tags/trunk/tools/dbginfo/hll.h ¶

@@ -1 @@
-/* $Id: hll.h,v 1.3 2000-03-26 21:56:37 bird Exp $
+/* $Id: hll.h,v 1.4 2000-03-27 12:36:17 bird Exp $
  *
  * HLL definitions.
@@ -56 +56 @@
     unsigned long   offDirectory;       /* Offset to the HLL Directory.
                                          * (Relative to start of this header.) */
-    unsigned long   ulReserved;         /* Unknown field. Seems to be 1. */
 } HLLHDR, *PHLLHDR;
 
@@ -80 +79 @@
 typedef struct _HLLDirectory
 {
-    unsigned long   ulReserved;         /* Unknown. */
+    unsigned short  cb;                 /* Size of this struct (minus aEntries)
+                                         * / offset of aEntries relative to start of this structure. */
+    unsigned short  cbEntry;            /* Size of the directory entries (HLLDIRENTRY). */
     unsigned long   cEntries;           /* Count of directory entires. */
     HLLDIRENTRY     aEntries[1];        /* Directory. */

tags/trunk/tools/dbginfo/kHll.cpp ¶

@@ -1 @@
-/* $Id: kHll.cpp,v 1.6 2000-03-27 10:20:42 bird Exp $
+/* $Id: kHll.cpp,v 1.7 2000-03-27 12:36:17 bird Exp $
  *
  * kHll - Implementation of the class kHll.
@@ -582 +582 @@
     memcpy(hllHdr.achSignature, "NB04", 4);
     hllHdr.offDirectory = 0;
-    hllHdr.ulReserved = 1;
     cch = fwrite(&hllHdr, 1, sizeof(hllHdr), phFile);
     if (cch != sizeof(hllHdr))
@@ -618 +617 @@
     lPosDir = ftell(phFile);
     hllDir.cEntries = 0;
-    hllDir.ulReserved = 0; //FIXME/TODO - not quite sure what this is or should be!
+    hllDir.cb       = offsetof(HLLDIR, aEntries);
+    hllDir.cbEntry  = sizeof(HLLDIRENTRY);
     cch = fwrite(&hllDir, 1, offsetof(HLLDIR, aEntries), phFile);
     if (cch != offsetof(HLLDIR, aEntries))