Changeset 430 for branches/branch-1-0/src

Timestamp:

Jan 19, 2017, 7:38:47 AM (9 years ago)

Author:

rlwalsh

Message:

debug: improve handling for Warp 4.5 SYM files

File:

• branches/branch-1-0/src/helpers/debug.c (modified) (3 diffs)

branches/branch-1-0/src/helpers/debug.c

@@ -1683 +1683 @@
  *@@changed V0.9.3 (2000-04-10) [umoeller]: added support for non-Warp 4 SYM files
  *@@changed V0.9.3 (2000-04-26) [umoeller]: this broke Warp 4 FP 13, fixed
+ *@@changed V1.0.12 (2017-01-15) [rwalsh]: improve handling for Warp 4.5 SYM files
  */
 
@@ -1690 +1691 @@
                         ULONG ulOffset)
 {
-    APIRET arc = 0;
-    // "Source file"... columns
-
-    // first attempt to analyze the debug code
-    arc = dbgPrintDebugInfo(LogFile,
-                            pszModuleName,
-                            ulObject,
-                            ulOffset);
-    // if no debug code is available, analyze
-    // the SYM file instead
-    if (arc != NO_ERROR)
-    {
-        CHAR szSymName[CCHMAXPATH];
-        strcpy(szSymName, pszModuleName);
-        strcpy(szSymName + strlen(szSymName) - 3, "SYM");
-        arc = dbgPrintSYMInfo(LogFile,
-                              szSymName,
-                              ulObject,
-                              ulOffset);
-        if (arc != 0)
-        {
-            // SYM file not found in current directory:
-            // check the SYM files in the \OS2 directory,
-            // depending on the OS/2 version level:
-            CHAR szSymFile2[CCHMAXPATH];
-            PSZ  pszFilename = strrchr(szSymName, '\\');
-            if (pszFilename)
-            {
-                PSZ         pszVersionDir = "WARP4";
-                ULONG       aulBuf[3];
-
-                DosQuerySysInfo(QSV_VERSION_MAJOR,      // 11
-                                QSV_VERSION_MINOR,      // 12
-                                &aulBuf, sizeof(aulBuf));
-                // Warp 3 is reported as 20.30
-                // Warp 4 is reported as 20.40
-                // Aurora is reported as 20.45
-
-                if (aulBuf[0] == 20)
-                {
-                    if (aulBuf[1] == 30)
-                        // Warp 3:
-                        pszVersionDir = "WARP3";
-                    else if (aulBuf[1] >= 40)
-                        // Warp 4 or higher:
-                        // (NOTE: Warp 4 FP 13 now returns 45 also,
-                        // but the SYM files are still in the WARP4 directory...)
-                        // V0.9.3 (2000-04-26) [umoeller]
-                        pszVersionDir = "WARP4";
-                }
-
-                pszFilename++;
-                sprintf(szSymFile2,
-                        "%c:\\OS2\\PDPSI\\PMDF\\%s\\%s",
-                        doshQueryBootDrive(),
-                        pszVersionDir,
-                        pszFilename);
-                arc = dbgPrintSYMInfo(LogFile,
-                                      szSymFile2,
-                                      ulObject,
-                                      ulOffset);
-
-                // V0.9.3 (2000-04-26) [umoeller]
-                if (    (arc != 0)  // still not found
-                     && (aulBuf[1] == 45) // and running Aurora or Warp 4 FP13?
-                   )
-                {
-                    // Warp Server for e-Business (aka Warp 4.5):
-                    // we use the SYM files for the UNI kernel,
-                    // I have found no way to find out whether
-                    // we're running on an SMP kernel
-                    sprintf(szSymFile2,
-                            "%c:\\OS2\\PDPSI\\PMDF\\%s\\%s",
-                            doshQueryBootDrive(),
-                            "WARP45_U",
-                            pszFilename);
-                    arc = dbgPrintSYMInfo(LogFile,
-                                          szSymFile2,
-                                          ulObject,
-                                          ulOffset);
-                }
-            }
-        }
-
-        if (arc == 2)       // file not found
-            fprintf(LogFile,
-                    "Cannot find symbol file %s\n",
-                    szSymName);
-        else if (arc != 0)
-            fprintf(LogFile,
-                    "Error %lu reading symbol file %s\n",
-                    arc,
-                    szSymName);
-    }
+    APIRET  arc = 0;
+    PSZ     pszFilename;
+    PSZ     pszVersionDir;
+    ULONG   aulBuf[3];
+    CHAR    szSymName[CCHMAXPATH];
+    CHAR    szSymPath[CCHMAXPATH];
+
+    // look for .sym in the module's directory
+    strcpy(szSymName, pszModuleName);
+    strcpy(szSymName + strlen(szSymName) - 3, "SYM");
+    if (!dbgPrintSYMInfo(LogFile, szSymName, ulObject, ulOffset))
+        return TRUE;
+
+    pszFilename = strrchr(szSymName, '\\');
+    if (!pszFilename)
+    {
+        fprintf(LogFile, "Cannot find symbol file for %s\n", pszModuleName);
+        return FALSE;
+    }
+    pszFilename++;
+
+    // check the SYM files in the \OS2 directory,
+    // depending on the OS/2 version level:
+    DosQuerySysInfo(QSV_VERSION_MAJOR, QSV_VERSION_MINOR,
+                    &aulBuf, sizeof(aulBuf));
+
+    // Warp 3 is reported as 20.30
+    // Warp 4 is reported as 20.40
+    // WSEB   is reported as 20.45
+    // (NOTE: Warp 4 FP 13 now returns 45 also,
+    // but the SYM files are still in the WARP4 directory)
+
+    // try the directories used by the "real" Warp 4.5 first
+    if (aulBuf[1] == 45)
+    {
+        sprintf(szSymPath, "%c:\\OS2\\PDPSI\\PMDF\\%s\\%s",
+                doshQueryBootDrive(), "WARP45", pszFilename);
+        if (!dbgPrintSYMInfo(LogFile, szSymPath, ulObject, ulOffset))
+            return TRUE;
+
+        // use the nbr of processors to decide which directory to search
+        if (DosQuerySysInfo(QSV_NUMPROCESSORS, QSV_NUMPROCESSORS,
+                            &aulBuf[2], sizeof(aulBuf[2]))
+            || aulBuf[2] == 1)
+            pszVersionDir = "WARP45_U";
+        else
+            pszVersionDir = "WARP45_S";
+
+        sprintf(szSymPath, "%c:\\OS2\\PDPSI\\PMDF\\%s\\%s",
+                doshQueryBootDrive(), pszVersionDir, pszFilename);
+        if (!dbgPrintSYMInfo(LogFile, szSymPath, ulObject, ulOffset))
+            return TRUE;
+    }
+
+    // deal with Warp 3 and Warp4 pre- and post-FP13
+    if (aulBuf[1] == 30)
+        pszVersionDir = "WARP3";
+    else
+        pszVersionDir = "WARP4";
+
+    sprintf(szSymPath, "%c:\\OS2\\PDPSI\\PMDF\\%s\\%s",
+            doshQueryBootDrive(), pszVersionDir, pszFilename);
+    arc = dbgPrintSYMInfo(LogFile, szSymPath, ulObject, ulOffset);
+
+    if (arc == 2)
+        fprintf(LogFile, "Cannot find symbol file %s\n",
+                szSymName);
+    else if (arc != 0)
+        fprintf(LogFile, "Error %lu reading symbol file %s\n",
+                arc, szSymName);
 
     return (arc == NO_ERROR);
@@ -1994 +1971 @@
                     if (strlen(Name) > 3)
                     {
-                        dbgPrintStackFrame(LogFile,
-                                           Name,
-                                           ObjNum,
-                                           Offset);
+                        // look for embedded debug info;
+                        // if that fails, look for a .sym file
+                        if (dbgPrintDebugInfo(LogFile,
+                                              Name,
+                                              ObjNum,
+                                              Offset))
+                            dbgPrintStackFrame(LogFile,
+                                               Name,
+                                               ObjNum,
+                                               Offset);
                     }
                 }