Ros-diffs January 2010

ros-diffs@reactos.org

26 participants
522 discussions

[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

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

14 years, 9 months

[jcatena] 45275: trap_x.h: implemented msvc counterparts

by jcatena＠svn.reactos.org

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);

14 years, 9 months

[jcatena] 45274: added UNREACHABLE defs

by jcatena＠svn.reactos.org

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 +

14 years, 9 months

[cfinck] 45273: - Removed the unneeded -gstabs+ flag as the debug symbols of all toolchain binaries are stripped off anyway after the build. - Do some basic checks to verify that we're really in a checkout directory before cleaning it. - Fix the architecture environment variable in RosBE-Unix. - Consider the ROS_AUTOMAKE and ROS_CDOUTPUT variables when cleaning. The default makefile is always "makefile-ARCH.auto" now, also for i386. Will be changed in the tree as well once we all update to 1.5.

by cfinck＠svn.reactos.org

Author: cfinck Date: Tue Jan 26 21:17:49 2010 New Revision: 45273 URL: http://svn.reactos.org/svn/reactos?rev=45273&view=rev Log: - Removed the unneeded -gstabs+ flag as the debug symbols of all toolchain binaries are stripped off anyway after the build. - Do some basic checks to verify that we're really in a checkout directory before cleaning it. - Fix the architecture environment variable in RosBE-Unix. - Consider the ROS_AUTOMAKE and ROS_CDOUTPUT variables when cleaning. The default makefile is always "makefile-ARCH.auto" now, also for i386. Will be changed in the tree as well once we all update to 1.5. - Leave out RosBE-Unix' version number for GCC's --with-pkgversion parameter as this could be misleading for future updates. - Many code simplifications Removed: trunk/tools/RosBE/RosBE-Unix/Base-i386/scripts/i386/clean.sh Modified: trunk/tools/RosBE/RosBE-Unix/Base-i386/RosBE-Builder.sh trunk/tools/RosBE/RosBE-Unix/Base-i386/scripts/RosBE-rc trunk/tools/RosBE/RosBE-Unix/Base-i386/scripts/RosBE.sh trunk/tools/RosBE/RosBE-Unix/Base-i386/scripts/charch.sh trunk/tools/RosBE/RosBE-Unix/Base-i386/scripts/clean.sh trunk/tools/RosBE/RosBE-Unix/Base-i386/scripts/i386/setvars.sh trunk/tools/RosBE/RosBE-Unix/Base-i386/scripts/rosbelibrary.sh trunk/tools/RosBE/RosBE-Unix/Base-i386/scripts/version.sh trunk/tools/RosBE/RosBE-Windows/Buildtoolchain/rosbe_1.5/buildtoolchain.sh trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd 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 21:17:49 2010 @@ -11,7 +11,7 @@ rs_host_cflags="-pipe -O2" rs_needed_tools="bison flex gcc g++ grep makeinfo" # GNU Make has a special check rs_target="mingw32" -rs_target_cflags="-pipe -gstabs+ -O2 -march=pentium -mtune=i686" +rs_target_cflags="-pipe -O2 -march=pentium -mtune=i686" # Get the absolute path to the script directory cd `dirname $0` @@ -295,7 +295,7 @@ export CFLAGS_FOR_TARGET="$rs_target_cflags" export CXXFLAGS_FOR_TARGET="$rs_target_cflags" - rs_do_command ../gcc/configure --prefix="$rs_prefixdir" --target="$rs_target" --with-gmp="$rs_supportprefixdir" --with-mpfr="$rs_supportprefixdir" --with-pkgversion="RosBE-Unix $ROSBE_VERSION" --enable-languages=c,c++ --enable-checking=release --enable-version-specific-runtime-libs --disable-shared --disable-nls --disable-werror + rs_do_command ../gcc/configure --prefix="$rs_prefixdir" --target="$rs_target" --with-gmp="$rs_supportprefixdir" --with-mpfr="$rs_supportprefixdir" --with-pkgversion="RosBE-Unix" --enable-languages=c,c++ --enable-checking=release --enable-version-specific-runtime-libs --disable-shared --disable-nls --disable-werror rs_do_command $rs_makecmd -j $rs_cpucount rs_do_command $rs_makecmd install rs_clean_module "gcc" Modified: trunk/tools/RosBE/RosBE-Unix/Base-i386/scripts/RosBE-rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/Base-i386/s… ============================================================================== --- trunk/tools/RosBE/RosBE-Unix/Base-i386/scripts/RosBE-rc [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Unix/Base-i386/scripts/RosBE-rc [iso-8859-1] Tue Jan 26 21:17:49 2010 @@ -1,7 +1,3 @@ -# Set path -source "$_ROSBE_ROSSCRIPTDIR/rosbelibrary.sh" -set_path_variable - # Set aliases alias basedir="source $_ROSBE_ROSSCRIPTDIR/basedir.sh" alias charch="source $_ROSBE_ROSSCRIPTDIR/charch.sh" 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 21:17:49 2010 @@ -2,7 +2,7 @@ # # Script for initializing RosBE # Part of RosBE for Unix-based Operating Systems -# Copyright 2007-2009 Colin Finck <colin(a)reactos.org> +# Copyright 2007-2010 Colin Finck <colin(a)reactos.org> # # Released under GNU GPL v2 or any later version. @@ -20,7 +20,7 @@ export _ROSBE_ROSSCRIPTDIR="$PWD" # Save the current PATH variable -export _ROSBE_OLDPATH="$PATH" +export _ROSBE_OLDPATH="$_ROSBE_ROSSCRIPTDIR/bin:$PATH" # Make sure that some important variables are clean export HOST= @@ -44,15 +44,8 @@ # Set the architecture to build for source "$_ROSBE_ROSSCRIPTDIR/rosbelibrary.sh" -if [ "$3" = "" ]; then - # No architecture specified, fall back to i386 without any message - export _ROSBE_ARCH="i386" -else - # Try to set the architecture to the one specified - change_architecture $3 -fi - -source "$_ROSBE_ROSSCRIPTDIR/$_ROSBE_ARCH/setvars.sh" +# Try to set the architecture to the one specified or fallback to "i386" +change_architecture "$3:-i386" # Display banner echo "*******************************************************************************" Modified: trunk/tools/RosBE/RosBE-Unix/Base-i386/scripts/charch.sh URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/Base-i386/s… ============================================================================== --- trunk/tools/RosBE/RosBE-Unix/Base-i386/scripts/charch.sh [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Unix/Base-i386/scripts/charch.sh [iso-8859-1] Tue Jan 26 21:17:49 2010 @@ -2,7 +2,7 @@ # # Change the current target build tools to an architecture to build for # Part of RosBE for Unix-based Operating Systems -# Copyright 2009 Colin Finck <mail(a)colinfinck.de> +# Copyright 2009-2010 Colin Finck <colin(a)reactos.org> # # Released under GNU GPL v2 or any later version. @@ -18,8 +18,6 @@ # Change the architecture source "$_ROSBE_ROSSCRIPTDIR/rosbelibrary.sh" change_architecture $1 -source "$_ROSBE_ROSSCRIPTDIR/$_ROSBE_ARCH/setvars.sh" -set_path_variable # Display tool versions -source "$_ROSBE_ROSSCRIPTDIR/$_ROSBE_ARCH/version.sh" +source "$_ROSBE_ROSSCRIPTDIR/$ROS_ARCH/version.sh" 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 21:17:49 2010 @@ -2,10 +2,27 @@ # # Script for cleaning the ReactOS source directory # Part of RosBE for Unix-based Operating Systems -# Copyright 2007-2009 Colin Finck <mail(a)colinfinck.de> +# Copyright 2007-2010 Colin Finck <colin(a)reactos.org> # # Released under GNU GPL v2 or any later version. -pushd "$_ROSBE_ROSSOURCEDIR" >& /dev/null -source "$_ROSBE_ROSSCRIPTDIR/$_ROSBE_ARCH/clean.sh" -popd >& /dev/null +# 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." + +# 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. +if [ -d "$ROS_INTERMEDIATE" ] && [ -d "$ROS_OUTPUT" ]; then + echo "Cleaning ReactOS $ROS_ARCH source directory..." + + rm -f "$ROS_AUTOMAKE" + rm -rf "$ROS_INTERMEDIATE" + rm -rf "$ROS_OUTPUT" + rm -rf "$ROS_CDOUTPUT" + + echo "Done cleaning ReactOS $ROS_ARCH source directory." +else + echo "ERROR: There is no $ROS_ARCH compiler output to clean." +fi Removed: trunk/tools/RosBE/RosBE-Unix/Base-i386/scripts/i386/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/i386/clean.sh [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Unix/Base-i386/scripts/i386/clean.sh (removed) @@ -1,18 +1,0 @@ -# Clean i386 source directories -# Part of RosBE for Unix-based Operating Systems -# Copyright 2009 Colin Finck <mail(a)colinfinck.de> -# -# Released under GNU GPL v2 or any later version. - -if [ -d "obj-i386" ]; then - echo "Cleaning ReactOS i386 source directory..." - - rm -rf "obj-i386" - rm -rf "output-i386" - rm -rf "reactos." - rm -f "makefile.auto" - - echo "Done cleaning ReactOS i386 source directory." -else - echo "ERROR: There is no i386 compiler output to clean." -fi Modified: trunk/tools/RosBE/RosBE-Unix/Base-i386/scripts/i386/setvars.sh URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/Base-i386/s… ============================================================================== --- trunk/tools/RosBE/RosBE-Unix/Base-i386/scripts/i386/setvars.sh [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Unix/Base-i386/scripts/i386/setvars.sh [iso-8859-1] Tue Jan 26 21:17:49 2010 @@ -1,8 +1,8 @@ # Set architecture-specific environment variables # Part of RosBE for Unix-based Operating Systems -# Copyright 2009 Colin Finck <mail(a)colinfinck.de> +# Copyright 2009-2010 Colin Finck <colin(a)reactos.org> # # Released under GNU GPL v2 or any later version. -export ROSBE_TARGET_CFLAGS="-I$_ROSBE_ROSSCRIPTDIR/i386/lib/gcc/mingw32/4.1.3/include -I$_ROSBE_ROSSCRIPTDIR/i386/mingw32/include" -export ROSBE_TARGET_CXXFLAGS="-I$_ROSBE_ROSSCRIPTDIR/i386/include/c++/4.1.3 -I$_ROSBE_ROSSCRIPTDIR/i386/include/c++/4.1.3/mingw32 -I$_ROSBE_ROSSCRIPTDIR/i386/include/c++/4.1.3/backward -I$_ROSBE_ROSSCRIPTDIR/i386/lib/gcc/mingw32/4.1.3/include -I$_ROSBE_ROSSCRIPTDIR/i386/mingw32/include" +export ROSBE_TARGET_CFLAGS=`mingw32-cpp -x c -v < /dev/null 2>&1 | $_ROSBE_ROSSCRIPTDIR/bin/getincludes` +export ROSBE_TARGET_CXXFLAGS=`mingw32-cpp -x c++ -v < /dev/null 2>&1 | $_ROSBE_ROSSCRIPTDIR/bin/getincludes` Modified: trunk/tools/RosBE/RosBE-Unix/Base-i386/scripts/rosbelibrary.sh URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/Base-i386/s… ============================================================================== --- trunk/tools/RosBE/RosBE-Unix/Base-i386/scripts/rosbelibrary.sh [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Unix/Base-i386/scripts/rosbelibrary.sh [iso-8859-1] Tue Jan 26 21:17:49 2010 @@ -1,10 +1,10 @@ # Shared functions for RosBE-Unix components # Part of RosBE for Unix-based Operating Systems -# Copyright 2009 Colin Finck <mail(a)colinfinck.de> +# Copyright 2009-2010 Colin Finck <colin(a)reactos.org> # # Released under GNU GPL v2 or any later version. -# Check whether the given architecture is supported and if so, change the _ROSBE_ARCH variable appropriately +# Check whether the given architecture is supported and if so, change the ROS_ARCH variable appropriately # Parameter 1: The architecture to set change_architecture() { @@ -12,14 +12,17 @@ if [ -f "$_ROSBE_ROSSCRIPTDIR/$new_arch/version.sh" ]; then # Architecture parameter seems valid - _ROSBE_ARCH="$new_arch" + ROS_ARCH="$new_arch" else echo "Unsupported architecture specified, falling back to i386!" echo - _ROSBE_ARCH="i386" + ROS_ARCH="i386" fi - export _ROSBE_ARCH + export PATH="$_ROSBE_ROSSCRIPTDIR/$ROS_ARCH/bin:$_ROSBE_OLDPATH" + export ROS_ARCH + + source "$_ROSBE_ROSSCRIPTDIR/$ROS_ARCH/setvars.sh" } # Check whether we're running as root and warn the user in case we don't @@ -43,10 +46,3 @@ fi fi } - -# Set the PATH variable properly for the specified architecture -set_path_variable() -{ - # Set the PATH - PATH="$_ROSBE_ROSSCRIPTDIR/$_ROSBE_ARCH/bin:$_ROSBE_ROSSCRIPTDIR/bin:$_ROSBE_OLDPATH" -} Modified: trunk/tools/RosBE/RosBE-Unix/Base-i386/scripts/version.sh URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/Base-i386/s… ============================================================================== --- trunk/tools/RosBE/RosBE-Unix/Base-i386/scripts/version.sh [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Unix/Base-i386/scripts/version.sh [iso-8859-1] Tue Jan 26 21:17:49 2010 @@ -2,7 +2,7 @@ # # Show the tool versions # Part of RosBE for Unix-based Operating Systems -# Copyright 2007-2009 Colin Finck <mail(a)colinfinck.de> +# Copyright 2007-2010 Colin Finck <colin(a)reactos.org> # # Released under GNU GPL v2 or any later version. @@ -15,9 +15,9 @@ # Environment Information rs_boldmsg "Environment Information" -echo "Selected Target Architecture: $_ROSBE_ARCH" +echo "Selected Target Architecture: $ROS_ARCH" echo # Display tool versions rs_boldmsg "Build Tools" -source "$_ROSBE_ROSSCRIPTDIR/$_ROSBE_ARCH/version.sh" +source "$_ROSBE_ROSSCRIPTDIR/$ROS_ARCH/version.sh" 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 21:17:49 2010 @@ -30,7 +30,7 @@ rs_host_cflags="-pipe -fno-common -O2 -march=pentium3 -mfpmath=sse" # -fno-common needed for native builds due to GCC 4.4 bug according to Dmitry Gorbachev rs_needed_tools="bison flex gcc g++ grep makeinfo" # GNU Make has a special check rs_target="mingw32" -rs_target_cflags="-pipe -gstabs+ -O2 -march=pentium -mtune=i686" +rs_target_cflags="-pipe -O2 -march=pentium -mtune=i686" # Get the absolute path to the script directory cd `dirname $0` Modified: trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Cle… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd [iso-8859-1] Tue Jan 26 21:17:49 2010 @@ -3,7 +3,7 @@ :: LICENSE: GNU General Public License v2. (see LICENSE.txt) :: FILE: Root/Clean.cmd :: PURPOSE: Clean the ReactOS source directory. -:: COPYRIGHT: Copyright 2009 Daniel Reimer <reimer.daniel(a)freenet.de> +:: COPYRIGHT: Copyright 2010 Daniel Reimer <reimer.daniel(a)freenet.de> :: Peter Ward <dralnix(a)gmail.com> :: Colin Finck <colin(a)reactos.org> :: @@ -51,50 +51,40 @@ :: Check if we have any binaries to clean, if so, clean them. :BIN -:: Apply modified obj and out paths for deletion. -if "%_ROSBE_OBJPATH%" == "" ( - set OBJCLEANPATH=obj-%ROS_ARCH% -) else ( - set OBJCLEANPATH=%_ROSBE_OBJPATH% -) +:: Check if the user set any custom filenames or pathes, otherwise locally set the appropriate variables. +if "%ROS_AUTOMAKE%" == "" (set ROS_AUTOMAKE=makefile-%ROS_ARCH%.auto) +if "%ROS_INTERMEDIATE%" == "" (set ROS_INTERMEDIATE=obj-%ROS_ARCH%) +if "%ROS_OUTPUT%" == "" (set ROS_OUTPUT=output-%ROS_ARCH%) +if "%ROS_CDOUTPUT%" == "" (set ROS_CDOUTPUT=reactos) -if "%_ROSBE_OUTPATH%" == "" ( - set OUTCLEANPATH=output-%ROS_ARCH% -) else ( - set OUTCLEANPATH=%_ROSBE_OUTPATH% -) +:: 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. +set IS_SOURCE_DIRECTORY=1 +call :BIN_CHECKEXISTENCE "%ROS_INTERMEDIATE%\." "%ROS_OUTPUT%\." -if /i "%ROS_ARCH%" == "i386" ( - set MAKEFILE=makefile.auto -) else ( - set MAKEFILE=makefile-%ROS_ARCH%.auto -) - -if exist "%MAKEFILE%" ( - del "%MAKEFILE%" 1> NUL 2> NUL -) - -if exist "%OBJCLEANPATH%\." ( +if "%IS_SOURCE_DIRECTORY%" == "1" ( echo Cleaning ReactOS %ROS_ARCH% source directory... - - if exist "%OBJCLEANPATH%\." ( - rd /s /q "%OBJCLEANPATH%" 1> NUL 2> NUL - ) - - if exist "%OUTCLEANPATH%\." ( - rd /s /q "%OUTCLEANPATH%" 1> NUL 2> NUL - ) - + + del "%ROS_AUTOMAKE%" 1>NUL 2>NUL + rd /s /q "%ROS_INTERMEDIATE%" 1>NUL 2>NUL + rd /s /q "%ROS_OUTPUT%" 1>NUL 2>NUL + rd /s /q "%ROS_CDOUTPUT%" 1>NUL 2>NUL + echo Done cleaning ReactOS %ROS_ARCH% source directory. ) else ( - echo ERROR: There is no %ROS_ARCH% compiler output to clean. + echo ERROR: This does not look like a ReactOS %ROS_ARCH% source directory to clean. ) +goto :EOF -if exist "reactos\." ( - rd /s /q "reactos" 1> NUL 2> NUL +:: Check if all given files exist. If one does not, set IS_SOURCE_DIRECTORY to 0. +:BIN_CHECKEXISTENCE +if "%1" == "" (goto :EOF) +if not exist "%1" ( + set IS_SOURCE_DIRECTORY=0 + goto :EOF ) - -goto :EOF +shift /1 +goto :BIN_CHECKEXISTENCE %* :EOC title ReactOS Build Environment %_ROSBE_VERSION% Modified: trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Ros… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd [iso-8859-1] Tue Jan 26 21:17:49 2010 @@ -3,8 +3,8 @@ :: LICENSE: GNU General Public License v2. (see LICENSE.txt) :: FILE: Root/RosBE.cmd :: PURPOSE: This script provides/sets up various build environments for -:: ReactOS. Currently it provides a GCC 4.1.3 build environment. -:: COPYRIGHT: Copyright 2009 Daniel Reimer <reimer.daniel(a)freenet.de> +:: ReactOS. Currently it provides a GCC 4.4.3 build environment. +:: COPYRIGHT: Copyright 2010 Daniel Reimer <reimer.daniel(a)freenet.de> :: Peter Ward <dralnix(a)gmail.com> :: Colin Finck <colin(a)reactos.org> ::

14 years, 9 months

[sir_richard] 45272: [HAL]: Rewrite all V8086-related code in C instead of ASM. Delete v86.s. Makes uses of new macros and developments in NTOS, but should now only end up getting called at shutdown and for bugchecks.

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Tue Jan 26 20:41:31 2010 New Revision: 45272 URL: http://svn.reactos.org/svn/reactos?rev=45272&view=rev Log: [HAL]: Rewrite all V8086-related code in C instead of ASM. Delete v86.s. Makes uses of new macros and developments in NTOS, but should now only end up getting called at shutdown and for bugchecks. Removed: trunk/reactos/hal/halx86/generic/v86.s Modified: trunk/reactos/hal/halx86/generic/bios.c trunk/reactos/hal/halx86/hal_generic.rbuild trunk/reactos/hal/halx86/include/halp.h Modified: trunk/reactos/hal/halx86/generic/bios.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/bios.c?… ============================================================================== --- trunk/reactos/hal/halx86/generic/bios.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/bios.c [iso-8859-1] Tue Jan 26 20:41:31 2010 @@ -40,6 +40,270 @@ PUSHORT HalpSavedIoMap; USHORT HalpSavedIoMapData[32][2]; ULONG HalpSavedIoMapEntries; + +/* Where the protected mode stack is */ +ULONG_PTR HalpSavedEsp; + +/* Where the real mode code ends */ +extern PVOID HalpRealModeEnd; + +/* REAL MODE CODE AND STACK START HERE ****************************************/ + +VOID +DECLSPEC_NORETURN +HalpRealModeStart(VOID) +{ + /* Do the video BIOS interrupt */ + HalpCallBiosInterrupt(VIDEO_SERVICES, (SET_VIDEO_MODE << 8) | (GRAPHICS_MODE_12)); + + /* Issue the BOP */ + KiIssueBop(); + + /* We want the stack to be inside this function so we can map real mode */ + HalpRealModeStack(sizeof(ULONG), PAGE_SIZE / 2); + UNREACHABLE; +} + +/* REAL MODE CODE AND STACK END HERE ******************************************/ + +/* V86 OPCODE HANDLERS ********************************************************/ + +BOOLEAN +FASTCALL +HalpOpcodeInvalid(IN PHAL_BIOS_FRAME BiosFrame) +{ + /* Print error message */ + DPRINT1("HAL: An invalid V86 opcode was encountered at address %x:%x\n", + BiosFrame->SegCs, BiosFrame->Eip); + + /* Break */ + DbgBreakPoint(); + return FALSE; +} + +BOOLEAN +FASTCALL +HalpPushInt(IN PHAL_BIOS_FRAME BiosFrame, + IN ULONG Interrupt) +{ + PUSHORT Stack; + ULONG Eip; + + /* Calculate stack address (SP) */ + Stack = (PUSHORT)(BiosFrame->SsBase + (BiosFrame->Esp & 0xFFFF)); + + /* Push EFlags */ + Stack--; + *Stack = BiosFrame->EFlags & 0xFFFF; + + /* Push CS */ + Stack--; + *Stack = BiosFrame->SegCs & 0xFFFF; + + /* Push IP */ + Stack--; + *Stack = BiosFrame->Eip & 0xFFFF; + + /* Compute new CS:IP from the IVT address for this interrupt entry */ + Eip = *(PULONG)(Interrupt * 4); + BiosFrame->Eip = Eip & 0xFFFF; + BiosFrame->SegCs = Eip >> 16; + + /* Update stack address */ + BiosFrame->Esp = (ULONG_PTR)Stack & 0xFFFF; + + /* Update CS to linear */ + BiosFrame->CsBase = BiosFrame->SegCs << 4; + BiosFrame->CsLimit = 0xFFFF; + BiosFrame->CsFlags = 0; + + /* We're done */ + return TRUE; +} + +BOOLEAN +FASTCALL +HalpOpcodeINTnn(IN PHAL_BIOS_FRAME BiosFrame) +{ + UCHAR Interrupt; + PKTRAP_FRAME TrapFrame; + + /* Convert SS to linear */ + BiosFrame->SsBase = BiosFrame->SegSs << 4; + BiosFrame->SsLimit = 0xFFFF; + BiosFrame->SsFlags = 0; + + /* Increase EIP and validate */ + BiosFrame->Eip++; + if (BiosFrame->Eip > BiosFrame->CsLimit) return FALSE; + + /* Read interrupt number */ + Interrupt = *(PUCHAR)(BiosFrame->CsBase + BiosFrame->Eip); + + /* Increase EIP and push the interrupt */ + BiosFrame->Eip++; + if (HalpPushInt(BiosFrame, Interrupt)) + { + /* Update the trap frame */ + TrapFrame = BiosFrame->TrapFrame; + TrapFrame->HardwareSegSs = BiosFrame->SegSs; + TrapFrame->HardwareEsp = BiosFrame->Esp; + TrapFrame->SegCs = BiosFrame->SegCs; + TrapFrame->EFlags = BiosFrame->EFlags; + + /* Success */ + return TRUE; + } + + /* Failure */ + return FALSE; +} + +BOOLEAN +FASTCALL +HalpDispatchV86Opcode(IN PKTRAP_FRAME TrapFrame) +{ + UCHAR Instruction; + HAL_BIOS_FRAME BiosFrame; + + /* Fill out the BIOS frame */ + BiosFrame.TrapFrame = TrapFrame; + BiosFrame.SegSs = TrapFrame->HardwareSegSs; + BiosFrame.Esp = TrapFrame->HardwareEsp; + BiosFrame.EFlags = TrapFrame->EFlags; + BiosFrame.SegCs = TrapFrame->SegCs; + BiosFrame.Eip = TrapFrame->Eip; + BiosFrame.Prefix = 0; + + /* Convert CS to linear */ + BiosFrame.CsBase = BiosFrame.SegCs << 4; + BiosFrame.CsLimit = 0xFFFF; + BiosFrame.CsFlags = 0; + + /* Validate IP */ + if (BiosFrame.Eip > BiosFrame.CsLimit) return FALSE; + + /* Read IP */ + Instruction = *(PUCHAR)(BiosFrame.CsBase + BiosFrame.Eip); + if (Instruction != 0xCD) + { + /* We only support INT */ + HalpOpcodeInvalid(&BiosFrame); + return FALSE; + } + + /* Handle the interrupt */ + if (HalpOpcodeINTnn(&BiosFrame)) + { + /* Update EIP */ + TrapFrame->Eip = BiosFrame.Eip; + + /* We're done */ + return TRUE; + } + + /* Failure */ + return FALSE; +} + +/* V86 TRAP HANDLERS **********************************************************/ + +VOID +FASTCALL +DECLSPEC_NORETURN +HalpTrap0DHandler(IN PKTRAP_FRAME TrapFrame) +{ + /* Enter the trap */ + KiEnterTrap(TrapFrame); + + /* Check if this is a V86 trap */ + if (TrapFrame->EFlags & EFLAGS_V86_MASK) + { + /* Dispatch the opcode and exit the trap */ + HalpDispatchV86Opcode(TrapFrame); + KiEoiHelper(TrapFrame); + } + + /* Strange, it isn't! This can happen during NMI */ + DPRINT1("HAL: Trap0D while not in V86 mode\n"); + while (TRUE); +} + +KiTrap(HalpTrap0D, 0); + +VOID +DECLSPEC_NORETURN +HalpTrap06(VOID) +{ + PKTRAP_FRAME TrapFrame; + + /* Restore ES/DS to known good values first */ + Ke386SetEs(KGDT_R3_DATA | RPL_MASK); + Ke386SetDs(KGDT_R3_DATA | RPL_MASK); + + /* Read trap frame address */ + TrapFrame = (PKTRAP_FRAME)HalpSavedEsp; + + /* Restore segments from the trap frame */ + Ke386SetGs(TrapFrame->SegGs); + Ke386SetFs(TrapFrame->SegFs); + Ke386SetEs(TrapFrame->SegEs); + Ke386SetDs(TrapFrame->SegDs); + + /* Restore EFlags */ + __writeeflags(TrapFrame->EFlags); + + /* Exit the V86 mode trap frame */ + KiCallReturn(TrapFrame); +} + +/* V8086 ENTER ****************************************************************/ + +VOID +FASTCALL +DECLSPEC_NORETURN +HalpBiosCallHandler(IN PKTRAP_FRAME TrapFrame) +{ + /* Must be volatile so it doesn't get optimized away! */ + volatile KTRAP_FRAME V86TrapFrame; + ULONG_PTR StackOffset, CodeOffset; + + /* Fill out the quick-n-dirty trap frame */ + TrapFrame->EFlags = __readeflags(); + TrapFrame->SegGs = Ke386GetGs(); + TrapFrame->SegFs = Ke386GetFs(); + TrapFrame->SegEs = Ke386GetEs(); + TrapFrame->SegDs = Ke386GetDs(); + + /* Our stack (the frame) */ + HalpSavedEsp = (ULONG_PTR)TrapFrame; + + /* Kill alignment faults */ + __writecr0(__readcr0() & ~CR0_AM); + + /* Set new stack address */ + KeGetPcr()->TSS->Esp0 = HalpSavedEsp - sizeof(FX_SAVE_AREA); + + /* Compute segmented IP and SP offsets */ + StackOffset = (ULONG_PTR)&HalpRealModeEnd - 4 - (ULONG_PTR)HalpRealModeStart; + CodeOffset = (ULONG_PTR)HalpRealModeStart & 0xFFF; + + /* Now build the V86 trap frame */ + V86TrapFrame.V86Es = 0; + V86TrapFrame.V86Ds = 0; + V86TrapFrame.V86Gs = 0; + V86TrapFrame.V86Fs = 0; + V86TrapFrame.HardwareSegSs = 0x2000; + V86TrapFrame.HardwareEsp = StackOffset + CodeOffset; + V86TrapFrame.EFlags = __readeflags() | EFLAGS_V86_MASK | EFLAGS_IOPL; + V86TrapFrame.SegCs = 0x2000; + V86TrapFrame.Eip = CodeOffset; + + /* Exit to V86 mode */ + KiDirectTrapReturn((PKTRAP_FRAME)&V86TrapFrame); +} + +KiTrampoline(HalpBiosCall, KI_PUSH_FAKE_ERROR_CODE | KI_NONVOLATILES_ONLY); /* FUNCTIONS ******************************************************************/ Removed: trunk/reactos/hal/halx86/generic/v86.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/v86.s?r… ============================================================================== --- trunk/reactos/hal/halx86/generic/v86.s [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/v86.s (removed) @@ -1,435 +1,0 @@ -/* - * FILE: hal/halx86/generic/bios.S - * COPYRIGHT: See COPYING in the top level directory - * PURPOSE: V8086 Real-Mode BIOS Thunking - * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) - */ - -/* INCLUDES ******************************************************************/ - -#include <asm.h> -#include <internal/i386/asmmacro.S> -.intel_syntax noprefix - -// -// HAL BIOS Frame -// -#define HALP_BIOS_FRAME_SS 0x00 -#define HALP_BIOS_FRAME_ESP 0x04 -#define HALP_BIOS_FRAME_EFLAGS 0x08 -#define HALP_BIOS_FRAME_CS 0x0C -#define HALP_BIOS_FRAME_EIP 0x10 -#define HALP_BIOS_FRAME_TRAP_FRAME 0x14 -#define HALP_BIOS_FRAME_CS_LIMIT 0x18 -#define HALP_BIOS_FRAME_CS_BASE 0x1C -#define HALP_BIOS_FRAME_CS_FLAGS 0x20 -#define HALP_BIOS_FRAME_SS_LIMIT 0x24 -#define HALP_BIOS_FRAME_SS_BASE 0x28 -#define HALP_BIOS_FRAME_SS_FLAGS 0x2C -#define HALP_BIOS_FRAME_PREFIX 0x30 -#define HALP_BIOS_FRAME_LENGTH 0x34 - -/* GLOBALS *******************************************************************/ - -_HalpSavedEsp: - .long 0 - -_InvalidMsg: - .asciz "HAL: An invalid V86 opcode was encountered at address %x:%x\n" - -_InvalidGpfMsg: - .asciz "HAL: Trap0D while not in V86 mode\n" - -_UnhandledMsg: - .asciz "\n\x7\x7!!! Unhandled or Unexpected Code at line: %lx [%s]!!!\n" - -/* FUNCTIONS *****************************************************************/ - -.globl _HalpBiosCall@0 -.func HalpBiosCall@0 -_HalpBiosCall@0: - - /* Set up stack pointer */ - push ebp - mov ebp, esp - - /* Build a trap frame */ - pushfd - push edi - push esi - push ebx - push ds - push es - push fs - push gs - push offset _HalpRealModeEnd - - /* Save the stack */ - mov _HalpSavedEsp, esp - - /* Turn off alignment faults */ - mov eax, cr0 - and eax, ~CR0_AM - mov cr0, eax - - /* Setup a new stack */ - mov esi, fs:KPCR_TSS - mov eax, esp - sub eax, NPX_FRAME_LENGTH - mov [esi+KTSS_ESP0], eax - - /* Save V86 registers */ - push 0 - push 0 - push 0 - push 0 - push 0x2000 - - /* Get linear delta between stack and code */ - mov eax, offset _HalpRealModeEnd-4 - sub eax, offset _HalpRealModeStart - - /* Get offset of code */ - mov edx, offset _HalpRealModeStart - and edx, 0xFFF - - /* Add offset to linear address and save the new V86 SP */ - add eax, edx - push eax - - /* Start building interrupt frame. Setup V86 EFLAGS and IOPL 3 */ - pushfd - or dword ptr [esp], EFLAGS_V86_MASK - or dword ptr [esp], 0x3000 - - /* Push the CS and IP */ - push 0x2000 - push edx - - /* Do the interrupt return (jump to V86 mode) */ - iretd - -.globl _HalpRealModeStart -_HalpRealModeStart: - - /* Set mode 13 */ - mov ax, 0x12 - .byte 0 - .byte 0 - - /* Do the interrupt */ - int 0x10 - - /* BOP to exit V86 mode */ - .byte 0xC4 - .byte 0xC4 - - /* The stack lives here */ -.align 4 - .space 2048 -.globl _HalpRealModeEnd -_HalpRealModeEnd: - - /* We're back, clean up the trap frame */ - pop gs - pop fs - pop es - pop ds - pop ebx - pop esi - pop edi - popfd - - /* Return to caller */ - pop ebp - ret 0 -.endfunc - -.globl _HalpOpcodeInvalid@0 -.func HalpOpcodeInvalid@0 -_HalpOpcodeInvalid@0: - - /* This should never happen -- is the IOPM damaged? */ - push [esi+HALP_BIOS_FRAME_EIP] - push [esi+HALP_BIOS_FRAME_CS] - push offset _InvalidMsg - call _DbgPrint - add esp, 12 - - /* Break */ - int 3 - - /* Nothing to return */ - xor eax, eax - ret 0 -.endfunc - -.globl _HalpPushInt@0 -.func HalpPushInt@0 -_HalpPushInt@0: - - /* Save EBX */ - push ebx - - /* Get SS offset and base */ - mov edx, [esi+HALP_BIOS_FRAME_ESP] - mov ebx, [esi+HALP_BIOS_FRAME_SS_BASE] - - /* Convert to 16-bits */ - and edx, 0xFFFF - sub dx, 2 - - /* Get EFLAGS and write them into the linear address of SP */ - mov ax, word ptr [esi+HALP_BIOS_FRAME_EFLAGS] - mov [ebx+edx], ax - sub dx, 2 - - /* Get CS segment and write it into SP */ - mov ax, word ptr [esi+HALP_BIOS_FRAME_CS] - mov [ebx+edx], ax - sub dx, 2 - - /* Get IP and write it into SP */ - mov ax, word ptr [esi+HALP_BIOS_FRAME_EIP] - mov [ebx+edx], ax - - /* Get new IP value (the interrupt ID is in ECX, so this is in the IVT) */ - mov eax, [ecx*4] - push eax - - /* Now save the new IP */ - movzx eax, ax - mov [esi+HALP_BIOS_FRAME_EIP], eax - - /* Save the new CS of this IP */ - pop eax - shr eax, 16 - mov [esi+HALP_BIOS_FRAME_CS], eax - - /* Update the stack pointer after our manual interrupt frame construction */ - mov word ptr [esi+HALP_BIOS_FRAME_ESP], dx - - /* Get CS and convert it to linear format */ - mov eax, [esi+HALP_BIOS_FRAME_CS] - shl eax, 4 - mov [esi+HALP_BIOS_FRAME_CS_BASE], eax - mov dword ptr [esi+HALP_BIOS_FRAME_CS_LIMIT], 0xFFFF - mov dword ptr [esi+HALP_BIOS_FRAME_CS_FLAGS], 0 - - /* Return success and restore EBX */ - mov eax, 1 - pop ebx - ret 0 -.endfunc - -.globl _HalpOpcodeINTnn@0 -.func HalpOpcodeINTnn@0 -_HalpOpcodeINTnn@0: - - /* Save non-volatiles and stack */ - push ebp - push esi - push ebx - - /* Get SS and convert it to linear format */ - mov eax, [esi+HALP_BIOS_FRAME_SS] - shl eax, 4 - mov [esi+HALP_BIOS_FRAME_SS_BASE], eax - mov dword ptr [esi+HALP_BIOS_FRAME_SS_LIMIT], 0xFFFF - mov dword ptr [esi+HALP_BIOS_FRAME_SS_FLAGS], 0 - - /* Increase IP and check if we're past the CS limit */ - inc dword ptr [esi+HALP_BIOS_FRAME_EIP] - mov edi, [esi+HALP_BIOS_FRAME_EIP] - cmp edi, [esi+HALP_BIOS_FRAME_CS_LIMIT] - ja EipLimitReached - - /* Convert IP to linear address and read the interrupt number */ - add edi, [esi+HALP_BIOS_FRAME_CS_BASE] - movzx ecx, byte ptr [edi] - - /* Increase EIP and do the interrupt, check for status */ - inc dword ptr [esi+HALP_BIOS_FRAME_EIP] - call _HalpPushInt@0 - test eax, 0xFFFF - jz Done - - /* Update the trap frame */ - mov ebp, [esi+HALP_BIOS_FRAME_TRAP_FRAME] - mov eax, [esi+HALP_BIOS_FRAME_SS] - mov [ebp+KTRAP_FRAME_SS], eax - mov eax, [esi+HALP_BIOS_FRAME_ESP] - mov [ebp+KTRAP_FRAME_ESP], eax - mov eax, [esi+HALP_BIOS_FRAME_CS] - mov [ebp+KTRAP_FRAME_CS], eax - mov eax, [esi+HALP_BIOS_FRAME_EFLAGS] - mov [ebp+KTRAP_FRAME_EFLAGS], eax - - /* Set success code */ - mov eax, 1 - -Done: - /* Restore volatiles */ - pop ebx - pop edi - pop ebp - ret 0 - -EipLimitReached: - /* Set failure code */ - xor eax, eax - jmp Done -.endfunc - -.globl _HalpDispatchV86Opcode@0 -.func HalpDispatchV86Opcode@0 -_HalpDispatchV86Opcode@0: - - /* Make space for the HAL BIOS Frame on the stack */ - push ebp - mov ebp, esp - sub esp, HALP_BIOS_FRAME_LENGTH - - /* Save non-volatiles */ - push esi - push edi - - /* Save pointer to the trap frame */ - mov esi, [ebp] - mov [ebp-HALP_BIOS_FRAME_LENGTH+HALP_BIOS_FRAME_TRAP_FRAME], esi - - /* Save SS */ - movzx eax, word ptr [esi+KTRAP_FRAME_SS] - mov [ebp-HALP_BIOS_FRAME_LENGTH+HALP_BIOS_FRAME_SS], eax - - /* Save ESP */ - mov eax, [esi+KTRAP_FRAME_ESP] - mov [ebp-HALP_BIOS_FRAME_LENGTH+HALP_BIOS_FRAME_ESP], eax - - /* Save EFLAGS */ - mov eax, [esi+KTRAP_FRAME_EFLAGS] - mov [ebp-HALP_BIOS_FRAME_LENGTH+HALP_BIOS_FRAME_EFLAGS], eax - - /* Save CS */ - movzx eax, word ptr [esi+KTRAP_FRAME_CS] - mov [ebp-HALP_BIOS_FRAME_LENGTH+HALP_BIOS_FRAME_CS], eax - - /* Save EIP */ - mov eax, [esi+KTRAP_FRAME_EIP] - mov [ebp-HALP_BIOS_FRAME_LENGTH+HALP_BIOS_FRAME_EIP], eax - - /* No prefix */ - xor eax, eax - mov [ebp-HALP_BIOS_FRAME_LENGTH+HALP_BIOS_FRAME_PREFIX], eax - - /* Set pointer to HAL BIOS Frame */ - lea esi, [ebp-HALP_BIOS_FRAME_LENGTH] - - /* Convert CS to linear format */ - mov eax, [esi+HALP_BIOS_FRAME_CS] - shl eax, 4 - mov [esi+HALP_BIOS_FRAME_CS_BASE], eax - mov dword ptr [esi+HALP_BIOS_FRAME_CS_LIMIT], 0xFFFF - mov dword ptr [esi+HALP_BIOS_FRAME_CS_FLAGS], 0 - - /* Make sure IP is within the CS Limit */ - mov edi, [esi+HALP_BIOS_FRAME_EIP] - cmp edi, [esi+HALP_BIOS_FRAME_CS_LIMIT] - ja DispatchError - - /* Convert IP to linear address and read the opcode */ - add edi, [esi+HALP_BIOS_FRAME_CS_BASE] - mov dl, [edi] - - /* We only deal with interrupts */ - cmp dl, 0xCD - je DispatchInt - - /* Anything else is invalid */ - call _HalpOpcodeInvalid@0 - jmp DispatchError - -DispatchInt: - /* Handle dispatching the interrupt */ - call _HalpOpcodeINTnn@0 - test eax, 0xFFFF - jz DispatchReturn - - /* Update the trap frame EIP */ - mov edi, [ebp-0x20] - mov eax, [ebp-0x24] - mov [edi+KTRAP_FRAME_EIP], eax - - /* Set success code */ - mov eax, 1 - -DispatchReturn: - /* Restore registers and return */ - pop edi - pop esi - mov esp, ebp - pop ebp - ret 0 - -DispatchError: - /* Set failure code and return */ - xor eax, eax - jmp DispatchReturn -.endfunc - -.func Ki16BitStackException -_Ki16BitStackException: - - /* Save stack */ - push ss - push esp - - /* Go to kernel mode thread stack */ - mov eax, PCR[KPCR_CURRENT_THREAD] - add esp, [eax+KTHREAD_INITIAL_STACK] - - /* Switch to good stack segment */ - UNHANDLED_PATH "16-Bit Stack" -.endfunc - -.globl _HalpTrap0D@0 -.func HalpTrap0D@0 -TRAP_FIXUPS htd_a, htd_t, DoFixupV86, DoFixupAbios -_HalpTrap0D@0: - - /* Enter trap */ - TRAP_PROLOG htd_a, htd_t - - /* Check if this is a V86 trap */ - test dword ptr [ebp+KTRAP_FRAME_EFLAGS], EFLAGS_V86_MASK - jnz DoDispatch - - /* This is weird -- but might happen during an NMI */ - push offset _InvalidGpfMsg - call _DbgPrint - add esp, 4 - - /* Loop forever */ - jmp $ - -DoDispatch: - /* Handle the opcode */ - call _HalpDispatchV86Opcode@0 - - /* Exit the interrupt */ - jmp _Kei386EoiHelper@0 -.endfunc - -.globl _HalpTrap06@0 -.func HalpTrap06@0 -_HalpTrap06@0: - - /* Restore DS/ES segments */ - mov eax, KGDT_R3_DATA | RPL_MASK - mov ds, ax - mov es, ax - - /* Restore ESP and return */ - mov esp, _HalpSavedEsp - ret 0 -.endfunc Modified: trunk/reactos/hal/halx86/hal_generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/hal_generic.rbu… ============================================================================== --- trunk/reactos/hal/halx86/hal_generic.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/hal_generic.rbuild [iso-8859-1] Tue Jan 26 20:41:31 2010 @@ -29,7 +29,6 @@ <file>systimer.S</file> <file>timer.c</file> <file>usage.c</file> - <file>v86.s</file> </directory> <directory name="include"> <pch>hal.h</pch> 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 20:41:31 2010 @@ -4,6 +4,23 @@ #ifndef __INTERNAL_HAL_HAL_H #define __INTERNAL_HAL_HAL_H + +typedef struct _HAL_BIOS_FRAME +{ + ULONG SegSs; + ULONG Esp; + ULONG EFlags; + ULONG SegCs; + ULONG Eip; + PKTRAP_FRAME TrapFrame; + ULONG CsLimit; + ULONG CsBase; + ULONG CsFlags; + ULONG SsLimit; + ULONG SsBase; + ULONG SsFlags; + ULONG Prefix; +} HAL_BIOS_FRAME, *PHAL_BIOS_FRAME; #define HAL_APC_REQUEST 0 #define HAL_DPC_REQUEST 1 @@ -27,6 +44,59 @@ (((bcd & 0xF0) >> 4) * 10 + (bcd & 0x0F)) #define INT_BCD(int) \ (UCHAR)(((int / 10) << 4) + (int % 10)) + +// +// BIOS Interrupts +// +#define VIDEO_SERVICES 0x10 + +// +// Operations for INT 10h (in AH) +// +#define SET_VIDEO_MODE 0x00 + +// +// Video Modes for INT10h AH=00 (in AL) +// +#define GRAPHICS_MODE_12 0x12 /* 80x30 8x16 640x480 16/256K */ + +// +// Generates a 16-bit (real-mode or Virtual 8086) BIOS interrupt with a given AX */ +// +VOID +FORCEINLINE +HalpCallBiosInterrupt(IN ULONG Interrupt, + IN ULONG Ax) +{ + __asm__ __volatile__ + ( + ".byte 0x66\n" + "movl $%c[v], %%eax\n" + "int $%c[i]\n" + : + : [v] "i"(Ax), + [i] "i"(Interrupt) + ); +} + +// +// Constructs a stack of the given size and alignment in the real-mode .text region */ +// +VOID +FORCEINLINE +HalpRealModeStack(IN ULONG Alignment, + IN ULONG Size) +{ + __asm__ __volatile__ + ( + ".align %c[v]\n" + ".space %c[i]\n" + ".globl _HalpRealModeEnd\n_HalpRealModeEnd:\n" + : + : [v] "i"(Alignment), + [i] "i"(Size) + ); +} // // Commonly stated as being 1.19318MHz @@ -557,24 +627,6 @@ VOID ); -VOID -NTAPI -HalpBiosCall( - VOID -); - -VOID -NTAPI -HalpTrap0D( - VOID -); - -VOID -NTAPI -HalpTrap06( - VOID -); - // // Processor Halt Routine // @@ -716,9 +768,6 @@ extern BOOLEAN HalpNMIInProgress; -extern PVOID HalpRealModeStart; -extern PVOID HalpRealModeEnd; - extern ADDRESS_USAGE HalpDefaultIoSpace; extern KSPIN_LOCK HalpSystemHardwareLock;

14 years, 9 months

[sir_richard] 45271: [PERF]: What to do when your SYSEXIT code has a bug? Set KiFastSystemCallDisable to TRUE so it never gets used. Now, for the first time in 3 years and 3 months (not giving a specific revision # to protect the 'innocent'), ReactOS actually fully uses the SYSENTER/SYSEXIT instructions isntead of IRETD, since my code doesn't exhibit the bug and SYSEXIT is safe to use. This should save a good hundred cycles or more per system call.

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Tue Jan 26 20:39:21 2010 New Revision: 45271 URL: http://svn.reactos.org/svn/reactos?rev=45271&view=rev Log: [PERF]: What to do when your SYSEXIT code has a bug? Set KiFastSystemCallDisable to TRUE so it never gets used. Now, for the first time in 3 years and 3 months (not giving a specific revision # to protect the 'innocent'), ReactOS actually fully uses the SYSENTER/SYSEXIT instructions isntead of IRETD, since my code doesn't exhibit the bug and SYSEXIT is safe to use. This should save a good hundred cycles or more per system call. 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] Tue Jan 26 20:39:21 2010 @@ -27,7 +27,7 @@ ULONG KeProcessorLevel; ULONG KeProcessorRevision; ULONG KeFeatureBits; -ULONG KiFastSystemCallDisable = 1; +ULONG KiFastSystemCallDisable; ULONG KeI386NpxPresent = 0; ULONG KiMXCsrMask = 0; ULONG MxcsrFeatureMask = 0;

14 years, 9 months

[sir_richard] 45270: [PERF]: After spending the better part of the last two days rewriting the HAL V8086 code (used for BIOS Display Reset) in C, it dawned upon me that it shouldn't even be used during bootup in the first place! The boot loader, running in real-mode, already sets video mode 12 when starting ReactOS. We then repeat the operation, but since we're in protected mode, we have to emulate the whole sheebang with V8086 mode. We now initialize bootvid without requesting a mode switch (wh

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Tue Jan 26 20:29:37 2010 New Revision: 45270 URL: http://svn.reactos.org/svn/reactos?rev=45270&view=rev Log: [PERF]: After spending the better part of the last two days rewriting the HAL V8086 code (used for BIOS Display Reset) in C, it dawned upon me that it shouldn't even be used during bootup in the first place! The boot loader, running in real-mode, already sets video mode 12 when starting ReactOS. We then repeat the operation, but since we're in protected mode, we have to emulate the whole sheebang with V8086 mode. We now initialize bootvid without requesting a mode switch (which was broken up until a commit ago). This gives us a dirty palette and VGA state. We then call VidResetDisplay to clean up the palette and setup the VGA registers correctly, but we only reset the screen if a custom /BOOTLOGO command is used (which isn't supported yet). We therefore don't need to enter V8086 mode at all up until the switch to graphics mode from the video card driver. Note that Windows doesn't do this (Win7 might due to the new Boot Graphics Library), so we're actually booting faster! Modified: trunk/reactos/ntoskrnl/inbv/inbv.c Modified: trunk/reactos/ntoskrnl/inbv/inbv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/inbv/inbv.c?rev=4… ============================================================================== --- trunk/reactos/ntoskrnl/inbv/inbv.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/inbv/inbv.c [iso-8859-1] Tue Jan 26 20:29:37 2010 @@ -111,7 +111,6 @@ PCHAR CommandLine; BOOLEAN CustomLogo = FALSE; ULONG i; - extern BOOLEAN ExpInTextModeSetup; /* Quit if we're already installed */ if (InbvBootDriverInstalled) return TRUE; @@ -125,13 +124,13 @@ CustomLogo = strstr(CommandLine, "BOOTLOGO") ? TRUE: FALSE; } - /* For SetupLDR, don't reset the BIOS Display -- FIXME! */ - if (ExpInTextModeSetup) CustomLogo = TRUE; - /* Initialize the video */ - InbvBootDriverInstalled = VidInitialize(!CustomLogo); + InbvBootDriverInstalled = VidInitialize(FALSE); if (InbvBootDriverInstalled) { + /* Now reset the display, but only if there's a custom boot logo */ + VidResetDisplay(CustomLogo); + /* Find bitmap resources in the kernel */ ResourceCount = Count; for (i = 0; i < Count; i++)

14 years, 9 months

[sir_richard] 45269: [BOOTVID]: Fix completely broken VidInitialize routine. I have no idea what the original code was trying to accomplish.

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Tue Jan 26 20:21:41 2010 New Revision: 45269 URL: http://svn.reactos.org/svn/reactos?rev=45269&view=rev Log: [BOOTVID]: Fix completely broken VidInitialize routine. I have no idea what the original code was trying to accomplish. Modified: trunk/reactos/drivers/base/bootvid/i386/bootvid.c Modified: trunk/reactos/drivers/base/bootvid/i386/bootvid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/i386/… ============================================================================== --- trunk/reactos/drivers/base/bootvid/i386/bootvid.c [iso-8859-1] (original) +++ trunk/reactos/drivers/base/bootvid/i386/bootvid.c [iso-8859-1] Tue Jan 26 20:21:41 2010 @@ -357,7 +357,7 @@ { ULONG Context = 0; PHYSICAL_ADDRESS TranslatedAddress; - PHYSICAL_ADDRESS NullAddress = {{0, 0}}; + PHYSICAL_ADDRESS NullAddress = {{0, 0}}, VgaAddress; ULONG AddressSpace = 1; BOOLEAN Result; ULONG_PTR Base; @@ -373,12 +373,57 @@ TRUE); if (!Result) return FALSE; - /* See if this is I/O Space, which we need to map */ -TryAgain: + /* Loop trying to find posssible VGA base addresses */ + while (TRUE) + { + /* See if this is I/O Space, which we need to map */ + if (!AddressSpace) + { + /* Map it */ + Base = (ULONG_PTR)MmMapIoSpace(TranslatedAddress, 0x400, MmNonCached); + } + else + { + /* The base is the translated address, no need to map I/O space */ + Base = TranslatedAddress.LowPart; + } + + /* Try to see if this is VGA */ + VgaRegisterBase = Base; + if (VgaIsPresent()) + { + /* Translate the VGA Memory Address */ + VgaAddress.LowPart = 0xA0000; + AddressSpace = 0; + Result = HalFindBusAddressTranslation(VgaAddress, + &AddressSpace, + &TranslatedAddress, + &Context, + FALSE); + if (Result) break; + + /* Try to see if there's any other address */ + Result = HalFindBusAddressTranslation(NullAddress, + &AddressSpace, + &TranslatedAddress, + &Context, + TRUE); + if (!Result) return FALSE; + } + else + { + /* It's not, so unmap the I/O space if we mapped it */ + if (!AddressSpace) MmUnmapIoSpace((PVOID)VgaRegisterBase, 0x400); + } + } + + /* Success! See if this is I/O Space, which we need to map */ if (!AddressSpace) { /* Map it */ - Base = (ULONG_PTR)MmMapIoSpace(TranslatedAddress, 0x400, MmNonCached); + Base = (ULONG_PTR)MmMapIoSpace(TranslatedAddress, + 0x20000, + MmNonCached); } else { @@ -386,67 +431,23 @@ Base = TranslatedAddress.LowPart; } - /* Set the VGA Register base and now check if we have a VGA device */ - VgaRegisterBase = Base; - if (VgaIsPresent()) - { - /* Translate the VGA Memory Address */ - NullAddress.LowPart = 0xA0000; - AddressSpace = 0; - Result = HalFindBusAddressTranslation(NullAddress, - &AddressSpace, - &TranslatedAddress, - &Context, - FALSE); - if (Result) - { - /* Success! See if this is I/O Space, which we need to map */ - if (!AddressSpace) - { - /* Map it */ - Base = (ULONG_PTR)MmMapIoSpace(TranslatedAddress, - 0x20000, - MmNonCached); - } - else - { - /* The base is the translated address, no need to map I/O space */ - Base = TranslatedAddress.LowPart; - } - - /* Set the VGA Memory Base */ - VgaBase = Base; - - /* Now check if we have to set the mode */ - if (SetMode) - { - /* Reset the display */ - HalResetDisplay(); - curr_x = 0; - curr_y = 0; - - /* Initialize it */ - VgaInterpretCmdStream(AT_Initialization); - return TRUE; - } - } - } - else - { - /* It's not, so unmap the I/O space if we mapped it */ - if (!AddressSpace) MmUnmapIoSpace((PVOID)VgaRegisterBase, 0x400); - } - - /* If we got here, then we failed...let's try again */ - Result = HalFindBusAddressTranslation(NullAddress, - &AddressSpace, - &TranslatedAddress, - &Context, - TRUE); - if (Result) goto TryAgain; - - /* If we got here, then we failed even past our re-try... */ - return FALSE; + /* Set the VGA Memory Base */ + VgaBase = Base; + + /* Now check if we have to set the mode */ + if (SetMode) + { + /* Reset the display */ + HalResetDisplay(); + curr_x = 0; + curr_y = 0; + + /* Initialize it */ + VgaInterpretCmdStream(AT_Initialization); + } + + /* VGA is ready */ + return TRUE; } /*

14 years, 9 months

[sir_richard] 45268: [NTOS]: Refactor some stub code and add a couple of more possible trap exit mechanisms (needed for HAL). Later we should really combine all the exit macros into one, as we've done for the entry macro.

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Tue Jan 26 18:54:50 2010 New Revision: 45268 URL: http://svn.reactos.org/svn/reactos?rev=45268&view=rev Log: [NTOS]: Refactor some stub code and add a couple of more possible trap exit mechanisms (needed for HAL). Later we should really combine all the exit macros into one, as we've done for the entry macro. Modified: trunk/reactos/ntoskrnl/include/internal/trap_x.h 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 18:54:50 2010 @@ -317,6 +317,52 @@ VOID FORCEINLINE DECLSPEC_NORETURN +KiDirectTrapReturn(IN PKTRAP_FRAME TrapFrame) +{ + /* Regular interrupt exit but we're not restoring any registers */ + __asm__ __volatile__ + ( + "movl %0, %%esp\n" + "addl $%c[e],%%esp\n" + "iret\n" + : + : "r"(TrapFrame), + [e] "i"(KTRAP_FRAME_EIP) + : "%esp" + ); + UNREACHABLE; +} + +VOID +FORCEINLINE +DECLSPEC_NORETURN +KiCallReturn(IN PKTRAP_FRAME TrapFrame) +{ + /* Pops a trap frame out of the stack but returns with RET instead of IRET */ + __asm__ __volatile__ + ( + "movl %0, %%esp\n" + "movl %c[b](%%esp), %%ebx\n" + "movl %c[s](%%esp), %%esi\n" + "movl %c[i](%%esp), %%edi\n" + "movl %c[p](%%esp), %%ebp\n" + "addl $%c[e],%%esp\n" + "ret\n" + : + : "r"(TrapFrame), + [b] "i"(KTRAP_FRAME_EBX), + [s] "i"(KTRAP_FRAME_ESI), + [i] "i"(KTRAP_FRAME_EDI), + [p] "i"(KTRAP_FRAME_EBP), + [e] "i"(KTRAP_FRAME_EIP) + : "%esp" + ); + UNREACHABLE; +} + +VOID +FORCEINLINE +DECLSPEC_NORETURN KiEditedTrapReturn(IN PKTRAP_FRAME TrapFrame) { /* Regular interrupt exit */ @@ -346,6 +392,17 @@ : "%esp" ); UNREACHABLE; +} + +// +// "BOP" code used by VDM and V8086 Mode +// +VOID +FORCEINLINE +KiIssueBop(VOID) +{ + /* Invalid instruction that an invalid opcode handler must trap and handle */ + asm volatile(".byte 0xC4\n.byte 0xC4\n"); } // @@ -679,13 +736,13 @@ #define KI_NONVOLATILES_ONLY 0x4 #define KI_FAST_SYSTEM_CALL 0x8 #define KI_SOFTWARE_TRAP 0x10 -#define KiTrap(x, y) VOID DECLSPEC_NORETURN x(VOID) { KiTrapStub(y, x##Handler); } +#define KiTrap(x, y) VOID DECLSPEC_NORETURN x(VOID) { KiTrapStub(y, x##Handler); UNREACHABLE; } +#define KiTrampoline(x, y) VOID DECLSPEC_NOINLINE x(VOID) { KiTrapStub(y, x##Handler); } // // Trap Prolog Stub // VOID -DECLSPEC_NORETURN FORCEINLINE KiTrapStub(IN ULONG Flags, IN PVOID Handler) @@ -783,7 +840,6 @@ /* Now jump to the C handler */ __asm__ __volatile__ ("jmp %c[x]\n":: [x] "i"(Handler)); - UNREACHABLE; } #endif

14 years, 9 months

[sir_richard] 45267: [HAL]: Move the HalpApcInterrupt and HalpDispatchInterrupt to pic.c now that there is a C-macro to generate such stubs. Remove irq.S from build/sources.

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Tue Jan 26 17:31:32 2010 New Revision: 45267 URL: http://svn.reactos.org/svn/reactos?rev=45267&view=rev Log: [HAL]: Move the HalpApcInterrupt and HalpDispatchInterrupt to pic.c now that there is a C-macro to generate such stubs. Remove irq.S from build/sources. Removed: trunk/reactos/hal/halx86/generic/irq.S Modified: trunk/reactos/hal/halx86/generic/pic.c trunk/reactos/hal/halx86/hal_generic_up.rbuild Removed: trunk/reactos/hal/halx86/generic/irq.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/irq.S?r… ============================================================================== --- trunk/reactos/hal/halx86/generic/irq.S [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/irq.S (removed) @@ -1,19 +1,0 @@ -/* - * FILE: hal/halx86/generic/irq.S - * COPYRIGHT: See COPYING in the top level directory - * PURPOSE: Software, System and Hardware IRQ Management - * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) - */ - -/* INCLUDES ******************************************************************/ - -#include <asm.h> -#include <internal/i386/asmmacro.S> -.intel_syntax noprefix - -/* GLOBALS *******************************************************************/ - -/* FUNCTIONS *****************************************************************/ - -GENERATE_TRAP_HANDLER HalpApcInterrupt, 0, 0, 1 -GENERATE_TRAP_HANDLER HalpDispatchInterrupt, 0, 0, 1 Modified: trunk/reactos/hal/halx86/generic/pic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/pic.c?r… ============================================================================== --- trunk/reactos/hal/halx86/generic/pic.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/pic.c [iso-8859-1] Tue Jan 26 17:31:32 2010 @@ -886,3 +886,6 @@ /* Exit the interrupt */ KiEoiHelper(TrapFrame); } + +KiTrap(HalpApcInterrupt, KI_SOFTWARE_TRAP); +KiTrap(HalpDispatchInterrupt, KI_SOFTWARE_TRAP); Modified: trunk/reactos/hal/halx86/hal_generic_up.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/hal_generic_up.… ============================================================================== --- trunk/reactos/hal/halx86/hal_generic_up.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/hal_generic_up.rbuild [iso-8859-1] Tue Jan 26 17:31:32 2010 @@ -7,7 +7,6 @@ <define name="_NTHAL_" /> <directory name="generic"> <file>pic.c</file> - <file>irq.S</file> <file>processor.c</file> <file>spinlock.c</file> </directory>

14 years, 9 months

← Newer
1
...
7
8
9
10
11
12
13
...
53
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2010