Changeset 453 for branches/branch-1-0/src/helpers/except.c

Timestamp:

Jun 23, 2023, 11:24:37 PM (2 years ago)

Author:

rlwalsh

Message:

except.c: make trap logs less verbose/pedantic; minor formatting changes

File:

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

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

@@ -468 +468 @@
                 ulOffset = -1;
     ULONG       ul;
-
     ULONG       ulOldPriority = 0x0100; // regular, delta 0
+    PSZ         pszExp = "\nExplanation:         %s\n                     %s\n";
 
     // raise global flag for whether this func is running
@@ -528 +528 @@
             pcszVersion);
 
-
-    // generic exception info
-    fprintf(file,
-            "\n%s:\n    Exception type: %08lX\n    Address:        %08lX\n    Params:         ",
-            pszHandlerName,
-            pReportRec->ExceptionNum,
-            (ULONG)pReportRec->ExceptionAddress);
-    for (ul = 0;  ul < pReportRec->cParameters;  ul++)
-    {
-        fprintf(file, "%08lX  ",
-                pReportRec->ExceptionInfo[ul]);
-    }
 
     // now explain the exception in a bit more detail;
@@ -565 +553 @@
                         pContextRec->ctx_SegDs,
                         pReportRec->ExceptionInfo[1]);
-            fprintf(file,
-                    "Explanation: An attempt was made to access a memory object which does\n"
-                    "             not belong to the current process. Most probable causes\n"
-                    "             for this are that an invalid pointer was used, there was\n"
-                    "             confusion with administering memory or error conditions \n"
-                    "             were not properly checked for.\n");
+            fprintf(file, pszExp,
+                    "An attempt was made to access a memory object which does",
+                    "not belong to the current process.");
         break;
 
         case XCPT_INTEGER_DIVIDE_BY_ZERO:
             fprintf(file, "\nXCPT_INTEGER_DIVIDE_BY_ZERO.\n");
-            fprintf(file,
-                    "Explanation: An attempt was made to divide an integer value by zero,\n"
-                    "             which is not defined.\n");
+            fprintf(file, pszExp,
+                    "An attempt was made to divide an integer value by zero,"
+                    "which is not defined.");
         break;
 
         case XCPT_ILLEGAL_INSTRUCTION:
             fprintf(file, "\nXCPT_ILLEGAL_INSTRUCTION.\n");
-            fprintf(file,
-                    "Explanation: An attempt was made to execute an instruction that\n"
-                    "             is not defined on this machine's architecture.\n");
+            fprintf(file, pszExp,
+                    "An attempt was made to execute an instruction that",
+                    "is not defined on this machine's architecture.");
         break;
 
         case XCPT_PRIVILEGED_INSTRUCTION:
             fprintf(file, "\nXCPT_PRIVILEGED_INSTRUCTION.\n");
-            fprintf(file,
-                    "Explanation: An attempt was made to execute an instruction that\n"
-                    "             is not permitted in the current machine mode or that\n"
-                    "             the program had no permission to execute.\n");
+            fprintf(file, pszExp,
+                    "An attempt was made to execute an instruction that",
+                    "the program does not have permission to use.");
         break;
 
         case XCPT_INTEGER_OVERFLOW:
             fprintf(file, "\nXCPT_INTEGER_OVERFLOW.\n");
-            fprintf(file,
-                    "Explanation: An integer operation generated a carry-out of the most\n"
-                    "             significant bit. This is a sign of an attempt to store\n"
-                    "             a value which does not fit into an integer variable.\n");
+            fprintf(file, pszExp,
+                    "An integer operation generated a carry out of the most"
+                    "significant bit.");
         break;
 
         default:
             fprintf(file, "\nUnknown OS/2 exception number %d.\n", pReportRec->ExceptionNum);
-            fprintf(file, "Look this up in the OS/2 header files.\n");
         break;
     }
+
+    // generic exception info
+    fprintf(file,
+            "\n%s:\n    Exception type:  %08lX\n    Address:         %08lX\n    Params:          ",
+            pszHandlerName,
+            pReportRec->ExceptionNum,
+            (ULONG)pReportRec->ExceptionAddress);
+    for (ul = 0;  ul < pReportRec->cParameters;  ul++)
+    {
+        fprintf(file, "%08lX  ",
+                pReportRec->ExceptionInfo[ul]);
+    }
+    fputs("\n", file);
+
 
     // V0.9.16 (2001-11-02) [pr]: We already got this info. above - this overwrites the