Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cgutman] 45283: - Handle the case where a socket sends an event notification without being accepted first
by cgutman＠svn.reactos.org 27 Jan '10

27 Jan '10

Author: cgutman Date: Wed Jan 27 08:44:42 2010 New Revision: 45283 URL: http://svn.reactos.org/svn/reactos?rev=45283&view=rev Log: - Handle the case where a socket sends an event notification without being accepted first Modified: branches/aicom-network-branch/lib/drivers/ip/transport/tcp/event.c Modified: branches/aicom-network-branch/lib/drivers/ip/transport/tcp/event.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/lib/driver… ============================================================================== --- branches/aicom-network-branch/lib/drivers/ip/transport/tcp/event.c [iso-8859-1] (original) +++ branches/aicom-network-branch/lib/drivers/ip/transport/tcp/event.c [iso-8859-1] Wed Jan 27 08:44:42 2010 @@ -24,7 +24,14 @@ NewState & SEL_ACCEPT ? 'A' : 'a', NewState & SEL_WRITE ? 'W' : 'w')); - ASSERT(Connection); + /* If this socket is missing its socket context, that means that it + * has been created as a new connection in sonewconn but not accepted + * yet. We can safely ignore event notifications on these sockets. + * Once they are accepted, they will get a socket context and we will + * be able to process them. + */ + if (!Connection) + return 0; TI_DbgPrint(DEBUG_TCP,("Called: NewState %x (Conn %x) (Change %x)\n", NewState, Connection,

1 0

[sir_richard] 45282: [NTOS/PERF]: Enable VME support. VME stands for Virtual 8086 Mode Extensions, and it's an Intel optimization that makes changes to the IF bit in EFLAGS (CLI, STI, INT, IRETD, PUSHF, POPF) completely transprent: instead of changing the real (protected) bit, which requires the OS to trap and emulate the behavior, the CPU sets a "Fake" IF bit instead. When you're dong in V8086 mode, you simply update your real flag with whatever the fake flag says. [NTOS]: Enable V8086 Fast-V86
by sir_richard＠svn.reactos.org 27 Jan '10

27 Jan '10

Author: sir_richard Date: Wed Jan 27 06:34:38 2010 New Revision: 45282 URL: http://svn.reactos.org/svn/reactos?rev=45282&view=rev Log: [NTOS/PERF]: Enable VME support. VME stands for Virtual 8086 Mode Extensions, and it's an Intel optimization that makes changes to the IF bit in EFLAGS (CLI, STI, INT, IRETD, PUSHF, POPF) completely transprent: instead of changing the real (protected) bit, which requires the OS to trap and emulate the behavior, the CPU sets a "Fake" IF bit instead. When you're dong in V8086 mode, you simply update your real flag with whatever the fake flag says. [NTOS]: Enable V8086 Fast-V86 Trap mode for Trap 6 (Invalid Opcode). Because we are now taking zero traps during V8086 mode, we can't do the "BOP lookahead", so the only trap we do get is when we hit the BOP/invalid opcode itself. [NTOS]: Multiple fixes to V8086 opcode emulation code that I noticed while looking through the source. Also multiple fixes to VDM code. This change will only impact real hardware and VMWare, since QEMU does not support VME. On VMWare, performance increased up to 400% during bootup (80 million cycles instead of 300 million, in one test). Modified: trunk/reactos/ntoskrnl/ke/i386/traphdlr.c trunk/reactos/ntoskrnl/ke/i386/v86vdm.c trunk/reactos/ntoskrnl/vdm/vdmexec.c trunk/reactos/ntoskrnl/vdm/vdmmain.c Modified: trunk/reactos/ntoskrnl/ke/i386/traphdlr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/traphdlr.… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] Wed Jan 27 06:34:38 2010 @@ -533,16 +533,56 @@ VOID FASTCALL DECLSPEC_NORETURN -KiTrap06Handler(IN PKTRAP_FRAME TrapFrame) +KiTrap06Handler(IN PKTRAP_FRAME TrapFrame, + IN ULONG EFlags) { PUCHAR Instruction; ULONG i; - - /* Save trap frame */ - KiEnterTrap(TrapFrame); - - /* Check for VDM trap */ - ASSERT((KiVdmTrap(TrapFrame)) == FALSE); + KIRQL OldIrql; + + /* Check for V86 GPF */ + if (__builtin_expect(EFlags & EFLAGS_V86_MASK, 1)) + { + /* Enter V86 trap */ + KiEnterV86Trap(TrapFrame); + + /* Must be a VDM process */ + if (__builtin_expect(!PsGetCurrentProcess()->VdmObjects, 0)) + { + /* Enable interrupts */ + _enable(); + + /* Setup illegal instruction fault */ + KiDispatchException0Args(STATUS_ILLEGAL_INSTRUCTION, + TrapFrame->Eip, + TrapFrame); + } + + /* Go to APC level */ + OldIrql = KfRaiseIrql(APC_LEVEL); + _enable(); + + /* Check for BOP */ + if (!VdmDispatchBop(TrapFrame)) + { + /* Should only happen in VDM mode */ + UNIMPLEMENTED; + while (TRUE); + } + + /* Bring IRQL back */ + KfLowerIrql(OldIrql); + _disable(); + + /* Do a quick V86 exit if possible */ + if (__builtin_expect(TrapFrame->EFlags & EFLAGS_V86_MASK, 1)) KiExitV86Trap(TrapFrame); + + /* Exit trap the slow way */ + KiEoiHelper(TrapFrame); + } + + /* Save trap frame */ + KiEnterTrap(TrapFrame); /* Enable interrupts */ Instruction = (PUCHAR)TrapFrame->Eip; @@ -1557,7 +1597,7 @@ KiTrap(KiTrap03, KI_PUSH_FAKE_ERROR_CODE); KiTrap(KiTrap04, KI_PUSH_FAKE_ERROR_CODE); KiTrap(KiTrap05, KI_PUSH_FAKE_ERROR_CODE); -KiTrap(KiTrap06, KI_PUSH_FAKE_ERROR_CODE); +KiTrap(KiTrap06, KI_PUSH_FAKE_ERROR_CODE | KI_FAST_V86_TRAP); KiTrap(KiTrap07, KI_PUSH_FAKE_ERROR_CODE); KiTrap(KiTrap08, 0); KiTrap(KiTrap09, KI_PUSH_FAKE_ERROR_CODE); Modified: trunk/reactos/ntoskrnl/ke/i386/v86vdm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/v86vdm.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/v86vdm.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/v86vdm.c [iso-8859-1] Wed Jan 27 06:34:38 2010 @@ -53,14 +53,17 @@ { ULONG Esp, V86EFlags, TrapEFlags; + /* Check for VME support */ + ASSERT(KeI386VirtualIntExtensions == FALSE); + /* Get current V8086 flags and mask out interrupt flag */ V86EFlags = *KiNtVdmState; V86EFlags &= ~EFLAGS_INTERRUPT_MASK; - + /* Get trap frame EFLags and leave only align, nested task and interrupt */ TrapEFlags = TrapFrame->EFlags; - TrapEFlags &= (EFLAGS_ALIGN_CHECK | EFLAGS_NESTED_TASK | EFLAGS_INTERRUPT_MASK); - + V86EFlags &= (EFLAGS_ALIGN_CHECK | EFLAGS_NESTED_TASK | EFLAGS_INTERRUPT_MASK); + /* Add in those flags if they exist, and add in the IOPL flag */ V86EFlags |= TrapEFlags; V86EFlags |= EFLAGS_IOPL; @@ -124,15 +127,18 @@ /* Now leave only alignment, nested task and interrupt flag */ EFlags &= (EFLAGS_ALIGN_CHECK | EFLAGS_NESTED_TASK | EFLAGS_INTERRUPT_MASK); - /* FIXME: Check for VME support */ - + /* Get trap EFlags */ + TrapEFlags = TrapFrame->EFlags; + + /* Check for VME support */ + ASSERT(KeI386VirtualIntExtensions == FALSE); + /* Add V86 and Interrupt flag */ V86EFlags |= EFLAGS_V86_MASK | EFLAGS_INTERRUPT_MASK; - + /* Update EFlags in trap frame */ - TrapEFlags = TrapFrame->EFlags; - TrapFrame->EFlags = (TrapFrame->EFlags & EFLAGS_VIP) | V86EFlags; - + TrapFrame->EFlags |= V86EFlags; + /* Check if ESP0 needs to be fixed up */ if (TrapEFlags & EFLAGS_V86_MASK) Ki386AdjustEsp0(TrapFrame); @@ -166,7 +172,8 @@ /* Keep only alignment and interrupt flag from the V8086 state */ V86EFlags &= (EFLAGS_ALIGN_CHECK | EFLAGS_INTERRUPT_MASK); - /* FIXME: Support VME */ + /* Check for VME support */ + ASSERT(KeI386VirtualIntExtensions == FALSE); /* Mask in the relevant V86 EFlags into the trap flags */ V86EFlags |= (TrapEFlags & ~EFLAGS_INTERRUPT_MASK); @@ -277,7 +284,8 @@ EFlags &= ~(EFLAGS_IOPL + EFLAGS_VIF + EFLAGS_NESTED_TASK + EFLAGS_VIP); V86EFlags = EFlags; - /* FIXME: Check for VME support */ + /* Check for VME support */ + ASSERT(KeI386VirtualIntExtensions == FALSE); /* Add V86 and Interrupt flag */ EFlags |= EFLAGS_V86_MASK | EFLAGS_INTERRUPT_MASK; @@ -314,7 +322,8 @@ KiVdmOpcodeCLI(IN PKTRAP_FRAME TrapFrame, IN ULONG Flags) { - /* FIXME: Support VME */ + /* Check for VME support */ + ASSERT(KeI386VirtualIntExtensions == FALSE); /* Disable interrupts */ KiVdmClearVdmEFlags(EFLAGS_INTERRUPT_MASK); @@ -331,7 +340,8 @@ KiVdmOpcodeSTI(IN PKTRAP_FRAME TrapFrame, IN ULONG Flags) { - /* FIXME: Support VME */ + /* Check for VME support */ + ASSERT(KeI386VirtualIntExtensions == FALSE); /* Enable interrupts */ KiVdmSetVdmEFlags(EFLAGS_INTERRUPT_MASK); Modified: trunk/reactos/ntoskrnl/vdm/vdmexec.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/vdm/vdmexec.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/vdm/vdmexec.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/vdm/vdmexec.c [iso-8859-1] Wed Jan 27 06:34:38 2010 @@ -196,7 +196,42 @@ ASSERT(*VdmState == 0); ASSERT(VdmTib->VdmContext.EFlags & EFLAGS_V86_MASK); - /* Get the VDM context and make sure it's an edited frame */ + /* Check if VME is supported and V86 mode was enabled */ + if ((KeI386VirtualIntExtensions) && + (VdmTib->VdmContext.EFlags & EFLAGS_V86_MASK)) + { + /* Check if interrupts are enabled */ + if (Interrupts) + { + /* Set fake IF flag */ + VdmTib->VdmContext.EFlags |= EFLAGS_VIF; + } + else + { + /* Remove fake IF flag, turn on real IF flag */ + VdmTib->VdmContext.EFlags &= ~EFLAGS_VIF; + VdmTib->VdmContext.EFlags |= EFLAGS_INTERRUPT_MASK; + } + } + else + { + /* Set interrupt state in the VDM State */ + if (VdmTib->VdmContext.EFlags & EFLAGS_INTERRUPT_MASK) + { + /* Enable them as well */ + InterlockedOr((PLONG)VdmState, EFLAGS_INTERRUPT_MASK); + } + else + { + /* Disable them */ + InterlockedAnd((PLONG)VdmState, ~EFLAGS_INTERRUPT_MASK); + } + + /* Enable the interrupt flag */ + VdmTib->VdmContext.EFlags |= EFLAGS_INTERRUPT_MASK; + } + + /* Get the VDM context and make sure it's not an edited frame */ VdmContext = VdmTib->VdmContext; if (!(VdmContext.SegCs & FRAME_EDITED)) { @@ -204,25 +239,7 @@ KeLowerIrql(OldIrql); return STATUS_INVALID_SYSTEM_SERVICE; } - - /* FIXME: Support VME */ - ASSERT(VdmTib->VdmContext.EFlags & EFLAGS_V86_MASK); - - /* Set interrupt state in the VDM State */ - if (VdmTib->VdmContext.EFlags & EFLAGS_INTERRUPT_MASK) - { - /* Enable them as well */ - InterlockedOr((PLONG)VdmState, EFLAGS_INTERRUPT_MASK); - } - else - { - /* Disable them */ - InterlockedAnd((PLONG)VdmState, ~EFLAGS_INTERRUPT_MASK); - } - - /* Enable the interrupt flag */ - VdmTib->VdmContext.EFlags |= EFLAGS_INTERRUPT_MASK; - + /* Now do the VDM Swap */ VdmSwapContext(VdmFrame, &VdmTib->MonitorContext, &VdmContext); @@ -251,17 +268,41 @@ VdmTib->MonitorContext.Eax = STATUS_SUCCESS; /* Make a copy of the monitor context */ - RtlCopyMemory(&Context, &VdmTib->MonitorContext, sizeof(CONTEXT)); - - /* Switch contexts */ - VdmSwapContext(TrapFrame, &VdmTib->VdmContext, &Context); - - /* FIXME: Support VME */ - - /* Set the EFLAGS */ - VdmTib->VdmContext.EFlags = (VdmTib->VdmContext.EFlags & - ~EFLAGS_INTERRUPT_MASK) | - (*VdmState & EFLAGS_INTERRUPT_MASK); + Context = VdmTib->MonitorContext; + + /* Check if V86 mode was enabled or the trap was edited */ + if ((Context.EFlags & EFLAGS_V86_MASK) || (Context.SegCs & FRAME_EDITED)) + { + /* Switch contexts */ + VdmSwapContext(TrapFrame, &VdmTib->VdmContext, &Context); + + /* Check if VME is supported and V86 mode was enabled */ + if ((KeI386VirtualIntExtensions) && + (VdmTib->VdmContext.EFlags & EFLAGS_V86_MASK)) + { + /* Check for VIF (virtual interrupt) flag state */ + if (VdmTib->VdmContext.EFlags & EFLAGS_VIF) + { + /* Set real IF flag */ + VdmTib->VdmContext.EFlags |= EFLAGS_INTERRUPT_MASK; + } + else + { + /* Remove real IF flag */ + VdmTib->VdmContext.EFlags &= ~EFLAGS_INTERRUPT_MASK; + } + + /* Turn off VIP and VIF */ + TrapFrame->EFlags &= ~(EFLAGS_VIP | EFLAGS_VIF); + VdmTib->VdmContext.EFlags &= ~(EFLAGS_VIP | EFLAGS_VIF); + } + else + { + /* Set the EFLAGS based on our software copy of EFLAGS */ + VdmTib->VdmContext.EFlags = (VdmTib->VdmContext.EFlags & ~EFLAGS_INTERRUPT_MASK) | + (*VdmState & EFLAGS_INTERRUPT_MASK); + } + } /* Lower IRQL and reutrn */ KeLowerIrql(OldIrql); Modified: trunk/reactos/ntoskrnl/vdm/vdmmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/vdm/vdmmain.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/vdm/vdmmain.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/vdm/vdmmain.c [iso-8859-1] Wed Jan 27 06:34:38 2010 @@ -20,10 +20,20 @@ VOID NTAPI -Ki386VdmEnablePentiumExtentions(VOID) -{ - /* FIXME: Support this */ - DPRINT1("VME support detected but not yet taken advantage of\n"); +Ki386VdmEnablePentiumExtentions(IN BOOLEAN Enable) +{ + ULONG EFlags, Cr4; + + /* Save interrupt state and disable them */ + EFlags = __readeflags(); + _disable(); + + /* Enable or disable VME as required */ + Cr4 = __readcr4(); + __writecr4(Enable ? Cr4 | CR4_VME : Cr4 & ~CR4_VME); + + /* Restore interrupt state */ + __writeeflags(EFlags); } VOID @@ -63,7 +73,7 @@ if (KeGetPcr()->Prcb->FeatureBits & KF_V86_VIS) { /* Enable them. FIXME: Use IPI */ - Ki386VdmEnablePentiumExtentions(); + Ki386VdmEnablePentiumExtentions(TRUE); KeI386VirtualIntExtensions = TRUE; } }

1 0

[sir_richard] 45281: [NTOS]: Trunk boots now (interesting that buildbot's QEMU does not support SYSENTER, as newer versions do), so remove the test DPRINTs.
by sir_richard＠svn.reactos.org 27 Jan '10

27 Jan '10

Author: sir_richard Date: Wed Jan 27 04:36:18 2010 New Revision: 45281 URL: http://svn.reactos.org/svn/reactos?rev=45281&view=rev Log: [NTOS]: Trunk boots now (interesting that buildbot's QEMU does not support SYSENTER, as newer versions do), so remove the test DPRINTs. Modified: trunk/reactos/ntoskrnl/ke/i386/cpu.c Modified: trunk/reactos/ntoskrnl/ke/i386/cpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/cpu.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] Wed Jan 27 04:36:18 2010 @@ -831,7 +831,6 @@ if ((KiSystemCallExitAdjusted == KiSystemCallExitAdjust) && (KiFastCallCopyDoneOnce)) { - DPRINT1("SYSEXIT Code Patch was already done!\n"); return; } @@ -839,17 +838,14 @@ if ((KiSystemCallExitBranch[1] - KiSystemCallExitAdjust) < 0x80) { /* Remove any existing code patch */ - DPRINT1("Correct SHORT size found\n"); KiDisableFastSyscallReturn(); /* We should have a JNZ there */ ASSERT(KiSystemCallExitBranch[0] == 0x75); /* Do the patch */ - DPRINT1("Current jump offset: %lx\n", KiSystemCallExitBranch[1]); KiSystemCallExitAdjusted = KiSystemCallExitAdjust; KiSystemCallExitBranch[1] -= KiSystemCallExitAdjusted; - DPRINT1("New jump offset: %lx\n", KiSystemCallExitBranch[1]); /* Remember that we've done it */ KiFastCallCopyDoneOnce = TRUE; @@ -873,12 +869,10 @@ if (!KiFastSystemCallDisable) { /* KiSystemCallExit2 should come BEFORE KiSystemCallExit */ - DPRINT1("Exit2: %p Exit1: %p\n", KiSystemCallExit2, KiSystemCallExit); ASSERT(KiSystemCallExit2 < KiSystemCallExit); /* It's enabled, so we'll have to do a code patch */ KiSystemCallExitAdjust = KiSystemCallExit - KiSystemCallExit2; - DPRINT1("SYSENTER Capable Machine. Jump Offset Delta: %lx\n", KiSystemCallExitAdjust); } else {

1 0

[sir_richard] 45280: [NTOS]: Rework the trap macros again. This time we needed some added complexity because of the need for runtime patching at boot. We got away with it nicely and basically implement a simple "if" in ASM, which gives us a deterministic set of instructions (vs the compiler). We then patch if if needed (see next bullet). [NTOS]: Support systems without SYSENTER. Nothing was actually disabling the SYSEXIT mechanism recently enabled. Now IRET is always used unless a SYSENTER machi
by sir_richard＠svn.reactos.org 27 Jan '10

27 Jan '10

Author: sir_richard Date: Wed Jan 27 04:05:10 2010 New Revision: 45280 URL: http://svn.reactos.org/svn/reactos?rev=45280&view=rev Log: [NTOS]: Rework the trap macros again. This time we needed some added complexity because of the need for runtime patching at boot. We got away with it nicely and basically implement a simple "if" in ASM, which gives us a deterministic set of instructions (vs the compiler). We then patch if if needed (see next bullet). [NTOS]: Support systems without SYSENTER. Nothing was actually disabling the SYSEXIT mechanism recently enabled. Now IRET is always used unless a SYSENTER machine is discovered, in which case the jmp to the IRET code is patched with a jmp to SYSEXIT code. [PERF]: Set WP0 bit in CR0 later, thus allowing the existing runtime patches (and this new one) to function without requiring MmSetPageProtect. Saves TLB flushes and page table walking/mapping on boot. Left in some debug prints to see what buildbot reports...will remove if it survives. Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h trunk/reactos/ntoskrnl/include/internal/trap_x.h trunk/reactos/ntoskrnl/ke/i386/cpu.c trunk/reactos/ntoskrnl/ke/i386/kiinit.c Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/ke.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/ke.h [iso-8859-1] Wed Jan 27 04:05:10 2010 @@ -456,6 +456,9 @@ extern VOID __cdecl CopyParams(VOID); extern VOID __cdecl ReadBatch(VOID); extern VOID __cdecl FrRestore(VOID); +extern CHAR KiSystemCallExitBranch[]; +extern CHAR KiSystemCallExit[]; +extern CHAR KiSystemCallExit2[]; // // Trap Macros Modified: trunk/reactos/ntoskrnl/include/internal/trap_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/trap_x.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/trap_x.h [iso-8859-1] Wed Jan 27 04:05:10 2010 @@ -190,7 +190,7 @@ // VOID FORCEINLINE -DECLSPEC_NORETURN +/* Do not mark this as DECLSPEC_NORETURN because possibly executing code follows it! */ KiSystemCallReturn(IN PKTRAP_FRAME TrapFrame) { /* Restore nonvolatiles, EAX, and do a "jump" back to the kernel caller */ @@ -205,6 +205,7 @@ "movl %c[e](%%esp), %%edx\n" "addl $%c[v],%%esp\n" /* A WHOLE *KERNEL* frame since we're not IRET'ing */ "jmp *%%edx\n" + ".globl _KiSystemCallExit2\n_KiSystemCallExit2:\n" : : "r"(TrapFrame), [b] "i"(KTRAP_FRAME_EBX), @@ -216,7 +217,6 @@ [v] "i"(KTRAP_FRAME_ESP) : "%esp" ); - UNREACHABLE; } VOID @@ -227,6 +227,7 @@ /* Regular interrupt exit, but we only restore EAX as a volatile */ __asm__ __volatile__ ( + ".globl _KiSystemCallExit\n_KiSystemCallExit:\n" "movl %0, %%esp\n" "movl %c[b](%%esp), %%ebx\n" "movl %c[s](%%esp), %%esi\n" @@ -405,6 +406,29 @@ asm volatile(".byte 0xC4\n.byte 0xC4\n"); } +VOID +FORCEINLINE +KiUserSystemCall(IN PKTRAP_FRAME TrapFrame) +{ + /* + * Kernel call or user call? + * + * This decision is made in inlined assembly because we need to patch + * the relative offset of the user-mode jump to point to the SYSEXIT + * routine if the CPU supports it. The only way to guarantee that a + * relative jnz/jz instruction is generated is to force it with the + * inline assembler. + */ + asm volatile + ( + "test $1, %0\n" /* MODE_MASK */ + ".globl _KiSystemCallExitBranch\n_KiSystemCallExitBranch:\n" + "jnz _KiSystemCallExit\n" + : + : "r"(TrapFrame->SegCs) + ); +} + // // Generic Exit Routine // @@ -502,43 +526,35 @@ /* Check for system call -- a system call skips volatiles! */ if (__builtin_expect(SkipBits.SkipVolatiles, 0)) /* More INTs than SYSCALLs */ { - /* Kernel call or user call? */ - if (__builtin_expect(KiUserTrap(TrapFrame), 1)) /* More Ring 3 than 0 */ + /* User or kernel call? */ + KiUserSystemCall(TrapFrame); + + /* Restore EFLags */ + __writeeflags(TrapFrame->EFlags); + + /* Call is kernel, so do a jump back since this wasn't a real INT */ + KiSystemCallReturn(TrapFrame); + + /* If we got here, this is SYSEXIT: are we stepping code? */ + if (!(TrapFrame->EFlags & EFLAGS_TF)) { - /* Is SYSENTER supported and/or enabled, or are we stepping code? */ - if (__builtin_expect((KiFastSystemCallDisable) || - (TrapFrame->EFlags & EFLAGS_TF), 0)) - { - /* Exit normally */ - KiSystemCallTrapReturn(TrapFrame); - } - else - { - /* Restore user FS */ - Ke386SetFs(KGDT_R3_TEB | RPL_MASK); - - /* Remove interrupt flag */ - TrapFrame->EFlags &= ~EFLAGS_INTERRUPT_MASK; - __writeeflags(TrapFrame->EFlags); - - /* Exit through SYSEXIT */ - KiSystemCallSysExitReturn(TrapFrame); - } + /* Restore user FS */ + Ke386SetFs(KGDT_R3_TEB | RPL_MASK); + + /* Remove interrupt flag */ + TrapFrame->EFlags &= ~EFLAGS_INTERRUPT_MASK; + __writeeflags(TrapFrame->EFlags); + + /* Exit through SYSEXIT */ + KiSystemCallSysExitReturn(TrapFrame); } - else - { - /* Restore EFLags */ - __writeeflags(TrapFrame->EFlags); - - /* Call is kernel, so do a jump back since this wasn't a real INT */ - KiSystemCallReturn(TrapFrame); - } - } - else - { - /* Return from interrupt */ - KiTrapReturn(TrapFrame); - } + + /* Exit through IRETD, either due to debugging or due to lack of SYSEXIT */ + KiSystemCallTrapReturn(TrapFrame); + } + + /* Return from interrupt */ + KiTrapReturn(TrapFrame); } // Modified: trunk/reactos/ntoskrnl/ke/i386/cpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/cpu.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] Wed Jan 27 04:05:10 2010 @@ -45,6 +45,15 @@ BOOLEAN KiI386PentiumLockErrataPresent; BOOLEAN KiSMTProcessorsPresent; +/* The distance between SYSEXIT and IRETD return modes */ +UCHAR KiSystemCallExitAdjust; + +/* The offset that was applied -- either 0 or the value above */ +UCHAR KiSystemCallExitAdjusted; + +/* Whether the adjustment was already done once */ +BOOLEAN KiFastCallCopyDoneOnce; + /* Flush data */ volatile LONG KiTbFlushTimeStamp; @@ -801,16 +810,92 @@ VOID NTAPI +KiDisableFastSyscallReturn(VOID) +{ + /* Was it applied? */ + if (KiSystemCallExitAdjusted) + { + /* Restore the original value */ + KiSystemCallExitBranch[1] = KiSystemCallExitBranch[1] - KiSystemCallExitAdjusted; + + /* It's not adjusted anymore */ + KiSystemCallExitAdjusted = FALSE; + } +} + +VOID +NTAPI +KiEnableFastSyscallReturn(VOID) +{ + /* Check if the patch has already been done */ + if ((KiSystemCallExitAdjusted == KiSystemCallExitAdjust) && + (KiFastCallCopyDoneOnce)) + { + DPRINT1("SYSEXIT Code Patch was already done!\n"); + return; + } + + /* Make sure the offset is within the distance of a Jxx SHORT */ + if ((KiSystemCallExitBranch[1] - KiSystemCallExitAdjust) < 0x80) + { + /* Remove any existing code patch */ + DPRINT1("Correct SHORT size found\n"); + KiDisableFastSyscallReturn(); + + /* We should have a JNZ there */ + ASSERT(KiSystemCallExitBranch[0] == 0x75); + + /* Do the patch */ + DPRINT1("Current jump offset: %lx\n", KiSystemCallExitBranch[1]); + KiSystemCallExitAdjusted = KiSystemCallExitAdjust; + KiSystemCallExitBranch[1] -= KiSystemCallExitAdjusted; + DPRINT1("New jump offset: %lx\n", KiSystemCallExitBranch[1]); + + /* Remember that we've done it */ + KiFastCallCopyDoneOnce = TRUE; + } + else + { + /* This shouldn't happen unless we've messed the macros up */ + DPRINT1("Your compiled kernel is broken!\n"); + DbgBreakPoint(); + } +} + +VOID +NTAPI KiRestoreFastSyscallReturnState(VOID) { - /* FIXME: NT has support for SYSCALL, IA64-SYSENTER, etc. */ - /* Check if the CPU Supports fast system call */ if (KeFeatureBits & KF_FAST_SYSCALL) { + /* Check if it has been disabled */ + if (!KiFastSystemCallDisable) + { + /* KiSystemCallExit2 should come BEFORE KiSystemCallExit */ + DPRINT1("Exit2: %p Exit1: %p\n", KiSystemCallExit2, KiSystemCallExit); + ASSERT(KiSystemCallExit2 < KiSystemCallExit); + + /* It's enabled, so we'll have to do a code patch */ + KiSystemCallExitAdjust = KiSystemCallExit - KiSystemCallExit2; + DPRINT1("SYSENTER Capable Machine. Jump Offset Delta: %lx\n", KiSystemCallExitAdjust); + } + else + { + /* Disable fast system call */ + KeFeatureBits &= ~KF_FAST_SYSCALL; + } + } + + /* Now check if all CPUs support fast system call, and the registry allows it */ + if (KeFeatureBits & KF_FAST_SYSCALL) + { /* Do an IPI to enable it */ KeIpiGenericCall(KiLoadFastSyscallMachineSpecificRegisters, 0); } + + /* Perform the code patch that is required */ + KiEnableFastSyscallReturn(); } ULONG_PTR Modified: trunk/reactos/ntoskrnl/ke/i386/kiinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/kiinit.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/kiinit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/kiinit.c [iso-8859-1] Wed Jan 27 04:05:10 2010 @@ -31,7 +31,6 @@ NTAPI KiInitMachineDependent(VOID) { - ULONG Protect; ULONG CpuCount; BOOLEAN FbCaching = FALSE; NTSTATUS Status; @@ -153,12 +152,7 @@ /* FIXME: Implement and enable XMM Page Zeroing for Mm */ /* Patch the RtlPrefetchMemoryNonTemporal routine to enable it */ - Protect = MmGetPageProtect(NULL, RtlPrefetchMemoryNonTemporal); - MmSetPageProtect(NULL, - RtlPrefetchMemoryNonTemporal, - Protect | PAGE_IS_WRITABLE); *(PCHAR)RtlPrefetchMemoryNonTemporal = 0x90; - MmSetPageProtect(NULL, RtlPrefetchMemoryNonTemporal, Protect); } } @@ -320,6 +314,9 @@ /* FIXME: TODO */ DPRINT1("ISR Time Limit not yet supported\n"); } + + /* Set CR0 features based on detected CPU */ + KiSetCR0Bits(); } VOID @@ -400,9 +397,6 @@ /* Detect and set the CPU Type */ KiSetProcessorType(); - - /* Set CR0 features based on detected CPU */ - KiSetCR0Bits(); /* Check if an FPU is present */ NpxPresent = KiIsNpxPresent();

1 0

[dgorbachev] 45279: Output PCH, not dependencies.
by dgorbachev＠svn.reactos.org 27 Jan '10

27 Jan '10

Author: dgorbachev Date: Wed Jan 27 03:29:36 2010 New Revision: 45279 URL: http://svn.reactos.org/svn/reactos?rev=45279&view=rev Log: Output PCH, not dependencies. Modified: trunk/reactos/tools/rbuild/backend/mingw/compilers/gcc.mak Modified: trunk/reactos/tools/rbuild/backend/mingw/compilers/gcc.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/compilers/gcc.mak [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/compilers/gcc.mak [iso-8859-1] Wed Jan 27 03:29:36 2010 @@ -125,7 +125,7 @@ ${call RBUILD_intermediate_dir,$(2)}$$(SEP).gch_$(1)$$(SEP)$(notdir $(2)).gch: $(2) $(3) | ${call RBUILD_intermediate_dir,$(2)}$$(SEP).gch_$(1) $$(ECHO_PCH) - $${gcc} -MF $$@ ${call RBUILD_cflags,$(1),$(4)} -x c-header -M -MP -MT $$@ $$< + $${gcc} -o $$@ ${call RBUILD_cflags,$(1),$(4)} -x c-header $$< endif @@ -152,7 +152,7 @@ ${call RBUILD_intermediate_dir,$(2)}$$(SEP).gch_$(1)$$(SEP)$(notdir $(2)).gch: $(2) $(3) | ${call RBUILD_intermediate_dir,$(2)}$$(SEP).gch_$(1) $$(ECHO_PCH) - $${gpp} -MF $$@ ${call RBUILD_cxxflags,$(1),$(4)} -x c++-header -M -MP -MT $$@ $$< + $${gpp} -o $$@ ${call RBUILD_cxxflags,$(1),$(4)} -x c++-header $$< endif

1 0

[jimtabor] 45278: - Turn off debug print outs.
by jimtabor＠svn.reactos.org 27 Jan '10

27 Jan '10

Author: jimtabor Date: Wed Jan 27 01:06:48 2010 New Revision: 45278 URL: http://svn.reactos.org/svn/reactos?rev=45278&view=rev Log: - Turn off debug print outs. Modified: trunk/reactos/dll/win32/gdi32/misc/misc.c trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Modified: trunk/reactos/dll/win32/gdi32/misc/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/misc.… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/misc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/misc/misc.c [iso-8859-1] Wed Jan 27 01:06:48 2010 @@ -314,7 +314,7 @@ { if (pRgn_Attr->AttrFlags & ATTR_CACHED) { - DPRINT1("Get Handle! Count %d PEB 0x%x\n", GdiHandleCache->ulNumHandles[Type], NtCurrentTeb()->ProcessEnvironmentBlock); + DPRINT("Get Handle! Count %d PEB 0x%x\n", GdiHandleCache->ulNumHandles[Type], NtCurrentTeb()->ProcessEnvironmentBlock); pRgn_Attr->AttrFlags &= ~ATTR_CACHED; hPtr[Number - 1] = NULL; GdiHandleCache->ulNumHandles[Type]--; Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c [iso-8859-1] Wed Jan 27 01:06:48 2010 @@ -760,7 +760,7 @@ ((PRGN_ATTR)pAttr)->AttrFlags |= ATTR_CACHED; hPtr[Number] = Handle; GdiHandleCache->ulNumHandles[oType]++; - DPRINT1("Put Handle Count %d PEB 0x%x\n", GdiHandleCache->ulNumHandles[oType], NtCurrentTeb()->ProcessEnvironmentBlock); + DPRINT("Put Handle Count %d PEB 0x%x\n", GdiHandleCache->ulNumHandles[oType], NtCurrentTeb()->ProcessEnvironmentBlock); Ret = TRUE; } }

1 0

[cfinck] 45277: - Remove --disable-werror where unsupported - Fix the Bash fallback value variable expansion
by cfinck＠svn.reactos.org 26 Jan '10

26 Jan '10

Author: cfinck Date: Tue Jan 26 23:27:04 2010 New Revision: 45277 URL: http://svn.reactos.org/svn/reactos?rev=45277&view=rev Log: - Remove --disable-werror where unsupported - Fix the Bash fallback value variable expansion Modified: trunk/tools/RosBE/RosBE-Unix/Base-i386/RosBE-Builder.sh trunk/tools/RosBE/RosBE-Unix/Base-i386/scripts/RosBE.sh trunk/tools/RosBE/RosBE-Unix/Base-i386/scripts/clean.sh trunk/tools/RosBE/RosBE-Windows/Buildtoolchain/rosbe_1.5/buildtoolchain.sh Modified: trunk/tools/RosBE/RosBE-Unix/Base-i386/RosBE-Builder.sh URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/Base-i386/R… ============================================================================== --- trunk/tools/RosBE/RosBE-Unix/Base-i386/RosBE-Builder.sh [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Unix/Base-i386/RosBE-Builder.sh [iso-8859-1] Tue Jan 26 23:27:04 2010 @@ -270,7 +270,7 @@ if rs_prepare_module "mpfr"; then export CFLAGS="$rs_host_cflags" - rs_do_command ../mpfr/configure --prefix="$rs_supportprefixdir" --with-gmp="$rs_supportprefixdir" --disable-shared --disable-werror + rs_do_command ../mpfr/configure --prefix="$rs_supportprefixdir" --with-gmp="$rs_supportprefixdir" --disable-shared rs_do_command $rs_makecmd -j $rs_cpucount rs_do_command $rs_makecmd check rs_do_command $rs_makecmd install @@ -321,7 +321,7 @@ export CFLAGS="$rs_host_cflags" cd "nasm" - rs_do_command ./configure --prefix="$rs_prefixdir" --disable-werror + rs_do_command ./configure --prefix="$rs_prefixdir" rs_do_command $rs_makecmd -j $rs_cpucount rs_do_command $rs_makecmd install rs_clean_module "nasm" Modified: trunk/tools/RosBE/RosBE-Unix/Base-i386/scripts/RosBE.sh URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/Base-i386/s… ============================================================================== --- trunk/tools/RosBE/RosBE-Unix/Base-i386/scripts/RosBE.sh [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Unix/Base-i386/scripts/RosBE.sh [iso-8859-1] Tue Jan 26 23:27:04 2010 @@ -7,13 +7,7 @@ # Released under GNU GPL v2 or any later version. # Save the ReactOS source directory -if [ "$1" = "" ]; then - _ROSBE_ROSSOURCEDIR="$PWD" -else - _ROSBE_ROSSOURCEDIR="$1" -fi - -export _ROSBE_ROSSOURCEDIR +export _ROSBE_ROSSOURCEDIR="${1:-$PWD}" # Get the absolute path to the script directory cd `dirname $0` @@ -45,7 +39,7 @@ source "$_ROSBE_ROSSCRIPTDIR/rosbelibrary.sh" # Try to set the architecture to the one specified or fallback to "i386" -change_architecture "$3:-i386" +change_architecture "${3:-i386}" # Display banner echo "*******************************************************************************" Modified: trunk/tools/RosBE/RosBE-Unix/Base-i386/scripts/clean.sh URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/Base-i386/s… ============================================================================== --- trunk/tools/RosBE/RosBE-Unix/Base-i386/scripts/clean.sh [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Unix/Base-i386/scripts/clean.sh [iso-8859-1] Tue Jan 26 23:27:04 2010 @@ -7,10 +7,10 @@ # Released under GNU GPL v2 or any later version. # Check if the user set any custom filenames or pathes, otherwise locally set the appropriate variables. -ROS_AUTOMAKE="$ROS_AUTOMAKE:-makefile-$ROS_ARCH.auto" -ROS_INTERMEDIATE="$ROS_INTERMEDIATE:-obj-$ROS_ARCH" -ROS_OUTPUT="$ROS_OUTPUT:-output-$ROS_ARCH" -ROS_CDOUTPUT="$ROS_CDOUTPUT:-reactos." +ROS_AUTOMAKE="${ROS_AUTOMAKE:-makefile-$ROS_ARCH.auto}" +ROS_INTERMEDIATE="${ROS_INTERMEDIATE:-obj-$ROS_ARCH}" +ROS_OUTPUT="${ROS_OUTPUT:-output-$ROS_ARCH}" +ROS_CDOUTPUT="${ROS_CDOUTPUT:-reactos.}" # Do some basic sanity checks to verify that we are working in a ReactOS source tree. # Consider that we also want to clean half-complete builds, so don't depend on too many existing files. Modified: trunk/tools/RosBE/RosBE-Windows/Buildtoolchain/rosbe_1.5/buildtoolchain.sh URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Buildtoo… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Buildtoolchain/rosbe_1.5/buildtoolchain.sh [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Buildtoolchain/rosbe_1.5/buildtoolchain.sh [iso-8859-1] Tue Jan 26 23:27:04 2010 @@ -193,7 +193,7 @@ if rs_prepare_module "mpfr"; then export CFLAGS="$rs_host_cflags" - rs_do_command ../mpfr/configure --prefix="$rs_supportprefixdir" --host="$rs_target" --build="$rs_target" --with-gmp="$rs_supportprefixdir" --disable-shared --disable-werror + rs_do_command ../mpfr/configure --prefix="$rs_supportprefixdir" --host="$rs_target" --build="$rs_target" --with-gmp="$rs_supportprefixdir" --disable-shared rs_do_command $rs_makecmd -j $rs_cpucount rs_do_command $rs_makecmd check rs_do_command $rs_makecmd install

1 0

[sir_richard] 45276: [HAL]: Implement the profile and clock interrupt trap/handlers in C instead of ASM. This allows the kernel to remove the ugly hacks based on internal knowledge of how the assembly/stack of the HAL is supposed to look like. Everything is now done through a clean C interface. [NTOS]: Remove said hacks and have a normal C implementation of KeUpdateSystemTime. It exits the interrupt through a soft interrupt exit. [NTOS]: Implement 4 lines of support code needed to handle interru
by sir_richard＠svn.reactos.org 26 Jan '10

26 Jan '10

Author: sir_richard Date: Tue Jan 26 22:41:05 2010 New Revision: 45276 URL: http://svn.reactos.org/svn/reactos?rev=45276&view=rev Log: [HAL]: Implement the profile and clock interrupt trap/handlers in C instead of ASM. This allows the kernel to remove the ugly hacks based on internal knowledge of how the assembly/stack of the HAL is supposed to look like. Everything is now done through a clean C interface. [NTOS]: Remove said hacks and have a normal C implementation of KeUpdateSystemTime. It exits the interrupt through a soft interrupt exit. [NTOS]: Implement 4 lines of support code needed to handle interrupts during V8086 mode, which were lacking since we weren't hitting this case yet. Note that now the KeUpdateSystemTime interface is not "compatible" with Windows anymore. This does not matter, since the only possible caller of KeUpdateSystemTime is a very specific HAL routine that needs a very specific stack layout to actually work, so the chance of anyone calling this API is absolutely zero (no, not even some experimental driver. It's absolutely impossible). Modified: trunk/reactos/hal/halx86/generic/systimer.S trunk/reactos/hal/halx86/generic/timer.c trunk/reactos/hal/halx86/include/halp.h trunk/reactos/include/ndk/kefuncs.h trunk/reactos/ntoskrnl/include/internal/trap_x.h trunk/reactos/ntoskrnl/ke/i386/trap.s trunk/reactos/ntoskrnl/ke/time.c trunk/reactos/ntoskrnl/ntoskrnl.pspec Modified: trunk/reactos/hal/halx86/generic/systimer.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/systime… ============================================================================== --- trunk/reactos/hal/halx86/generic/systimer.S [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/systimer.S [iso-8859-1] Tue Jan 26 22:41:05 2010 @@ -520,72 +520,3 @@ mov _HalpLastPerfCounterHigh, eax jmp LoopPreInt .endfunc - -.globl _HalpClockInterrupt@0 -.func HalpClockInterrupt@0 -TRAP_FIXUPS hci_a, hci_t, DoFixupV86, DoFixupAbios -_HalpClockInterrupt@0: - - /* Enter trap */ - INT_PROLOG hci_a, hci_t, DoPushFakeErrorCode - - /* Push vector and make stack for IRQL */ - push 0x30 - sub esp, 4 - - /* Begin the interrupt */ - push esp - push 0x30 - push CLOCK2_LEVEL - call _HalBeginSystemInterrupt@12 - - /* Check if it's spurious */ - or al, al - jz Spurious - - /* Update the performance counter */ - xor ebx, ebx - mov eax, _HalpCurrentRollOver - add _HalpPerfCounterLow, eax - adc _HalpPerfCounterHigh, ebx - - /* Get the time increment and check if someone changed the clock rate */ - mov eax, _HalpCurrentTimeIncrement - cmp _HalpClockSetMSRate, ebx - jz _KeUpdateSystemTime@0 - - /* FIXME: Someone did! */ - int 3 - -Spurious: - - /* Exit the interrupt */ - add esp, 8 - jmp _Kei386EoiHelper@0 -.endfunc - -.globl _HalpProfileInterrupt@0 -.func HalpProfileInterrupt@0 -TRAP_FIXUPS hpi_a, hpi_t, DoFixupV86, DoFixupAbios -_HalpProfileInterrupt@0: - - /* Enter trap */ - INT_PROLOG hpi_a, hpi_t, DoPushFakeErrorCode - - /* Push vector and make stack for IRQL */ - push 0x38 - sub esp, 4 - - /* Begin the interrupt */ - push esp - push 0x38 - push PROFILE_LEVEL - call _HalBeginSystemInterrupt@12 - - /* Check if it's spurious */ - or al, al - jz Spurious - - /* FIXME: We should not be getting profile interrupts yet! */ - int 3 -.endfunc Modified: trunk/reactos/hal/halx86/generic/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/timer.c… ============================================================================== --- trunk/reactos/hal/halx86/generic/timer.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/timer.c [iso-8859-1] Tue Jan 26 22:41:05 2010 @@ -109,6 +109,61 @@ HalpCurrentRollOver = RollOver; } +VOID +FASTCALL +HalpClockInterruptHandler(IN PKTRAP_FRAME TrapFrame) +{ + KIRQL Irql; + + /* Enter trap */ + KiEnterInterruptTrap(TrapFrame); + + /* Start the interrupt */ + if (HalBeginSystemInterrupt(CLOCK2_LEVEL, PRIMARY_VECTOR_BASE, &Irql)) + { + /* Update the performance counter */ + HalpPerfCounter.QuadPart += HalpCurrentRollOver; + + /* Check if someone changed the time rate */ + if (HalpClockSetMSRate) + { + /* Not yet supported */ + UNIMPLEMENTED; + while (TRUE); + } + + /* Update the system time -- the kernel will exit this trap */ + KeUpdateSystemTime(TrapFrame, HalpCurrentTimeIncrement, Irql); + } + + /* Spurious, just end the interrupt */ + KiEoiHelper(TrapFrame); +} + +VOID +FASTCALL +HalpProfileInterruptHandler(IN PKTRAP_FRAME TrapFrame) +{ + KIRQL Irql; + + /* Enter trap */ + KiEnterInterruptTrap(TrapFrame); + + /* Start the interrupt */ + if (HalBeginSystemInterrupt(PROFILE_LEVEL, PRIMARY_VECTOR_BASE + 8, &Irql)) + { + /* Profiling isn't yet enabled */ + UNIMPLEMENTED; + while (TRUE); + } + + /* Spurious, just end the interrupt */ + KiEoiHelper(TrapFrame); +} + +KiTrap(HalpClockInterrupt, KI_PUSH_FAKE_ERROR_CODE); +KiTrap(HalpProfileInterrupt, KI_PUSH_FAKE_ERROR_CODE); + /* PUBLIC FUNCTIONS ***********************************************************/ /* Modified: trunk/reactos/hal/halx86/include/halp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/include/halp.h?… ============================================================================== --- trunk/reactos/hal/halx86/include/halp.h [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/include/halp.h [iso-8859-1] Tue Jan 26 22:41:05 2010 @@ -532,8 +532,10 @@ VOID HalpApcInterrupt(VOID); VOID HalpDispatchInterrupt(VOID); -/* udelay.c */ +/* timer.c */ VOID NTAPI HalpInitializeClock(VOID); +VOID HalpClockInterrupt(VOID); +VOID HalpProfileInterrupt(VOID); VOID NTAPI @@ -548,8 +550,6 @@ /* Non-generic initialization */ VOID HalpInitPhase0 (PLOADER_PARAMETER_BLOCK LoaderBlock); VOID HalpInitPhase1(VOID); -VOID NTAPI HalpClockInterrupt(VOID); -VOID NTAPI HalpProfileInterrupt(VOID); VOID NTAPI @@ -755,6 +755,14 @@ #endif +VOID +FASTCALL +KeUpdateSystemTime( + IN PKTRAP_FRAME TrapFrame, + IN ULONG Increment, + IN KIRQL OldIrql +); + #ifdef _M_AMD64 #define KfLowerIrql KeLowerIrql #ifndef CONFIG_SMP @@ -774,4 +782,6 @@ extern PADDRESS_USAGE HalpAddressUsageList; +extern LARGE_INTEGER HalpPerfCounter; + #endif /* __INTERNAL_HAL_HAL_H */ Modified: trunk/reactos/include/ndk/kefuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/kefuncs.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/kefuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/kefuncs.h [iso-8859-1] Tue Jan 26 22:41:05 2010 @@ -237,21 +237,6 @@ VOID NTAPI -KeUpdateSystemTime( - PKTRAP_FRAME TrapFrame, - KIRQL Irql, - ULONG Increment -); - -VOID -NTAPI -KeUpdateRunTime( - PKTRAP_FRAME TrapFrame, - KIRQL Irql -); - -VOID -NTAPI KeSetDmaIoCoherency( IN ULONG Coherency ); Modified: trunk/reactos/ntoskrnl/include/internal/trap_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/trap_x.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/trap_x.h [iso-8859-1] Tue Jan 26 22:41:05 2010 @@ -629,8 +629,11 @@ /* Check for V86 mode */ if (__builtin_expect(TrapFrame->EFlags & EFLAGS_V86_MASK, 0)) { - DbgPrint("Need V8086 Interrupt Support!\n"); - while (TRUE); + /* Restore V8086 segments into Protected Mode segments */ + TrapFrame->SegFs = TrapFrame->V86Fs; + TrapFrame->SegGs = TrapFrame->V86Gs; + TrapFrame->SegDs = TrapFrame->V86Ds; + TrapFrame->SegEs = TrapFrame->V86Es; } /* Check if this wasn't kernel code */ Modified: trunk/reactos/ntoskrnl/ke/i386/trap.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/trap.s?re… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/trap.s [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/trap.s [iso-8859-1] Tue Jan 26 22:41:05 2010 @@ -205,41 +205,6 @@ /* INTERRUPT HANDLERS ********************************************************/ -.globl _KeUpdateSystemTime@0 -.func KeUpdateSystemTime@0 -_KeUpdateSystemTime@0: - - /* - * When we enter here, the ASM HAL has: - * - Entered here with a JMP, not a CALL - * - Put increment in EAX - * - Pushed OldIRQL on the stack earlier [ESP] - * - Pushed Vector on the stack earlier [ESP + 4] - * - The trap frame at ESP + 8 - * - * When the HAL moves to C, this shit needs to die!!! - * - */ - - /* Call the regparm with Increment, OldIrql, TrapFrame */ - mov edx, [esp] - mov ecx, ebp - call _KeUpdateSystemTimeHandler - - /* - * The code below cannot be done in C because HalEndSystemInterrupt will - * fuck with your stack sideways when it decides to handle a pending APC or - * DPC! - */ - - /* Stack is back where it was, HalEndSystemInterrupt will clean it up */ - cli - call _HalEndSystemInterrupt@8 - - /* Now the stack has become the trap frame */ - jmp _Kei386EoiHelper@0 -.endfunc - .func KiDispatchInterrupt@0 _KiDispatchInterrupt@0: Modified: trunk/reactos/ntoskrnl/ke/time.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/time.c?rev=452… ============================================================================== --- trunk/reactos/ntoskrnl/ke/time.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/time.c [iso-8859-1] Tue Jan 26 22:41:05 2010 @@ -19,19 +19,11 @@ /* FUNCTIONS ******************************************************************/ -#ifndef _M_ARM VOID -__attribute__((regparm(3))) -KeUpdateSystemTimeHandler(IN ULONG Increment, - IN KIRQL Irql, - IN PKTRAP_FRAME TrapFrame) -#else -VOID -NTAPI +FASTCALL KeUpdateSystemTime(IN PKTRAP_FRAME TrapFrame, IN ULONG Increment, - IN KIRQL Irql) -#endif + IN KIRQL Irql) { PKPRCB Prcb = KeGetCurrentPrcb(); ULARGE_INTEGER CurrentTime, InterruptTime; @@ -119,6 +111,13 @@ /* Increase interrupt count and exit */ Prcb->InterruptCount++; } + + /* Disable interrupts and end the interrupt */ + _disable(); + HalEndSystemInterrupt(Irql, CLOCK2_LEVEL); + + /* Exit the interrupt */ + KiEoiHelper(TrapFrame); } VOID Modified: trunk/reactos/ntoskrnl/ntoskrnl.pspec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.pspec?re… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.pspec [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.pspec [iso-8859-1] Tue Jan 26 22:41:05 2010 @@ -688,11 +688,7 @@ @ fastcall KeTryToAcquireSpinLockAtDpcLevel(ptr) @ stdcall KeUnstackDetachProcess(ptr) @ stdcall KeUpdateRunTime(ptr long) -#ifdef _M_IX86 -@ stdcall KeUpdateSystemTime() -#else -@ stdcall KeUpdateSystemTime(ptr long long) -#endif +@ fastcall KeUpdateSystemTime(ptr long long) @ stdcall KeUserModeCallback(long ptr long ptr ptr) @ stdcall KeWaitForMultipleObjects(long ptr long long long long ptr ptr) @ stdcall KeWaitForMutexObject(ptr long long long ptr) KeWaitForSingleObject

1 0

[jcatena] 45275: trap_x.h: implemented msvc counterparts
by jcatena＠svn.reactos.org 26 Jan '10

26 Jan '10

Author: jcatena Date: Tue Jan 26 21:27:50 2010 New Revision: 45275 URL: http://svn.reactos.org/svn/reactos?rev=45275&view=rev Log: trap_x.h: implemented msvc counterparts Modified: branches/jcatena-branch/ntoskrnl/include/internal/trap_x.h Modified: branches/jcatena-branch/ntoskrnl/include/internal/trap_x.h URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/include… ============================================================================== --- branches/jcatena-branch/ntoskrnl/include/internal/trap_x.h [iso-8859-1] (original) +++ branches/jcatena-branch/ntoskrnl/include/internal/trap_x.h [iso-8859-1] Tue Jan 26 21:27:50 2010 @@ -7,21 +7,6 @@ */ #ifndef _TRAP_X_ #define _TRAP_X_ - -// -// Unreachable code hint for GCC 4.5.x, older GCC versions, and MSVC -// -#ifdef __GNUC__ -#if __GNUC__ * 100 + __GNUC_MINOR__ >= 405 -#define UNREACHABLE __builtin_unreachable() -#else -#define UNREACHABLE __builtin_trap() -#endif -#elif _MSC_VER -#define UNREACHABLE __assume(0) -#else -#define UNREACHABLE -#endif // // Debug Macros @@ -194,7 +179,20 @@ KiSystemCallReturn(IN PKTRAP_FRAME TrapFrame) { /* Restore nonvolatiles, EAX, and do a "jump" back to the kernel caller */ - __asm__ __volatile__ +#if defined(_MSC_VER) + _ASM_BEGIN + mov esp, TrapFrame + mov ebx, [esp+KTRAP_FRAME_EBX] + mov esi, [esp+KTRAP_FRAME_ESI] + mov edi, [esp+KTRAP_FRAME_EDI] + mov ebp, [esp+KTRAP_FRAME_EBP] + mov eax, [esp+KTRAP_FRAME_EAX] + mov edx, [esp+KTRAP_FRAME_EIP] + add esp, KTRAP_FRAME_ESP + jmp edx + _ASM_END +#elif defined(__GNUC__) + __asm__ __volatile__ ( "movl %0, %%esp\n" "movl %c[b](%%esp), %%ebx\n" @@ -216,6 +214,9 @@ [v] "i"(KTRAP_FRAME_ESP) : "%esp" ); +#elif +#error unsupported compiler +#endif UNREACHABLE; } @@ -225,6 +226,18 @@ KiSystemCallTrapReturn(IN PKTRAP_FRAME TrapFrame) { /* Regular interrupt exit, but we only restore EAX as a volatile */ +#if defined(_MSC_VER) + _ASM_BEGIN + mov esp, TrapFrame + mov ebx, [esp+KTRAP_FRAME_EBX] + mov esi, [esp+KTRAP_FRAME_ESI] + mov edi, [esp+KTRAP_FRAME_EDI] + mov ebp, [esp+KTRAP_FRAME_EBP] + mov eax, [esp+KTRAP_FRAME_EAX] + add esp, KTRAP_FRAME_EIP + iret + _ASM_END +#elif defined(__GNUC__) __asm__ __volatile__ ( "movl %0, %%esp\n" @@ -245,6 +258,9 @@ [e] "i"(KTRAP_FRAME_EIP) : "%esp" ); +#elif +#error unsupported compiler +#endif UNREACHABLE; } @@ -254,7 +270,22 @@ KiSystemCallSysExitReturn(IN PKTRAP_FRAME TrapFrame) { /* Restore nonvolatiles, EAX, and do a SYSEXIT back to the user caller */ - __asm__ __volatile__ +#if defined(_MSC_VER) + _ASM_BEGIN + mov esp, TrapFrame + mov ebx, [esp+KTRAP_FRAME_EBX] + mov esi, [esp+KTRAP_FRAME_ESI] + mov edi, [esp+KTRAP_FRAME_EDI] + mov ebp, [esp+KTRAP_FRAME_EBP] + mov eax, [esp+KTRAP_FRAME_EAX] + mov edx, [edx+KTRAP_FRAME_EIP] + mov ecx, [esp+KTRAP_FRAME_ESP] + add esp, KTRAP_FRAME_V86_ES + sti + sysexit + _ASM_END +#elif defined(__GNUC__) + __asm__ __volatile__ ( "movl %0, %%esp\n" "movl %c[s](%%esp), %%esi\n" @@ -278,6 +309,9 @@ [v] "i"(KTRAP_FRAME_V86_ES) : "%esp" ); +#elif +#error unsupported compiler +#endif UNREACHABLE; } @@ -287,7 +321,21 @@ KiTrapReturn(IN PKTRAP_FRAME TrapFrame) { /* Regular interrupt exit */ - __asm__ __volatile__ +#if defined(_MSC_VER) + _ASM_BEGIN + mov esp, TrapFrame + mov eax, [esp+KTRAP_FRAME_EAX] + mov ebx, [esp+KTRAP_FRAME_EBX] + mov ecx, [esp+KTRAP_FRAME_ECX] + mov edx, [esp+KTRAP_FRAME_EDX] + mov esi, [esp+KTRAP_FRAME_ESI] + mov edi, [esp+KTRAP_FRAME_EDI] + mov ebp, [esp+KTRAP_FRAME_EBP] + add esp, KTRAP_FRAME_EIP + iret + _ASM_END +#elif defined(__GNUC__) + __asm__ __volatile__ ( "movl %0, %%esp\n" "movl %c[a](%%esp), %%eax\n" @@ -311,6 +359,9 @@ [e] "i"(KTRAP_FRAME_EIP) : "%esp" ); +#elif +#error unsupported compiler +#endif UNREACHABLE; } @@ -320,6 +371,20 @@ KiEditedTrapReturn(IN PKTRAP_FRAME TrapFrame) { /* Regular interrupt exit */ +#if defined(_MSC_VER) + _ASM_BEGIN + mov esp, TrapFrame + mov eax, [esp+KTRAP_FRAME_EAX] + mov ebx, [esp+KTRAP_FRAME_EBX] + mov ecx, [esp+KTRAP_FRAME_ECX] + mov edx, [esp+KTRAP_FRAME_EDX] + mov esi, [esp+KTRAP_FRAME_ESI] + mov edi, [esp+KTRAP_FRAME_EDI] + mov ebp, [esp+KTRAP_FRAME_EBP] + add esp, KTRAP_FRAME_ERROR_CODE /* We *WANT* the error code since ESP is there! */ + iret + _ASM_END +#elif defined(__GNUC__) __asm__ __volatile__ ( "movl %0, %%esp\n" @@ -345,6 +410,9 @@ [e] "i"(KTRAP_FRAME_ERROR_CODE) /* We *WANT* the error code since ESP is there! */ : "%esp" ); +#elif +#error unsupported compiler +#endif UNREACHABLE; } @@ -357,9 +425,11 @@ KiExitTrap(IN PKTRAP_FRAME TrapFrame, IN UCHAR Skip) { - KTRAP_EXIT_SKIP_BITS SkipBits = { .Bits = Skip }; + KTRAP_EXIT_SKIP_BITS SkipBits; PULONG ReturnStack; + SkipBits.Bits = Skip; + /* Debugging checks */ KiExitTrapDebugChecks(TrapFrame, SkipBits);

1 0

[jcatena] 45274: added UNREACHABLE defs
by jcatena＠svn.reactos.org 26 Jan '10

26 Jan '10

Author: jcatena Date: Tue Jan 26 21:25:31 2010 New Revision: 45274 URL: http://svn.reactos.org/svn/reactos?rev=45274&view=rev Log: added UNREACHABLE defs Modified: branches/jcatena-branch/include/reactos/gnuc/i386/platf.h branches/jcatena-branch/include/reactos/i386/reactos_cfg.h branches/jcatena-branch/include/reactos/msc/i386/msc.h branches/jcatena-branch/include/reactos/msc/i386/platf.h Modified: branches/jcatena-branch/include/reactos/gnuc/i386/platf.h URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/include/reactos/… ============================================================================== --- branches/jcatena-branch/include/reactos/gnuc/i386/platf.h [iso-8859-1] (original) +++ branches/jcatena-branch/include/reactos/gnuc/i386/platf.h [iso-8859-1] Tue Jan 26 21:25:31 2010 @@ -23,6 +23,7 @@ #define _LOADDS _ERR_UNSUPPORTED #define _DLLEXPORT __declspec(dllexport) #define _DLLIMPORT __declspec(dllimport) +#define _NORETURN __declspec(noreturn) #define _ALIGN(x) __declspec(aligned(x)) #define _PACK(x) __pragma(pack(push, x)) @@ -41,6 +42,7 @@ #define _NOWARN_POP #define _NOWARN_MSC(x) #define _NOWARN_GNUC(x) +#define _ASSUME(x) #define _SECTION(x) __declspec((section(sectn))) #define _SECTION_FN(sectn, fn) __declspec((section(sectn))) @@ -185,15 +187,22 @@ #define SIZTMAX 0xFFFFFFFF typedef i32u sizt, *psizt, _NEAR *npsizt, _FAR *npsizt, _FARH *hpsizt; -/************************************************************************* - -*************************************************************************/ // debug #if _DEBUG #define dbgref TX("(") TX(__FILE__) TX(":") TX(sfy(__LINE__)) TX(":") TX(__FUNCTION__) TX(")") #else #define dbgref 0 #endif + +// +#ifdef __GNUC__ +#if __GNUC__ * 100 + __GNUC_MINOR__ >= 405 +#define _UNREACHABLE __builtin_unreachable() +#else +#define _UNREACHABLE __builtin_trap() +#endif +#define UNREACHABLE _UNREACHABLE +#define _noreturn() _UNREACHABLE #define _ReturnAddress() (__builtin_return_address(0)) #define ReturnAddress _ReturnAddress Modified: branches/jcatena-branch/include/reactos/i386/reactos_cfg.h URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/include/reactos/… ============================================================================== --- branches/jcatena-branch/include/reactos/i386/reactos_cfg.h [iso-8859-1] (original) +++ branches/jcatena-branch/include/reactos/i386/reactos_cfg.h [iso-8859-1] Tue Jan 26 21:25:31 2010 @@ -8,12 +8,11 @@ // #define CONFIG_SMP #define __REACTOS__ +#define _X86_ -#if defined(_M_IX86) #define KERNEL_STACK_SIZE 0x6000 #define KERNEL_LARGE_STACK_SIZE 0xf000 #define KERNEL_LARGE_STACK_COMMIT 0x6000 -#endif #include <osver.h> #include <platf.h> Modified: branches/jcatena-branch/include/reactos/msc/i386/msc.h URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/include/reactos/… ============================================================================== --- branches/jcatena-branch/include/reactos/msc/i386/msc.h [iso-8859-1] (original) +++ branches/jcatena-branch/include/reactos/msc/i386/msc.h [iso-8859-1] Tue Jan 26 21:25:31 2010 @@ -14,6 +14,8 @@ #define __inline__ _INLINE #define FORCEINLINE _INLINEF +#define DECLSPEC_NORETURN _NORETURN +#define FASTCALL _FASTCALL #define __attribute__(packed) #endif Modified: branches/jcatena-branch/include/reactos/msc/i386/platf.h URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/include/reactos/… ============================================================================== --- branches/jcatena-branch/include/reactos/msc/i386/platf.h [iso-8859-1] (original) +++ branches/jcatena-branch/include/reactos/msc/i386/platf.h [iso-8859-1] Tue Jan 26 21:25:31 2010 @@ -22,6 +22,7 @@ #define _LOADDS _ERR_UNSUPPORTED #define _DLLEXPORT __declspec(dllexport) #define _DLLIMPORT __declspec(dllimport) +#define _NORETURN __declspec(noreturn) #define _ALIGN(x) __declspec(align(x)) #define _PACKN(x) __pragma(pack(push, x)) @@ -38,6 +39,7 @@ #define _NOWARN_POP __pragma(warning(pop)) #define _NOWARN_MSC(x) __pragma(warning(disable: x)) #define _NOWARN_GNUC(x) +#define _ASSUME(x) __assume(x) #define _SECTION(x) __declspec(allocate(x)) #define _SECTION_FN(sectn, fn) __pragma(alloc_text(sectn, fn)) @@ -182,15 +184,17 @@ #define SIZTMAX 0xFFFFFFFF typedef i32u sizt, *psizt, _NEAR *npsizt, _FAR *lpsizt, _FARH *hpsizt; -/************************************************************************* - -*************************************************************************/ // debug #if _DEBUG #define dbgref TX("(") TX(__FILE__) TX(":") TX(sfy(__LINE__)) TX(":") TX(__FUNCTION__) TX(")") #else #define dbgref 0 #endif + +// +_NORETURN _INLINEF void _noreturn(void) {_ASSUME(0);}; +#define _UNREACHABLE _ASSUME(0); _noreturn() +#define UNREACHABLE _UNREACHABLE pvoid _ReturnAddress(void); #pragma intrinsic(_ReturnAddress) @@ -199,5 +203,5 @@ #define ReturnAddressn _ReturnAddressn #define __builtin_expect(x, v) (x) -#include <msc.h> // additional compatibility defs that would not be needed if code uses macros defined here instead of compiler specific directives - +#include <msc.h> // should not be needed if code uses above macros instead of compiler dependent directives +

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs