Changeset 3244 for trunk/tools

Timestamp:

Mar 26, 2000, 11:56:38 PM (25 years ago)

Author:

bird

Message:

Temporary checkin.

Location:

trunk/tools/dbginfo

Files:

• Sym2Hll.cpp (modified) (4 diffs)
• dbgLXDumper.c (modified) (6 diffs)
• hll.h (modified) (5 diffs)
• kHll.cpp (modified) (19 diffs)
• kHll.h (modified) (7 diffs)

trunk/tools/dbginfo/Sym2Hll.cpp

@@ -1 @@
-/* $Id: Sym2Hll.cpp,v 1.1 2000-03-26 14:23:21 bird Exp $
+/* $Id: Sym2Hll.cpp,v 1.2 2000-03-26 21:56:36 bird Exp $
  *
  * Sym2Hll - Symbol file to HLL debuginfo converter.
@@ -15 +15 @@
 
 #include <stdio.h>
+#include <malloc.h>
+#include <stdlib.h>
+#include <stddef.h>
 #include <string.h>
 #include <assert.h>
@@ -21 +24 @@
 #include "kList.h"
 #include "kHll.h"
+#include "sym.h"
+
+/*******************************************************************************
+*   Internal Functions                                                         *
+*******************************************************************************/
+void *          readfile(const char *pszFilename);
+signed long     fsize(FILE *phFile);
 
 
@@ -27 +37 @@
 int main(int argc, char **argv)
 {
+    kHll *pHll;
+
+    /*
+     * Quite simple input currently:
+     *      <filename.sym> <filename.exe>
+     */
+    if (argc != 3)
+    {
+        fprintf(stderr, "syntax error\n");
+        return -87;
+    }
+
+    pHll = new kHll();
+    assert(pHll != NULL);
+
+
+    /*
+     * Start conversion.
+     */
+    PBYTE pbSym = (PBYTE)readfile(argv[1]);
+    if (pbSym != NULL)
+    {
+        int             rc;
+        kHllModuleEntry*pModule;
+        PMAPDEF         pMapDef;             /* Mapfile header */
+
+        pMapDef = (PMAPDEF)pbSym;
+        while (pMapDef != NULL)
+        {
+            int         iSegment;
+            PSEGDEF     pSegDef;             /* Segment header */
+
+            /*
+             * Map definition.
+             */
+            printf("- Map definition -\n"
+                   "    ppNextMap    0x%04x  paragraph pointer to next map\n"
+                   "    bFlags       0x%02x    symbol types\n"
+                   "    bReserved1   0x%02x    reserved\n"
+                   "    pSegEntry    0x%04x  segment entry point value\n"
+                   "    cConsts      0x%04x  count of constants in map\n"
+                   "    pConstDef    0x%04x  pointer to constant chain\n"
+                   "    cSegs        0x%04x  count of segments in map\n"
+                   "    ppSegDef     0x%04x  paragraph pointer to first segment\n"
+                   "    cbMaxSym     0x%02x    maximum symbol-name length\n"
+                   "    cbModName    0x%02x    length of module name\n"
+                   "    achModName   %.*s\n"
+                   "\n",
+                   pMapDef->ppNextMap,
+                   pMapDef->bFlags,
+                   pMapDef->bReserved1,
+                   pMapDef->pSegEntry,
+                   pMapDef->cConsts,
+                   pMapDef->pConstDef,
+                   pMapDef->cSegs,
+                   pMapDef->ppSegDef,
+                   pMapDef->cbMaxSym,
+                   pMapDef->cbModName,
+                   pMapDef->cbModName,
+                   pMapDef->achModName
+                   );
+
+            /*
+             * Add Modulename.
+             */
+            pModule = pHll->addModule(pMapDef->achModName, pMapDef->cbModName, NULL);
+            if (pModule == NULL)
+            {
+                fprintf(stderr, "addModule failed\n");
+                return -3;
+            }
+
+
+            /*
+             * Read and convert segments with info.
+             */
+            pSegDef = SEGDEFPTR(pbSym, *pMapDef);
+            iSegment = 1;
+            while (pSegDef != NULL)
+            {
+                PSYMDEF32       pSymDef32;  /* Symbol definition 32-bit */
+                PSYMDEF16       pSymDef16;  /* Symbol definition 16-bit */
+                int             iSym;
+
+
+                /*
+                 * Dump Segment definition.
+                 */
+                printf("    - Segment Definition -\n"
+                       "      ppNextSeg   0x%04x  paragraph pointer to next segment\n"
+                       "      cSymbols    0x%04x  count of symbols in list\n"
+                       "      pSymDef     0x%04x  offset of symbol chain\n"
+                       "      wReserved1  0x%04x  reserved\n"
+                       "      wReserved2  0x%04x  reserved\n"
+                       "      wReserved3  0x%04x  reserved\n"
+                       "      wReserved4  0x%04x  reserved\n"
+                       "      bFlags      0x%04x  symbol types\n"
+                       "      bReserved1  0x%04x  reserved\n"
+                       "      ppLineDef   0x%04x  offset of line number record\n"
+                       "      bReserved2  0x%04x  reserved\n"
+                       "      bReserved3  0x%04x  reserved\n"
+                       "      cbSegName   0x%04x  length of segment name\n"
+                       "      achSegName  %.*s\n",
+                       pSegDef->ppNextSeg,
+                       pSegDef->cSymbols,
+                       pSegDef->pSymDef,
+                       pSegDef->wReserved1,
+                       pSegDef->wReserved2,
+                       pSegDef->wReserved3,
+                       pSegDef->wReserved4,
+                       pSegDef->bFlags,
+                       pSegDef->bReserved1,
+                       pSegDef->ppLineDef ,
+                       pSegDef->bReserved2,
+                       pSegDef->bReserved3,
+                       pSegDef->cbSegName,
+                       pSegDef->cbSegName,
+                       pSegDef->achSegName
+                       );
+
+                /*
+                 * Add segment to the module - FIXME - need info from the LX Object table...
+                 */
+
+
+                /*
+                 * Read and convert symbols
+                 */
+                for (iSym = 0; iSym < pSegDef->cSymbols; iSym++)
+                {
+                    unsigned long   offset;
+                    int             cchName;
+                    const char *    pachName;
+                    pSymDef32 = SYMDEFPTR32(pbSym, pSegDef, iSym);
+                    pSymDef16 = (PSYMDEF16)pSymDef32;
+
+                    if (SEG32BitSegment(*pSegDef))
+                    {   /* pSymDef32 */
+                        offset = pSymDef32->wSymVal;
+                        cchName = pSymDef32->cbSymName;
+                        pachName = pSymDef32->achSymName;
+                    }
+                    else
+                    {   /* pSymDef16 */
+                        offset = pSymDef16->wSymVal;
+                        cchName = pSymDef16->cbSymName;
+                        pachName = pSymDef16->achSymName;
+                    }
+
+                    printf("      0x%08x  %.*s\n",
+                           offset,
+                           cchName,
+                           pachName);
+
+                    /*
+                     * Add symbol - currently we define it as public - it's a symbol local to this module really.
+                     */
+                    pModule->addPublicSymbol(pachName, cchName, offset, iSegment, 0);
+                }
+
+
+                /*
+                 * Next segment
+                 */
+                printf("\n");
+                pSegDef = NEXTSEGDEFPTR(pbSym, *pSegDef);
+                iSegment++;
+            }
+
+
+            /*
+             * Next map
+             */
+            pMapDef = NEXTMAPDEFPTR(pbSym, *pMapDef);
+            if (pMapDef != NULL)
+            {
+                if (pMapDef->ppNextMap == 0)
+                {   /* last map */
+                    PLAST_MAPDEF pLastMapDef = (PLAST_MAPDEF)pMapDef;
+                    printf("- Last Map definition -\n"
+                           "    ppNextMap    0x%04x  always zero\n"
+                           "    version      0x%02x    release number (minor version number)\n"
+                           "    release      0x%02x    major version number\n",
+                           pLastMapDef->ppNextMap,
+                           pLastMapDef->release,
+                           pLastMapDef->version
+                           );
+                    break;
+                }
+            }
+        } /* Map loop */
+
+        /*
+         * debug
+         */
+        pHll->write("debug.hll");
+        pHll->writeToLX(argv[2]);
+    }
+    else
+    {
+        fprintf(stderr, "failed to open/read .sym file.\n");
+        return -2;
+    }
+
+
+
+
+
 
     return -1;
 }
+
+
+
+
+
+/**
+ * Creates a memory buffer for a binary file.
+ * @returns   Pointer to file memoryblock. NULL on error.
+ * @param     pszFilename  Pointer to filename string.
+ * @remark    This function is the one using most of the execution
+ *            time (DosRead + DosOpen) - about 70% of the execution time!
+ */
+void *readfile(const char *pszFilename)
+{
+    void *pvFile = NULL;
+    FILE *phFile;
+
+    phFile = fopen(pszFilename, "rb");
+    if (phFile != NULL)
+    {
+        signed long cbFile = fsize(phFile);
+        if (cbFile > 0)
+        {
+            pvFile = malloc(cbFile + 1);
+            if (pvFile != NULL)
+            {
+                memset(pvFile, 0, cbFile + 1);
+                if (fread(pvFile, 1, cbFile, phFile) == 0)
+                {   /* failed! */
+                    free(pvFile);
+                    pvFile = NULL;
+                }
+            }
+            else
+                fprintf(stderr, "warning/error: failed to open file %s\n", pszFilename);
+        }
+        fclose(phFile);
+    }
+    return pvFile;
+}
+
+
+/**
+ * Find the size of a file.
+ * @returns   Size of file. -1 on error.
+ * @param     phFile  File handle.
+ */
+signed long fsize(FILE *phFile)
+{
+    int ipos;
+    signed long cb;
+
+    if ((ipos = ftell(phFile)) < 0
+        ||
+        fseek(phFile, 0, SEEK_END) != 0
+        ||
+        (cb = ftell(phFile)) < 0
+        ||
+        fseek(phFile, ipos, SEEK_SET) != 0
+        )
+        cb = -1;
+    return cb;
+}
+
 
 

trunk/tools/dbginfo/dbgLXDumper.c

@@ -1 @@
-/* $Id: dbgLXDumper.c,v 1.2 2000-03-25 21:09:58 bird Exp $
+/* $Id: dbgLXDumper.c,v 1.3 2000-03-26 21:56:37 bird Exp $
  *
  * dbgLXDumper - reads and interprets the debuginfo found in an LX executable.
@@ -202 +202 @@
      * Get and Dump directory
      */
-    if (pHdr->offDirectory + sizeof(HLLDIR) >= cb)
-    {
-        fprintf(phOut, "error: offcEntries is incorrect!\n");
+    if (pHdr->offDirectory + sizeof(HLLDIR) > cb)
+    {
+        fprintf(phOut, "error: offDirectory is incorrect! (cb=%d, off=%d)\n",
+                cb, pHdr->offDirectory);
         return ERROR_INVALID_DATA;
     }
@@ -221 +222 @@
      * Directory sanity check - check that it's not too big
      */
-    if ((PBYTE)&pDir->aEntries[pDir->cEntries] - pb >= cb)
+    if ((PBYTE)&pDir->aEntries[pDir->cEntries] - pb > cb)
     {
         fprintf(phOut, "Error: Directory is to big!\n");
@@ -290 +291 @@
             {
                 PHLLMODULE  pModule = (PHLLMODULE)(pDir->aEntries[i].off + pb);
-                PHLLOBJECT  paObjects;
+                PHLLSEGINFO paSegInfo;
                 int         j, c;
 
@@ -320 +321 @@
 
                 /*
-                 * Dump object data
+                 * Dump Segment info
                  */
                 fprintf(phOut,
-                        "    Object %d\n"
-                        "      iObj %#x\n"
-                        "      off  %#x\n"
-                        "      cb   %#x\n",
+                        "    SegmentInfo %d\n"
+                        "      iObject   %#x\n"
+                        "      off       %#x\n"
+                        "      cb        %#x\n",
                         0,
-                        pModule->Object.iObj,
-                        pModule->Object.off,
-                        pModule->Object.cb);
-
-                c = pModule->cObjects > 0 ? pModule->cObjects : 0;
-                paObjects = (PHLLOBJECT)((void*)&pModule->achName[pModule->cchName]);
+                        pModule->SegInfo0.iObject,
+                        pModule->SegInfo0.off,
+                        pModule->SegInfo0.cb);
+
+                c = pModule->cSegInfo > 0 ? pModule->cSegInfo : 0;
+                paSegInfo = (PHLLSEGINFO)((void*)&pModule->achName[pModule->cchName]);
                 for (j = 0; j < c; j++)
                 {
                     fprintf(phOut,
-                        "    Object %d\n"
-                        "      iObj %#x\n"
-                        "      off  %#x\n"
-                        "      cb   %#x\n",
+                        "    SegmentInfo %d\n"
+                        "      iObject   %#x\n"
+                        "      off       %#x\n"
+                        "      cb        %#x\n",
                         j + 1,
-                        paObjects[j].iObj,
-                        paObjects[j].off,
-                        paObjects[j].cb);
+                        paSegInfo[j].iObject,
+                        paSegInfo[j].off,
+                        paSegInfo[j].cb);
                 }
                 break;
@@ -358 +359 @@
                     fprintf(phOut,
                             "    %#03x:%#08x iType=%#2x  name=%.*s\n",
-                            pPubSym->iObj,
+                            pPubSym->iObject,
                             pPubSym->off,
                             pPubSym->iType,

trunk/tools/dbginfo/hll.h

@@ -1 @@
-/* $Id: hll.h,v 1.2 2000-03-25 21:09:59 bird Exp $
+/* $Id: hll.h,v 1.3 2000-03-26 21:56:37 bird Exp $
  *
  * HLL definitions.
@@ -87 +87 @@
 
 /*
- * HLL Object (LX Object = NE/OMF Segment)
+ * HLL Segment
  */
-typedef struct _HLLObject /*segment*/
+typedef struct _HLLSegInfo
 {
-    unsigned short  iObj;               /* LX Object number. */
+    unsigned short  iObject;            /* LX Object number. */
     unsigned long   off;                /* Offset into the load image. */
     unsigned long   cb;                 /* Object length. */
-} HLLOBJECT, *PHLLOBJECT;
+} HLLSEGINFO, *PHLLSEGINFO;
 
 
@@ -102 +102 @@
 typedef struct _HLLModule
 {
-    HLLOBJECT       Object;             /* Description of an object. */
+    HLLSEGINFO      SegInfo0;           /* Segment info entry 0. */
     unsigned short  overlay;            /* unused. */
     unsigned short  iLib;               /* Library number it came from. */
-    unsigned char   cObjects;           /* Number of objects.*/
+    unsigned char   cSegInfo;           /* Number of segment info entries. */
     unsigned char   pad;                /* 1 byte padding. */
     unsigned short  usDebugStyle;       /* Debug style -'HL' */
@@ -112 +112 @@
     unsigned char   cchName;            /* Filename length. */
     unsigned char   achName[1];         /* Filename. (*) */
-    /* HLLOBJECT     aObjects[] */      /* Array of object descriptions. (Starts at achName[cchName+1]) */
+    /* HLLSEGINFO      aSegInfo[] */    /* Array of segment info, starting with entry 1. (Starts at achName[cchName]) */
 } HLLMODULE, *PHLLMODULE;
 
@@ -122 +122 @@
 {
     unsigned long   off;                /* 32-bit offset (into the LX object) of the symbol location. */
-    unsigned short  iObj;               /* LX Object number. */
+    unsigned short  iObject;            /* LX Object number. */
     unsigned short  iType;              /* Symbol type index (into the type info data). */
     unsigned char   cchName;            /* Size of name. */

trunk/tools/dbginfo/kHll.cpp

@@ -1 @@
-/* $Id: kHll.cpp,v 1.3 2000-03-26 14:16:18 bird Exp $
+/* $Id: kHll.cpp,v 1.4 2000-03-26 21:56:37 bird Exp $
  *
  * kHll - Implementation of the class kHll.
@@ -101 +101 @@
 /**
  * Creates an HLL public symbol entry.
- * @param     pszName   Symbol name.
+ * @param     pachName  Symbol name.
+ * @param     cchName   Length of symbol name.
  * @param     off       Offset into the object.
- * @param     iObj      LX Object index.
+ * @param     iObject   LX Object index.
  * @param     iType     Type index. (index into type table)
  */
 kHllPubSymEntry::kHllPubSymEntry(
-        const char *        pszName,
+        const char *        pachName,
+        int                 cchName,
         unsigned long       off,
-        unsigned short      iObj,
+        unsigned short      iObject,
         unsigned short      iType
         )
 {
-    pPubSym = (PHLLPUBLICSYM)malloc(strlen(pszName) + sizeof(HLLPUBLICSYM));
+    pPubSym = (PHLLPUBLICSYM)malloc(cchName + sizeof(HLLPUBLICSYM));
     assert(pPubSym != NULL);
 
-    pPubSym->cchName = strlen(pszName);
-    strcpy((char*)&pPubSym->achName[0], pszName);
+    pPubSym->cchName = cchName;
+    pPubSym->achName[0] = '\0';
+    strncat((char*)&pPubSym->achName[0], pachName, cchName);
     pPubSym->off = off;
-    pPubSym->iObj = iObj;
+    pPubSym->iObject = iObject;
     pPubSym->iType = iType;
 }
@@ -173 +176 @@
  * @param     pszName       Module name. (NULL is not allowed!)
  * @param     iLib          Library index.
- * @param     cObjects      Number of objects in the array.
- * @param     paObjects     Pointer to an array of objects.
+ * @param     cSegInfo      Number of objects in the array.
+ * @param     paSegInfo     Pointer to an array of objects.
  */
 kHllModuleEntry::kHllModuleEntry(
         const char *        pszName,
         unsigned short      iLib,
-        unsigned char       cObjects/*= 0 */,
-        PMODOBJECT          paObjects/*= NULL */
+        unsigned char       cSegInfo/*= 0 */,
+        PHLLSEGINFO         paSegInfo/*= NULL */
         )
 : fValidOffsetsAndSizes(FALSE)
@@ -186 +189 @@
     int         i;
     int         cchName;
-    PHLLOBJECT  pObj;
+    PHLLSEGINFO pSegInfo;
 
     /*
@@ -192 +195 @@
      */
     assert(pszName != NULL);
-    assert(cObjects == 0 || paObjects != NULL);
+    assert(cSegInfo == 0 || paSegInfo != NULL);
 
     /*
@@ -199 +202 @@
     cchName = strlen(pszName);
     pModule = (PHLLMODULE)malloc(sizeof(HLLMODULE) + cchName +
-                                 sizeof(HLLOBJECT) * min((cObjects - 1), 3));
+                                 sizeof(HLLSEGINFO) * min((cSegInfo - 1), 3));
     assert(pModule != NULL);
     memset(pModule, 0, sizeof(*pModule));
@@ -206 +209 @@
     pModule->chVerMajor = 4;
     pModule->chVerMinor = 0;
-    pModule->cObjects = cObjects;
+    pModule->cSegInfo = cSegInfo;
     pModule->iLib = iLib;
     pModule->usDebugStyle = HLL_MOD_STYLE;
@@ -213 +216 @@
 
     /* objects */
-    if (cObjects > 0)
-    {
-        pModule->Object.cb   = paObjects->cb;
-        pModule->Object.iObj = paObjects->iObject;
-        pModule->Object.off  = paObjects->offset;
-
-        for (i = 1, pObj = (PHLLOBJECT)&pModule->achName[cchName]; i < cObjects; i++, pObj++)
+    if (cSegInfo > 0)
+    {
+        pModule->SegInfo0.iObject = paSegInfo->iObject;
+        pModule->SegInfo0.cb      = paSegInfo->cb;
+        pModule->SegInfo0.off     = paSegInfo->off;
+
+        for (i = 1, pSegInfo = (PHLLSEGINFO)&pModule->achName[cchName]; i < cSegInfo; i++, pSegInfo++)
         {
-            pObj->cb   = paObjects[i].cb;
-            pObj->iObj = paObjects[i].iObject;
-            pObj->off  = paObjects[i].offset;
+            pSegInfo->iObject   = paSegInfo[i].iObject;
+            pSegInfo->cb        = paSegInfo[i].cb;
+            pSegInfo->off       = paSegInfo[i].off;
         }
     }
@@ -248 +251 @@
  * @param     cb        Size of module data (in the object).
  */
-BOOL            kHllModuleEntry::addObject(
+BOOL            kHllModuleEntry::addSegInfo(
                     unsigned short int  iObject,
                     unsigned long       off,
@@ -259 +262 @@
      * Reallocate? (Note that we'll initially allocated space for 3 objects.)
      */
-    if (pModule->cObjects >= 3)
+    if (pModule->cSegInfo >= 3)
     {
         void *pv = realloc(pModule, sizeof(HLLMODULE) + pModule->cchName
-                           + (pModule->cObjects + 1) * sizeof(HLLOBJECT));
+                           + (pModule->cSegInfo + 1) * sizeof(HLLSEGINFO));
         assert(pv != NULL);
         if (pv == NULL)
@@ -273 +276 @@
      * Add module.
      */
-    if (pModule->cObjects == 0)
-    {
-        pModule->Object.cb = cb;
-        pModule->Object.off = off;
-        pModule->Object.iObj = iObject;
+    if (pModule->cSegInfo == 0)
+    {
+        pModule->SegInfo0.cb = cb;
+        pModule->SegInfo0.off = off;
+        pModule->SegInfo0.iObject = iObject;
     }
     else
     {
-        PHLLOBJECT pObject =  (PHLLOBJECT)(pModule->cObjects * sizeof(HLLOBJECT)
-                                           + pModule->achName[pModule->cchName]);
-        pObject->cb = cb;
-        pObject->off = off;
-        pObject->iObj = iObject;
-    }
-    pModule->cObjects++;
+        PHLLSEGINFO pSegInfo =  (PHLLSEGINFO)(pModule->cSegInfo * sizeof(HLLSEGINFO)
+                                              + pModule->achName[pModule->cchName]);
+        pSegInfo->cb = cb;
+        pSegInfo->off = off;
+        pSegInfo->iObject = iObject;
+    }
+    pModule->cSegInfo++;
 
     return TRUE;
@@ -309 +312 @@
                     )
 {
+    assert(pszName != NULL);
+    return addPublicSymbol(pszName, strlen(pszName), off, iObject, pvType);
+}
+
+
+
+/**
+ * Adds a public symbol.
+ * @returns   Handle to the symbol. NULL on error.
+ * @param     pachName   Symbol name.
+ * @param     cchName    Name length.
+ * @param     off        Offset into the LX Object of the symbol.
+ * @param     iObject    LX Object index.
+ * @param     pvType     Type handle. NULL if not type.
+ */
+const void *    kHllModuleEntry::addPublicSymbol(
+                    const char *        pachName,
+                    int                 cchName,
+                    unsigned long int   off,
+                    unsigned short int  iObject,
+                    const void *        pvType
+                    )
+{
     kHllPubSymEntry *   pEntry;
 
     /* parameter assertion */
-    assert(pszName != NULL);
+    assert(pachName != NULL);
 
     /*
@@ -320 +346 @@
      */
     pEntry = new kHllPubSymEntry(
-        pszName,
+        pachName,
+        cchName,
         off,
         iObject,
@@ -332 +359 @@
     return pEntry;
 }
+
 
 
@@ -616 +644 @@
      */
     hllHdr.offDirectory = lPosDir - lPosStart;
+    if (fseek(phFile, lPosStart, SEEK_SET) != 0)
+        return -2;
     cch = fwrite(&hllHdr, 1, sizeof(hllHdr), phFile);
     if (cch != sizeof(hllHdr))
         return -1;
-
 
     return cch;
@@ -649 +678 @@
  * @param    pszName    Module name
  * @param    pvLib      Library module handle.
- * @param    cObjects   Number of objects in the array.
- * @param    paObjects  Pointer to an array of objects.
+ * @param    cSegInfo   Number of objects in the array.
+ * @param    paSegInfo  Pointer to an array of objects.
  */
 kHllModuleEntry *   kHll::addModule(
                         const char *        pszName,
                         const void *        pvLib,
-                        unsigned            cObjects,
-                        PMODOBJECT          paObjects)
+                        unsigned            cSegInfo,
+                        PHLLSEGINFO         paSegInfo)
 {
     kHllModuleEntry *   pEntry;
@@ -664 +693 @@
         pszName,
         pvLib == NULL ? 0 : -1, //FIXME/TODO: Libs->getIndex(pvLib); check if 0 or -1;
-        cObjects,
-        paObjects);
+        cSegInfo,
+        paSegInfo);
+
+    Modules.insert(pEntry);
+    return pEntry;
+}
+
+
+
+/**
+ * Adds a module.
+ * @returns  Pointer to the module object added. NULL on error.
+ * @param    pachName   Module name
+ * @param    cchName    Length of modulename
+ * @param    pvLib      Library module handle.
+ * @param    cSegInfo   Number of objects in the array.
+ * @param    paSegInfo  Pointer to an array of objects.
+ */
+kHllModuleEntry *   kHll::addModule(
+                        const char *        pachName,
+                        unsigned            cchName,
+                        const void *        pvLib,
+                        unsigned            cSegInfo,
+                        PHLLSEGINFO         paSegInfo)
+{
+    char szModName[256];
+    kHllModuleEntry *   pEntry;
+    assert(pachName != NULL && cchName > 0);
+
+    szModName[0] = '\0';
+    strncat(szModName, pachName, min(cchName, 255));
+    pEntry = new kHllModuleEntry(
+        szModName,
+        pvLib == NULL ? 0 : -1, //FIXME/TODO: Libs->getIndex(pvLib); check if 0 or -1;
+        cSegInfo,
+        paSegInfo);
 
     Modules.insert(pEntry);
@@ -733 +796 @@
         if (cch == sizeof(ehdr))
         {
-            if (ehdr.e_magic == NEMAGIC)
+            if (ehdr.e_magic == EMAGIC)
                 lPosLXHdr = ehdr.e_lfanew;
             else
@@ -748 +811 @@
                          * Check if there is any debug info.
                          */
-                        if (e32.e32_debuginfo > 0 && e32.e32_debuginfo > 0)
+                        if (e32.e32_debuginfo == 0 && e32.e32_debuginfo == 0)
                         {
                             long lPosDebug;

trunk/tools/dbginfo/kHll.h

@@ -1 @@
-/* $Id: kHll.h,v 1.3 2000-03-26 14:16:19 bird Exp $
+/* $Id: kHll.h,v 1.4 2000-03-26 21:56:38 bird Exp $
  *
  * kHll - Declarations of the class kHll.
@@ -18 +18 @@
 *   Structures and Typedefs                                                    *
 *******************************************************************************/
-/**
- * Module object(=segment) description.
- */
-typedef struct
-{
-    unsigned short  iObject;            /* LX Object index. */
-    unsigned long   cb;                 /* Size of object part. */
-    unsigned long   offset;             /* Offset into the LX Object. */
-} MODOBJECT, *PMODOBJECT;
-
-
 
 /**
@@ -64 +53 @@
 public:
     kHllPubSymEntry(
-        const char *        pszName,
+        const char *        pachName,
+        int                 cchName,
         unsigned long       off,
-        unsigned short      iObj,
+        unsigned short      iObject,
         unsigned short      iType
         );
@@ -124 +114 @@
         const char *        pszName,
         unsigned short      iLib,
-        unsigned char       cObjects = 0,
-        PMODOBJECT          paObjects = NULL
+        unsigned char       cSegInfo = 0,
+        PHLLSEGINFO         paSegInfo = NULL
         );
     ~kHllModuleEntry();
@@ -133 +123 @@
      * Add menthods
      */
-    BOOL            addObject(
+    BOOL            addSegInfo(
                         unsigned short int  iObject,
                         unsigned long       off,
@@ -145 +135 @@
                         const void *        pvType
                         );
+    const void *    addPublicSymbol(
+                        const char *        pachName,
+                        int                 cchName,
+                        unsigned long int   off,
+                        unsigned short int  iObject,
+                        const void *        pvType
+                        );
 
 
@@ -191 +188 @@
                             const char *        pszName,
                             const void *        pvLib,
-                            unsigned            cObjects,
-                            PMODOBJECT          paObjects
+                            unsigned            cSegInfo = 0,
+                            PHLLSEGINFO         paSegInfo = NULL
+                            );
+    kHllModuleEntry *   addModule(
+                            const char *        pachName,
+                            unsigned            cchName,
+                            const void *        pvLib,
+                            unsigned            cSegInfo = 0,
+                            PHLLSEGINFO         paSegInfo = NULL
                             );