Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-23 02:56:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Hermès Bélusca-Maïto 2021-11-25 21:12:48 +01:00
parent b849a696ef
commit 695900f51f
No known key found for this signature in database
GPG key ID: 3B2539C65E7B93D0
2 changed files with 18 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
subsystems/mvdm/ntvdm/bios/bios32/bios32.c
View file

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

14
subsystems/mvdm/ntvdm/dos/dos32krnl/process.c
View file

@ -87,6 +87,7 @@ static inline VOID DosSaveState(VOID)
PDOS_REGISTER_STATE State; PDOS_REGISTER_STATE State;
WORD StackPointer = getSP(); WORD StackPointer = getSP();
#ifdef ADVANCED_DEBUGGING
DPRINT1("\n" DPRINT1("\n"
"DosSaveState(before) -- SS:SP == %04X:%04X\n" "DosSaveState(before) -- SS:SP == %04X:%04X\n"
"Original CPU State =\n" "Original CPU State =\n"
@ -96,6 +97,7 @@ static inline VOID DosSaveState(VOID)
getSS(), getSP(), getSS(), getSP(),
getDS(), getES(), getAX(), getCX(), getDS(), getES(), getAX(), getCX(),
getDX(), getBX(), getBP(), getSI(), getDI()); getDX(), getBX(), getBP(), getSI(), getDI());
#endif
/* /*
* Allocate stack space for the registers. Note that we * Allocate stack space for the registers. Note that we
@ -116,6 +118,7 @@ static inline VOID DosSaveState(VOID)
State->SI = getSI(); State->SI = getSI();
State->DI = getDI(); State->DI = getDI();
#ifdef ADVANCED_DEBUGGING
DPRINT1("\n" DPRINT1("\n"
"DosSaveState(after) -- SS:SP == %04X:%04X\n" "DosSaveState(after) -- SS:SP == %04X:%04X\n"
"Saved State =\n" "Saved State =\n"
@ -125,6 +128,7 @@ static inline VOID DosSaveState(VOID)
getSS(), getSP(), getSS(), getSP(),
State->DS, State->ES, State->AX, State->CX, State->DS, State->ES, State->AX, State->CX,
State->DX, State->BX, State->BP, State->SI, State->DI); State->DX, State->BX, State->BP, State->SI, State->DI);
#endif
} }
static inline VOID DosRestoreState(VOID) static inline VOID DosRestoreState(VOID)
@ -137,6 +141,7 @@ static inline VOID DosRestoreState(VOID)
*/ */
State = SEG_OFF_TO_PTR(getSS(), getSP()); State = SEG_OFF_TO_PTR(getSS(), getSP());
#ifdef ADVANCED_DEBUGGING
DPRINT1("\n" DPRINT1("\n"
"DosRestoreState(before) -- SS:SP == %04X:%04X\n" "DosRestoreState(before) -- SS:SP == %04X:%04X\n"
"Saved State =\n" "Saved State =\n"
@ -146,6 +151,7 @@ static inline VOID DosRestoreState(VOID)
getSS(), getSP(), getSS(), getSP(),
State->DS, State->ES, State->AX, State->CX, State->DS, State->ES, State->AX, State->CX,
State->DX, State->BX, State->BP, State->SI, State->DI); State->DX, State->BX, State->BP, State->SI, State->DI);
#endif
setSP(getSP() + sizeof(DOS_REGISTER_STATE) - sizeof(WORD)); setSP(getSP() + sizeof(DOS_REGISTER_STATE) - sizeof(WORD));
@ -160,6 +166,7 @@ static inline VOID DosRestoreState(VOID)
setSI(State->SI); setSI(State->SI);
setDI(State->DI); setDI(State->DI);
#ifdef ADVANCED_DEBUGGING
DPRINT1("\n" DPRINT1("\n"
"DosRestoreState(after) -- SS:SP == %04X:%04X\n" "DosRestoreState(after) -- SS:SP == %04X:%04X\n"
"Restored CPU State =\n" "Restored CPU State =\n"
@ -169,6 +176,7 @@ static inline VOID DosRestoreState(VOID)
getSS(), getSP(), getSS(), getSP(),
getDS(), getES(), getAX(), getCX(), getDS(), getES(), getAX(), getCX(),
getDX(), getBX(), getBP(), getSI(), getDI()); getDX(), getBX(), getBP(), getSI(), getDI());
#endif
} }
static WORD DosCopyEnvironmentBlock(IN LPCSTR Environment OPTIONAL, static WORD DosCopyEnvironmentBlock(IN LPCSTR Environment OPTIONAL,
@ -633,8 +641,10 @@ DWORD DosLoadExecutableInternal(IN DOS_EXEC_TYPE LoadType,
/* Push the task state */ /* Push the task state */
DosSaveState(); DosSaveState();
#ifdef ADVANCED_DEBUGGING
DPRINT1("Sda->CurrentPsp = 0x%04x; Old LastStack = 0x%08x, New LastStack = 0x%08x\n", 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())); Sda->CurrentPsp, SEGMENT_TO_PSP(Sda->CurrentPsp)->LastStack, MAKELONG(getSP(), getSS()));
#endif
/* Update the last stack in the PSP */ /* Update the last stack in the PSP */
SEGMENT_TO_PSP(Sda->CurrentPsp)->LastStack = MAKELONG(getSP(), getSS()); SEGMENT_TO_PSP(Sda->CurrentPsp)->LastStack = MAKELONG(getSP(), getSS());
@ -996,13 +1006,17 @@ Done:
TerminationType = (KeepResident != 0 ? 0x03 : 0x00); TerminationType = (KeepResident != 0 ? 0x03 : 0x00);
Sda->ErrorLevel = MAKEWORD(ReturnCode, TerminationType); Sda->ErrorLevel = MAKEWORD(ReturnCode, TerminationType);
#ifdef ADVANCED_DEBUGGING
DPRINT1("PspBlock->ParentPsp = 0x%04x; Sda->CurrentPsp = 0x%04x\n", DPRINT1("PspBlock->ParentPsp = 0x%04x; Sda->CurrentPsp = 0x%04x\n",
PspBlock->ParentPsp, Sda->CurrentPsp); PspBlock->ParentPsp, Sda->CurrentPsp);
#endif
if (Sda->CurrentPsp != SYSTEM_PSP) 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", 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); Sda->CurrentPsp, getSS(), getSP(), SEGMENT_TO_PSP(Sda->CurrentPsp)->LastStack);
#endif
/* Restore the parent's stack */ /* Restore the parent's stack */
setSS(HIWORD(SEGMENT_TO_PSP(Sda->CurrentPsp)->LastStack)); setSS(HIWORD(SEGMENT_TO_PSP(Sda->CurrentPsp)->LastStack));