[reactos] 03/08: [NTVDM] Silence noisy DPRINTs when starting processes; they can be re-enabled by recompiling in "advanced debugging" mode.

[Hermès Bélusca-Maïto]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=695900f51fe8ae1050e65b...

commit 695900f51fe8ae1050e65bd715c54762e8943d2d
Author:     Hermès Bélusca-Maïto [e-mail]
AuthorDate: Thu Nov 25 21:12:48 2021 +0100
Commit:     Hermès Bélusca-Maïto [e-mail]
CommitDate: Sun Nov 28 00:26:43 2021 +0100

[NTVDM] Silence noisy DPRINTs when starting processes; they can be re-enabled by recompiling in "advanced debugging" mode.
---
 subsystems/mvdm/ntvdm/bios/bios32/bios32.c    |  4 ++++
 subsystems/mvdm/ntvdm/dos/dos32krnl/process.c | 14 ++++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/subsystems/mvdm/ntvdm/bios/bios32/bios32.c b/subsystems/mvdm/ntvdm/bios/bios32/bios32.c
index cd37bd0a877..95b2a31f0cf 100644
--- a/subsystems/mvdm/ntvdm/bios/bios32/bios32.c
+++ b/subsystems/mvdm/ntvdm/bios/bios32/bios32.c
@@ -624,7 +624,9 @@ Retry:
             setBX(0x7C00);
             BiosDiskService(Stack);
             if (!(Stack[STACK_FLAGS] & EMULATOR_FLAG_CF)) goto Quit;
+#ifdef ADVANCED_DEBUGGING
             DPRINT1("An error happened while loading the bootsector from floppy 0, error = %d\n", getAH());
+#endif

break;
         }
@@ -642,7 +644,9 @@ Retry:
             setBX(0x7C00);
             BiosDiskService(Stack);
             if (!(Stack[STACK_FLAGS] & EMULATOR_FLAG_CF)) goto Quit;
+#ifdef ADVANCED_DEBUGGING
             DPRINT1("An error happened while loading the bootsector from HDD 0, error = %d\n", getAH());
+#endif

break;
         }
diff --git a/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c b/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c
index aa5680dc237..b12bd60ee22 100644
--- a/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c
+++ b/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c
@@ -87,6 +87,7 @@ static inline VOID DosSaveState(VOID)
     PDOS_REGISTER_STATE State;
     WORD StackPointer = getSP();

+#ifdef ADVANCED_DEBUGGING
     DPRINT1("\n"
             "DosSaveState(before) -- SS:SP == %04X:%04X\n"
             "Original CPU State =\n"
@@ -96,6 +97,7 @@ static inline VOID DosSaveState(VOID)
             getSS(), getSP(),
             getDS(), getES(), getAX(), getCX(),
             getDX(), getBX(), getBP(), getSI(), getDI());
+#endif

/*
      * Allocate stack space for the registers. Note that we
@@ -116,6 +118,7 @@ static inline VOID DosSaveState(VOID)
     State->SI = getSI();
     State->DI = getDI();

+#ifdef ADVANCED_DEBUGGING
     DPRINT1("\n"
             "DosSaveState(after) -- SS:SP == %04X:%04X\n"
             "Saved State =\n"
@@ -125,6 +128,7 @@ static inline VOID DosSaveState(VOID)
             getSS(), getSP(),
             State->DS, State->ES, State->AX, State->CX,
             State->DX, State->BX, State->BP, State->SI, State->DI);
+#endif
 }

static inline VOID DosRestoreState(VOID)
@@ -137,6 +141,7 @@ static inline VOID DosRestoreState(VOID)
      */
     State = SEG_OFF_TO_PTR(getSS(), getSP());

+#ifdef ADVANCED_DEBUGGING
     DPRINT1("\n"
             "DosRestoreState(before) -- SS:SP == %04X:%04X\n"
             "Saved State =\n"
@@ -146,6 +151,7 @@ static inline VOID DosRestoreState(VOID)
             getSS(), getSP(),
             State->DS, State->ES, State->AX, State->CX,
             State->DX, State->BX, State->BP, State->SI, State->DI);
+#endif

setSP(getSP() + sizeof(DOS_REGISTER_STATE) - sizeof(WORD));

@@ -160,6 +166,7 @@ static inline VOID DosRestoreState(VOID)
     setSI(State->SI);
     setDI(State->DI);

+#ifdef ADVANCED_DEBUGGING
     DPRINT1("\n"
             "DosRestoreState(after) -- SS:SP == %04X:%04X\n"
             "Restored CPU State =\n"
@@ -169,6 +176,7 @@ static inline VOID DosRestoreState(VOID)
             getSS(), getSP(),
             getDS(), getES(), getAX(), getCX(),
             getDX(), getBX(), getBP(), getSI(), getDI());
+#endif
 }

static WORD DosCopyEnvironmentBlock(IN LPCSTR Environment OPTIONAL,
@@ -633,8 +641,10 @@ DWORD DosLoadExecutableInternal(IN DOS_EXEC_TYPE LoadType,
             /* Push the task state */
             DosSaveState();

+#ifdef ADVANCED_DEBUGGING
             DPRINT1("Sda->CurrentPsp = 0x%04x; Old LastStack = 0x%08x, New LastStack = 0x%08x\n",
                    Sda->CurrentPsp, SEGMENT_TO_PSP(Sda->CurrentPsp)->LastStack, MAKELONG(getSP(), getSS()));
+#endif

/* Update the last stack in the PSP */
             SEGMENT_TO_PSP(Sda->CurrentPsp)->LastStack = MAKELONG(getSP(), getSS());
@@ -996,13 +1006,17 @@ Done:
     TerminationType = (KeepResident != 0 ? 0x03 : 0x00);
     Sda->ErrorLevel = MAKEWORD(ReturnCode, TerminationType);

+#ifdef ADVANCED_DEBUGGING
     DPRINT1("PspBlock->ParentPsp = 0x%04x; Sda->CurrentPsp = 0x%04x\n",
            PspBlock->ParentPsp, Sda->CurrentPsp);
+#endif

if (Sda->CurrentPsp != SYSTEM_PSP)
     {
+#ifdef ADVANCED_DEBUGGING
         DPRINT1("Sda->CurrentPsp = 0x%04x; Old SS:SP = %04X:%04X going to be LastStack = 0x%08x\n",
                Sda->CurrentPsp, getSS(), getSP(), SEGMENT_TO_PSP(Sda->CurrentPsp)->LastStack);
+#endif

/* Restore the parent's stack */
         setSS(HIWORD(SEGMENT_TO_PSP(Sda->CurrentPsp)->LastStack));