From a73afd79191112fa74afaef85f2585fcf75fbab3 Mon Sep 17 00:00:00 2001 From: Stefan Ginsberg Date: Sat, 26 Sep 2015 10:12:53 +0000 Subject: [PATCH] [KE] Misc trap/interrupt fixes: - Stub legacy KiGetTickCountHandler (INT 2A) to fail instead of breakpointing. We have made it so far without it, and if someone finds something that actually uses this instead of Win32's GetTickCount we can add it then. Raises the bar of making ReactOS breakpoint from 2 bytes to 4. - Bugcheck with the right status code in case Kei386EoiHelper is called (which means you are trying to load a Windows HAL which we totally do not support right now). - Use Ke* instead of Kf* in C code for IRQL routines. svn path=/trunk/; revision=69362 --- reactos/ntoskrnl/ke/i386/irqobj.c | 5 +++-- reactos/ntoskrnl/ke/i386/kiinit.c | 25 +++++++++++++++---------- reactos/ntoskrnl/ke/i386/traphdlr.c | 22 ++++++++++++++++------ 3 files changed, 34 insertions(+), 18 deletions(-) diff --git a/reactos/ntoskrnl/ke/i386/irqobj.c b/reactos/ntoskrnl/ke/i386/irqobj.c index 49025d6e5a4..a9483f18caa 100644 --- a/reactos/ntoskrnl/ke/i386/irqobj.c +++ b/reactos/ntoskrnl/ke/i386/irqobj.c @@ -587,7 +587,8 @@ KeSynchronizeExecution(IN OUT PKINTERRUPT Interrupt, KIRQL OldIrql; /* Raise IRQL */ - OldIrql = KfRaiseIrql(Interrupt->SynchronizeIrql); + KeRaiseIrql(Interrupt->SynchronizeIrql, + &OldIrql); /* Acquire interrupt spinlock */ KeAcquireSpinLockAtDpcLevel(Interrupt->ActualLock); @@ -599,7 +600,7 @@ KeSynchronizeExecution(IN OUT PKINTERRUPT Interrupt, KeReleaseSpinLockFromDpcLevel(Interrupt->ActualLock); /* Lower IRQL */ - KfLowerIrql(OldIrql); + KeLowerIrql(OldIrql); /* Return status */ return Success; diff --git a/reactos/ntoskrnl/ke/i386/kiinit.c b/reactos/ntoskrnl/ke/i386/kiinit.c index fe8c4a51157..5f192cc7ca4 100644 --- a/reactos/ntoskrnl/ke/i386/kiinit.c +++ b/reactos/ntoskrnl/ke/i386/kiinit.c @@ -31,9 +31,9 @@ ULONGLONG BootCycles, BootCyclesEnd; /* FUNCTIONS *****************************************************************/ +INIT_SECTION VOID NTAPI -INIT_FUNCTION KiInitMachineDependent(VOID) { ULONG CpuCount; @@ -324,9 +324,9 @@ KiInitMachineDependent(VOID) KiSetCR0Bits(); } +INIT_SECTION VOID NTAPI -INIT_FUNCTION KiInitializePcr(IN ULONG ProcessorNumber, IN PKIPCR Pcr, IN PKIDTENTRY Idt, @@ -386,9 +386,9 @@ KiInitializePcr(IN ULONG ProcessorNumber, Pcr->PrcbData.MultiThreadProcessorSet = Pcr->PrcbData.SetMember; } +INIT_SECTION VOID NTAPI -INIT_FUNCTION KiInitializeKernel(IN PKPROCESS InitProcess, IN PKTHREAD InitThread, IN PVOID IdleStack, @@ -401,6 +401,7 @@ KiInitializeKernel(IN PKPROCESS InitProcess, ULONG PageDirectory[2]; PVOID DpcStack; ULONG Vendor[3]; + KIRQL DummyIrql; /* Detect and set the CPU Type */ KiSetProcessorType(); @@ -593,7 +594,8 @@ KiInitializeKernel(IN PKPROCESS InitProcess, } /* Raise to Dispatch */ - KfRaiseIrql(DISPATCH_LEVEL); + KeRaiseIrql(DISPATCH_LEVEL, + &DummyIrql); /* Set the Idle Priority to 0. This will jump into Phase 1 */ KeSetPriorityThread(InitThread, 0); @@ -604,13 +606,14 @@ KiInitializeKernel(IN PKPROCESS InitProcess, KiReleasePrcbLock(Prcb); /* Raise back to HIGH_LEVEL and clear the PRCB for the loader block */ - KfRaiseIrql(HIGH_LEVEL); + KeRaiseIrql(HIGH_LEVEL, + &DummyIrql); LoaderBlock->Prcb = 0; } +INIT_SECTION VOID FASTCALL -INIT_FUNCTION KiGetMachineBootPointers(IN PKGDTENTRY *Gdt, IN PKIDTENTRY *Idt, IN PKIPCR *Pcr, @@ -649,9 +652,9 @@ KiGetMachineBootPointers(IN PKGDTENTRY *Gdt, TssSelector.HighWord.Bytes.BaseHi << 24); } +INIT_SECTION VOID NTAPI -INIT_FUNCTION KiSystemStartupBootStack(VOID) { PKTHREAD Thread; @@ -670,7 +673,7 @@ KiSystemStartupBootStack(VOID) /* Force interrupts enabled and lower IRQL back to DISPATCH_LEVEL */ _enable(); - KfLowerIrql(DISPATCH_LEVEL); + KeLowerIrql(DISPATCH_LEVEL); /* Set the right wait IRQL */ Thread->WaitIrql = DISPATCH_LEVEL; @@ -701,9 +704,9 @@ KiMarkPageAsReadOnly( __invlpg(Address); } +INIT_SECTION VOID NTAPI -INIT_FUNCTION KiSystemStartup(IN PLOADER_PARAMETER_BLOCK LoaderBlock) { ULONG Cpu; @@ -714,6 +717,7 @@ KiSystemStartup(IN PLOADER_PARAMETER_BLOCK LoaderBlock) KIDTENTRY NmiEntry, DoubleFaultEntry; PKTSS Tss; PKIPCR Pcr; + KIRQL DummyIrql; /* Boot cycles timestamp */ BootCycles = __rdtsc(); @@ -825,7 +829,8 @@ AppCpuInit: } /* Raise to HIGH_LEVEL */ - KfRaiseIrql(HIGH_LEVEL); + KeRaiseIrql(HIGH_LEVEL, + &DummyIrql); /* Switch to new kernel stack and start kernel bootstrapping */ KiSwitchToBootStack(InitialStack & ~3); diff --git a/reactos/ntoskrnl/ke/i386/traphdlr.c b/reactos/ntoskrnl/ke/i386/traphdlr.c index f4aa89f21ba..e6e4452b333 100644 --- a/reactos/ntoskrnl/ke/i386/traphdlr.c +++ b/reactos/ntoskrnl/ke/i386/traphdlr.c @@ -683,7 +683,7 @@ KiTrap06Handler(IN PKTRAP_FRAME TrapFrame) } /* Go to APC level */ - OldIrql = KfRaiseIrql(APC_LEVEL); + KeRaiseIrql(APC_LEVEL, &OldIrql); _enable(); /* Check for BOP */ @@ -694,7 +694,7 @@ KiTrap06Handler(IN PKTRAP_FRAME TrapFrame) } /* Bring IRQL back */ - KfLowerIrql(OldIrql); + KeLowerIrql(OldIrql); _disable(); /* Do a quick V86 exit if possible */ @@ -938,7 +938,7 @@ KiTrap0DHandler(IN PKTRAP_FRAME TrapFrame) } /* Go to APC level */ - OldIrql = KfRaiseIrql(APC_LEVEL); + KeRaiseIrql(APC_LEVEL, &OldIrql); _enable(); /* Handle the V86 opcode */ @@ -949,7 +949,7 @@ KiTrap0DHandler(IN PKTRAP_FRAME TrapFrame) } /* Bring IRQL back */ - KfLowerIrql(OldIrql); + KeLowerIrql(OldIrql); _disable(); /* Do a quick V86 exit if possible */ @@ -1522,7 +1522,17 @@ VOID FASTCALL KiGetTickCountHandler(IN PKTRAP_FRAME TrapFrame) { - UNIMPLEMENTED_DBGBREAK(); + /* Save trap frame */ + KiEnterTrap(TrapFrame); + + /* + * Just fail the request + */ + DbgPrint("INT 0x2A attempted, returning 0 tick count\n"); + TrapFrame->Eax = 0; + + /* Exit the trap */ + KiEoiHelper(TrapFrame); } VOID @@ -1756,7 +1766,7 @@ NTAPI Kei386EoiHelper(VOID) { /* We should never see this call happening */ - ERROR_FATAL("Mismatched NT/HAL version"); + KeBugCheck(MISMATCHED_HAL); } /* EOF */