Changeset 22005 for trunk/src/kernel32/dbglog.cpp

Timestamp:

Jul 12, 2012, 5:02:50 PM (13 years ago)

Author:

dmik

Message:

kernel32: Improve logging (showing current FS mode).

File:

• trunk/src/kernel32/dbglog.cpp (modified) (9 diffs)

trunk/src/kernel32/dbglog.cpp

@@ -457 +457 @@
                         " /--------------------- Thread ID\n"
                         " |   /----------------- Call Depth\n"
-                        " |   |  /-------------- Flags (O = OS/2 mode (FS=150B))\n"
+                        " |   |  /-------------- Flags (O: OS/2 FS (150B), W: Win32 FS, o/w: no switch)\n"
                         " |   |  |      /------- Current Time\n"
                         "--- --- - ------------\n");
@@ -465 +465 @@
                         " /------------ Thread ID\n"
                         " |   /-------- Call Depth\n"
-                        " |   |  /----- Flags (O = OS/2 mode (FS=150B))\n"
+                        " |   |  /----- Flags (O: OS/2 FS (150B), W: Win32 FS, o/w: no switch)\n"
                         " |   |  |  /-- FPU Control Register\n"
                         "--- --- - ---\n");
@@ -472 +472 @@
                         " /-------- Thread ID\n"
                         " |   /---- Call Depth\n"
-                        " |   |  /- Flags (O = OS/2 mode (FS=150B))\n"
+                        " |   |  /- Flags (O: OS/2 FS (150B), W: Win32 FS, o/w: no switch)\n"
                         "--- --- -\n");
 #endif
@@ -500 +500 @@
                         LOWORD(teb->o.odin.threadId),
                         ulCallDepth,
-                        (sel == 0x150b && fSwitchTIBSel) ? 'O' : '-',
+                        fSwitchTIBSel ? (sel == 0x150b ? 'O' : 'W') :
+                                        (sel == 0x150b ? 'o' : 'w'),
                         h, m, s, ms);
 #else
@@ -508 +509 @@
                         LOWORD(teb->o.odin.threadId),
                         ulCallDepth,
-                        (sel == 0x150b && fSwitchTIBSel) ? 'O' : '-',
+                        fSwitchTIBSel ? (sel == 0x150b ? 'O' : 'W') :
+                                        (sel == 0x150b ? 'o' : 'w'),
                         CONTROL87(0,0));
 #else
@@ -515 +517 @@
                         LOWORD(teb->o.odin.threadId),
                         ulCallDepth,
-                        (sel == 0x150b && fSwitchTIBSel) ? 'O' : '-');
+                        fSwitchTIBSel ? (sel == 0x150b ? 'O' : 'W') :
+                                        (sel == 0x150b ? 'o' : 'w'));
 #endif
 #endif
@@ -523 +526 @@
 #ifdef LOG_TIME
                 fprintf(flog,
-                        "t-- --- O %02d:%02d:%02d.%03d: ",
+                        "t-- --- - %02d:%02d:%02d.%03d: ",
                         h, m, s, ms);
 #else
 #ifdef SHOW_FPU_CONTROLREG
                 fprintf(flog,
-                        "t-- --- O ---: ");
+                        "t-- --- - ---: ");
 #else
                 fprintf(flog,
-                        "t-- --- O: ");
+                        "t-- --- -: ");
 #endif
 #endif
@@ -559 +562 @@
                         ulCallDepth,
                         h, m, s, ms,
-                        (sel == 0x150b && fSwitchTIBSel) ? 'O' : '.');
+                        fSwitchTIBSel ? (sel == 0x150b ? 'O' : 'W') :
+                                        (sel == 0x150b ? 'o' : 'w'));
 #else
                 sprintf(logbuffer,
@@ -565 +569 @@
                         LOWORD(teb->o.odin.threadId),
                         ulCallDepth,
-                        (sel == 0x150b && fSwitchTIBSel) ? 'O' : '.');
+                        fSwitchTIBSel ? (sel == 0x150b ? 'O' : 'W') :
+                                        (sel == 0x150b ? 'o' : 'w'));
 #endif
                 prefixlen = strlen(logbuffer);