Changeset 3247 for trunk/tools/dbginfo/Sym2Hll.cpp

Timestamp:

Mar 27, 2000, 12:20:42 PM (25 years ago)

Author:

bird

Message:

Things are beginning to work. ICSDEBUG don't like use the debug info generated
by Sym2Hll yet, don't know why.

File:

• trunk/tools/dbginfo/Sym2Hll.cpp (modified) (10 diffs)

trunk/tools/dbginfo/Sym2Hll.cpp

@@ -1 @@
-/* $Id: Sym2Hll.cpp,v 1.2 2000-03-26 21:56:36 bird Exp $
+/* $Id: Sym2Hll.cpp,v 1.3 2000-03-27 10:20:41 bird Exp $
  *
  * Sym2Hll - Symbol file to HLL debuginfo converter.
@@ -8 +8 @@
  *
  */
+/*******************************************************************************
+*   Defined Constants And Macros                                               *
+*******************************************************************************/
+#define INCL_DOSERRORS
+#define WORD    USHORT
+#define DWORD   ULONG
 
 /*******************************************************************************
@@ -13 +19 @@
 *******************************************************************************/
 #include <os2.h>
+#include <exe386.h>
 
 #include <stdio.h>
@@ -25 +32 @@
 #include "kHll.h"
 #include "sym.h"
+#include "kFileFormatBase.h"
+#include "kFileLX.h"
 
 /*******************************************************************************
@@ -33 +42 @@
 
 
+/*******************************************************************************
+*   External Functions                                                         *
+*******************************************************************************/
+APIRET APIENTRY DosReplaceModule (PSZ pszOldModule, PSZ pszNewModule, PSZ pszBackupModule);
+
 
 
 int main(int argc, char **argv)
 {
-    kHll *pHll;
+    kHll *      pHll;
+    kFileLX *   pFileLX;
 
     /*
@@ -51 +66 @@
     pHll = new kHll();
     assert(pHll != NULL);
+
+    try {
+        pFileLX = new kFileLX(argv[2]);
+    } catch (int errcd)
+    {
+        fprintf(stderr, "failed to open/read LX file (%s). errcd=%d\n", argv[2], errcd);
+        return -3;
+    }
+
 
 
@@ -117 +141 @@
             while (pSegDef != NULL)
             {
+                struct o32_obj *pLXObject;
                 PSYMDEF32       pSymDef32;  /* Symbol definition 32-bit */
                 PSYMDEF16       pSymDef16;  /* Symbol definition 16-bit */
@@ -160 +185 @@
                  * Add segment to the module - FIXME - need info from the LX Object table...
                  */
-
+                pLXObject = pFileLX->getObject(iSegment-1);
+                if (pLXObject)
+                {
+                    if (!pModule->addSegInfo(iSegment, 0, pLXObject->o32_size))
+                        fprintf(stderr, "warning: addseginfo failed!\n");
+                }
+                else
+                    fprintf(stderr, "warning: pFileLX->getObject failed for iSegment=%d\n",
+                            iSegment);
 
                 /*
@@ -233 +266 @@
          */
         pHll->write("debug.hll");
-        pHll->writeToLX(argv[2]);
+        rc = pHll->writeToLX(argv[2]);
+        if (rc == ERROR_ACCESS_DENIED)
+        {
+
+            rc = DosReplaceModule(argv[2], NULL, NULL);
+            if (rc == NO_ERROR)
+            {
+                rc = pHll->writeToLX(argv[2]);
+            }
+        }
     }
     else
@@ -290 +332 @@
 
 
-/**
- * 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;
-}
-