Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 21946: [AUDIT] - Unlock source code files containing only stubs - Add missing programmers name to the file headers - SVN properties maintenance
by fireball＠svn.reactos.org 20 May '06

20 May '06

Author: fireball Date: Sat May 20 14:39:53 2006 New Revision: 21946 URL: http://svn.reactos.ru/svn/reactos?rev=21946&view=rev Log: [AUDIT] - Unlock source code files containing only stubs - Add missing programmers name to the file headers - SVN properties maintenance Modified: trunk/reactos/ntoskrnl/fs/context.c (contents, props changed) trunk/reactos/ntoskrnl/fs/oplock.c (contents, props changed) trunk/reactos/ntoskrnl/fs/pool.c (contents, props changed) trunk/reactos/ntoskrnl/fs/tunnel.c (contents, props changed) trunk/reactos/ntoskrnl/fs/unc.c (contents, props changed) trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S (contents, props changed) trunk/reactos/ntoskrnl/include/internal/i386/v86m.h (contents, props changed) trunk/reactos/ntoskrnl/include/ntoskrnl.h (props changed) trunk/reactos/ntoskrnl/tests/setup.c (props changed) trunk/reactos/ntoskrnl/tests/stubs.tst (props changed) trunk/reactos/ntoskrnl/tests/tests/VirtualMemory.c (contents, props changed) trunk/reactos/regtests/regtests/regtests.c (props changed) trunk/reactos/regtests/shared/regtests.c (props changed) trunk/reactos/regtests/shared/regtests.h (props changed) Modified: trunk/reactos/ntoskrnl/fs/context.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/fs/context.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/fs/context.c (original) +++ trunk/reactos/ntoskrnl/fs/context.c Sat May 20 14:39:53 2006 @@ -22,7 +22,7 @@ * @unimplemented */ NTSTATUS -STDCALL +NTAPI FsRtlInsertPerStreamContext(IN PFSRTL_ADVANCED_FCB_HEADER PerStreamContext, IN PFSRTL_PER_STREAM_CONTEXT Ptr) { @@ -34,7 +34,7 @@ * @unimplemented */ PFSRTL_PER_STREAM_CONTEXT -STDCALL +NTAPI FsRtlRemovePerStreamContext(IN PFSRTL_ADVANCED_FCB_HEADER StreamContext, IN PVOID OwnerId OPTIONAL, IN PVOID InstanceId OPTIONAL) @@ -47,7 +47,7 @@ * @unimplemented */ NTSTATUS -STDCALL +NTAPI FsRtlInsertPerFileObjectContext(IN PFSRTL_ADVANCED_FCB_HEADER PerFileObjectContext, IN PVOID /* PFSRTL_PER_FILE_OBJECT_CONTEXT*/ Ptr) { @@ -59,7 +59,7 @@ * @unimplemented */ PVOID /* PFSRTL_PER_FILE_OBJECT_CONTEXT*/ -STDCALL +NTAPI FsRtlRemovePerFileObjectContext(IN PFSRTL_ADVANCED_FCB_HEADER PerFileObjectContext, IN PVOID OwnerId OPTIONAL, IN PVOID InstanceId OPTIONAL) @@ -72,7 +72,7 @@ * @unimplemented */ VOID -STDCALL +NTAPI FsRtlTeardownPerStreamContexts(IN PFSRTL_ADVANCED_FCB_HEADER AdvancedHeader) { UNIMPLEMENTED; Propchange: trunk/reactos/ntoskrnl/fs/context.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Modified: trunk/reactos/ntoskrnl/fs/oplock.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/fs/oplock.c?rev=21… ============================================================================== --- trunk/reactos/ntoskrnl/fs/oplock.c (original) +++ trunk/reactos/ntoskrnl/fs/oplock.c Sat May 20 14:39:53 2006 @@ -5,7 +5,8 @@ * FILE: ntoskrnl/fs/oplock.c * PURPOSE: No purpose listed. * - * PROGRAMMERS: No programmer listed. + * PROGRAMMERS: Emanuele Aliberti + * Eric Kohl */ #include <ntoskrnl.h> @@ -23,7 +24,8 @@ * * @unimplemented */ -NTSTATUS STDCALL +NTSTATUS +NTAPI FsRtlCheckOplock(IN POPLOCK Oplock, IN PIRP Irp, IN PVOID Context, @@ -46,7 +48,8 @@ * * @unimplemented */ -BOOLEAN STDCALL +BOOLEAN +NTAPI FsRtlCurrentBatchOplock(IN POPLOCK Oplock) { return(FALSE); @@ -68,7 +71,8 @@ * * @implemented */ -VOID STDCALL +VOID +NTAPI FsRtlInitializeOplock(IN OUT POPLOCK Oplock) { } @@ -86,7 +90,8 @@ * * @unimplemented */ -NTSTATUS STDCALL +NTSTATUS +NTAPI FsRtlOplockFsctrl(IN POPLOCK Oplock, IN PIRP Irp, IN ULONG OpenCount) @@ -107,7 +112,8 @@ * * @unimplemented */ -BOOLEAN STDCALL +BOOLEAN +NTAPI FsRtlOplockIsFastIoPossible(IN POPLOCK Oplock) { return(FALSE); @@ -126,7 +132,8 @@ * * @implemented */ -VOID STDCALL +VOID +NTAPI FsRtlUninitializeOplock(IN POPLOCK Oplock) { } Propchange: trunk/reactos/ntoskrnl/fs/oplock.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Modified: trunk/reactos/ntoskrnl/fs/pool.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/fs/pool.c?rev=2194… ============================================================================== --- trunk/reactos/ntoskrnl/fs/pool.c (original) +++ trunk/reactos/ntoskrnl/fs/pool.c Sat May 20 14:39:53 2006 @@ -27,7 +27,7 @@ * @implemented */ PVOID -STDCALL +NTAPI FsRtlAllocatePool ( IN POOL_TYPE PoolType, IN ULONG NumberOfBytes @@ -64,7 +64,7 @@ * @implemented */ PVOID -STDCALL +NTAPI FsRtlAllocatePoolWithQuota ( IN POOL_TYPE PoolType, IN ULONG NumberOfBytes @@ -98,7 +98,7 @@ * @implemented */ PVOID -STDCALL +NTAPI FsRtlAllocatePoolWithQuotaTag ( IN POOL_TYPE PoolType, IN ULONG NumberOfBytes, @@ -133,7 +133,7 @@ * @implemented */ PVOID -STDCALL +NTAPI FsRtlAllocatePoolWithTag ( IN POOL_TYPE PoolType, IN ULONG NumberOfBytes, Propchange: trunk/reactos/ntoskrnl/fs/pool.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Modified: trunk/reactos/ntoskrnl/fs/tunnel.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/fs/tunnel.c?rev=21… ============================================================================== --- trunk/reactos/ntoskrnl/fs/tunnel.c (original) +++ trunk/reactos/ntoskrnl/fs/tunnel.c Sat May 20 14:39:53 2006 @@ -5,7 +5,7 @@ * FILE: ntoskrnl/fs/tunnel.c * PURPOSE: No purpose listed. * - * PROGRAMMERS: No programmer listed. + * PROGRAMMERS: Emanuele Aliberti */ #include <ntoskrnl.h> Propchange: trunk/reactos/ntoskrnl/fs/tunnel.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Modified: trunk/reactos/ntoskrnl/fs/unc.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/fs/unc.c?rev=21946… ============================================================================== --- trunk/reactos/ntoskrnl/fs/unc.c (original) +++ trunk/reactos/ntoskrnl/fs/unc.c Sat May 20 14:39:53 2006 @@ -5,15 +5,16 @@ * FILE: ntoskrnl/fs/unc.c * PURPOSE: No purpose listed. * - * PROGRAMMERS: No programmer listed. + * PROGRAMMERS: Emanuele Aliberti + * Eric Kohl */ #include <ntoskrnl.h> /********************************************************************** - * NAME EXPORTED - * FsRtlDeregisterUncProvider@4 + * NAME EXPORTED + * FsRtlDeregisterUncProvider@4 * * DESCRIPTION * @@ -23,15 +24,16 @@ * * @unimplemented */ -VOID STDCALL +VOID +NTAPI FsRtlDeregisterUncProvider(IN HANDLE Handle) { } /********************************************************************** - * NAME EXPORTED - * FsRtlRegisterUncProvider@12 + * NAME EXPORTED + * FsRtlRegisterUncProvider@12 * * DESCRIPTION * @@ -41,12 +43,13 @@ * * @unimplemented */ -NTSTATUS STDCALL +NTSTATUS +NTAPI FsRtlRegisterUncProvider(IN OUT PHANDLE Handle, - IN PUNICODE_STRING RedirectorDeviceName, - IN BOOLEAN MailslotsSupported) + IN PUNICODE_STRING RedirectorDeviceName, + IN BOOLEAN MailslotsSupported) { - return(STATUS_NOT_IMPLEMENTED); + return(STATUS_NOT_IMPLEMENTED); } Propchange: trunk/reactos/ntoskrnl/fs/unc.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Modified: trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/include/internal/i… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S Sat May 20 14:39:53 2006 @@ -1,588 +1,588 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS Kernel - * FILE: ntoskrnl/include/i386/asmmacro.S - * PURPOSE: Assembly Macros for Spinlocks and common Trap Code - * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) - */ - -/* INCLUDES ******************************************************************/ - -#include <ndk/asm.h> - -// Arguments for TRAP_EPILOG -#define FromSystemCall 1 -#define DoRestorePreviousMode 1 -#define DoRestoreEverything 1 -#define DoRestoreSegments 1 -#define DoRestoreVolatiles 1 -#define NotFromSystemCall 0 -#define DoNotRestorePreviousMode 0 -#define DoNotRestoreEverything 0 -#define DoNotRestoreSegments 0 -#define DoNotRestoreVolatiles 0 - -// Arguments for idt -#define INT_32_DPL0 0x8E00 -#define INT_32_DPL3 0xEE00 - -.intel_syntax noprefix - -// -// These macros are inlined equivalents of KiAcquire/ReleaseSpinlock, that is, -// they will not be compiled into non-SMP builds. Usage is as follows: -// -// .BeginYourFunction -// mov reg, lockaddr -// ACQUIRE_SPINLOCK(reg, .spin) -// <thread-safe code here> -// RELEASE_SPINLOCK(reg) -// <misc code here> -// retn -// #IFDEF CONFIG_SMP -// .spin -// <any necessary steps to be able to jump back safely> -/ SPIN_ON_LOCK(reg, .BeginYourFunction) -// #ENDIF -// -#ifdef CONFIG_SMP -#define LOCK lock -#define ACQUIRE_SPINLOCK(x, y) \ - lock bts dword ptr [x], 0; \ - jb y -#define RELEASE_SPINLOCK(x) mov byte ptr [x], 0 -#define SPIN_ON_LOCK(x, y) \ -1: \ - test dword ptr [x], 1; \ - jz y; \ - pause; \ - jmp 1b -#else -#define LOCK -#define ACQUIRE_SPINLOCK(x, y) -#define RELEASE_SPINLOCK(x) -#endif - -// -// @name SET_TF_DEBUG_HEADER -// -// This macro sets up the debug header in the trap frame. -// -// @param None. -// -// @remark ebp = PKTRAP_FRAME. -// edi/ebx = Have been saved and can be used. -// -.macro idt Handler, Bits - .long \Handler - .short \Bits - .short KGDT_R0_CODE -.endm - -// -// @name SET_TF_DEBUG_HEADER -// -// This macro sets up the debug header in the trap frame. -// -// @param None. -// -// @remark ebp = PKTRAP_FRAME. -// edi/ebx = Have been saved and can be used. -// -.macro SET_TF_DEBUG_HEADER - /* Get the Debug Trap Frame EBP/EIP */ - mov ebx, [ebp+KTRAP_FRAME_EBP] - mov edi, [ebp+KTRAP_FRAME_EIP] - - /* Write the debug data */ - mov [ebp+KTRAP_FRAME_DEBUGPOINTER], edx - mov dword ptr [ebp+KTRAP_FRAME_DEBUGARGMARK], 0xBADB0D00 - mov [ebp+KTRAP_FRAME_DEBUGEBP], ebx - mov [ebp+KTRAP_FRAME_DEBUGEIP], edi -.endm - -// -// @name CHECK_FOR_APC_DELIVER -// -// This macro checks if the trapframe indicates a return to user-mode, -// and, if so, checks if user-mode APCs should be delivered. -// -// @param PreserveEax -// Determines if EAX should be preserved. Implies that the segment -// registers will also be saved. -// -// @remark ebp = PKTRAP_FRAME. -// ebx = Saved and will be used. -// -.macro CHECK_FOR_APC_DELIVER PreserveEax - /* Check for V86 mode */ - test dword ptr [ebp+KTRAP_FRAME_EFLAGS], EFLAGS_V86_MASK - jnz 1f - - /* Deliver APCs only if we were called from user mode */ - test byte ptr [ebp+KTRAP_FRAME_CS], 1 - je 2f - - /* Get the current thread */ -1: - mov ebx, [fs:KPCR_CURRENT_THREAD] - - /* Make it non-alerted */ - mov byte ptr [ebx+KTHREAD_ALERTED], 0 - - /* And only if any are actually pending */ - cmp byte ptr [ebx+KTHREAD_PENDING_USER_APC], 0 - je 2f - - /* Save pointer to Trap Frame */ - mov ebx, ebp - -.if \PreserveEax - /* Save some stuff that raising IRQL will kill */ - mov [ebx+KTRAP_FRAME_EAX], eax - mov dword ptr [ebx+KTRAP_FRAME_FS], KGDT_R3_TEB + RPL_MASK - mov dword ptr [ebx+KTRAP_FRAME_DS], KGDT_R3_DATA + RPL_MASK - mov dword ptr [ebx+KTRAP_FRAME_ES], KGDT_R3_DATA + RPL_MASK - mov dword ptr [ebx+KTRAP_FRAME_GS], 0 -.endif - - /* Raise IRQL to APC_LEVEL */ - mov ecx, 1 - call @KfRaiseIrql@4 - - /* Save old IRQL */ - push eax - - /* Deliver APCs */ - sti - push ebx - push 0 - push UserMode - call _KiDeliverApc@12 - - /* Return to old IRQL */ - pop ecx - call @KfLowerIrql@4 - - /* Restore EAX (only in volatile case) */ -.if \PreserveEax - mov eax, [ebx+KTRAP_FRAME_EAX] -.endif - cli - jmp 1b -2: -.endm - -// -// @name TRAP_PROLOG -// -// This macro creates a standard trap entry prologue. -// It should be used for entry into any kernel trap (KiTrapXx), but not for -// system calls, which require special handling. -// -// @param Label -// Identifying name of the caller function; will be used to append -// to the name V86 and DR helper functions, which must already exist. -// -// @remark Use as follows: -// _KiTrap00: -// /* Push fake error code */ -// push 0 -// -// /* Enter common prologue */ -// TRAP_PROLOG(0) -// -// /* Handle trap */ -// <Your Trap Code Here> -// -#define TRAP_PROLOG(Label) \ - /* Just to be safe, clear out the HIWORD, since it's reserved */ \ - mov word ptr [esp+2], 0; \ -\ - /* Save the non-volatiles */ \ - push ebp; \ - push ebx; \ - push esi; \ - push edi; \ -\ - /* Save FS and set it to PCR */ \ - push fs; \ - mov ebx, KGDT_R0_PCR; \ - mov fs, bx; \ -\ - /* Save exception list and bogus previous mode */ \ - push fs:[KPCR_EXCEPTION_LIST]; \ - push -1; \ -\ - /* Save volatiles and segment registers */ \ - push eax; \ - push ecx; \ - push edx; \ - push ds; \ - push es; \ - push gs; \ -\ - /* Set the R3 data segment */ \ - mov ax, KGDT_R3_DATA + RPL_MASK; \ -\ - /* Skip debug registers and debug stuff */ \ - sub esp, 0x30; \ -\ - /* Load the segment registers */ \ - mov ds, ax; \ - mov es, ax; \ -\ - /* Set up frame */ \ - mov ebp, esp; \ -\ - /* Check if this was from V86 Mode */ \ - /* test dword ptr [ebp+KTRAP_FRAME_EFLAGS], EFLAGS_V86_MASK; */ \ - /* jnz V86_Label; */ \ -\ - /* Get current thread */ \ - mov ecx, [fs:KPCR_CURRENT_THREAD]; \ - cld; \ -\ - /* Flush DR7 */ \ - and dword ptr [ebp+KTRAP_FRAME_DR7], 0; \ -\ - /* Check if the thread was being debugged */ \ - /* test byte ptr [ecx+KTHREAD_DEBUG_ACTIVE], 0xFF; */ \ - /* jnz Dr_Label; */ \ -\ - /* Set the Trap Frame Debug Header */ \ - SET_TF_DEBUG_HEADER - -// -// @name SYSCALL_PROLOG -// -// This macro creates a system call entry prologue. -// It should be used for entry into any fast-system call (KiGetTickCount, -// KiCallbackReturn, KiRaiseAssertion) and the generic system call handler -// (KiSystemService) -// -// @param Label -// Unique label identifying the name of the caller function; will be -// used to append to the name of the DR helper function, which must -// already exist. -// -// @remark None. -// -.macro SYSCALL_PROLOG - /* Create a trap frame */ - push 0 - push ebp - push ebx - push esi - push edi - push fs - - /* Load PCR Selector into fs */ - mov ebx, KGDT_R0_PCR - mov fs, bx - - /* Get a pointer to the current thread */ - mov esi, [fs:KPCR_CURRENT_THREAD] - - /* Save the previous exception list */ - push [fs:KPCR_EXCEPTION_LIST] - - /* Set the exception handler chain terminator */ - mov dword ptr [fs:KPCR_EXCEPTION_LIST], -1 - - /* Save the old previous mode */ - push ss:[esi+KTHREAD_PREVIOUS_MODE] - - /* Skip the other registers */ - sub esp, 0x48 - - /* Hack: it seems that on VMWare someone damages ES/DS on exit. Investigate! */ - mov [esp+KTRAP_FRAME_DS], ds - mov [esp+KTRAP_FRAME_ES], es - - /* Set the new previous mode based on the saved CS selector */ - mov ebx, [esp+0x6C] - and ebx, 1 - mov byte ptr ss:[esi+KTHREAD_PREVIOUS_MODE], bl - - /* Go on the Kernel stack frame */ - mov ebp, esp - - /* Save the old trap frame pointer where EDX would be saved */ - mov ebx, [esi+KTHREAD_TRAP_FRAME] - mov [ebp+KTRAP_FRAME_EDX], ebx - - /* Flush DR7 */ - and dword ptr [ebp+KTRAP_FRAME_DR7], 0 - - /* Check if the thread was being debugged */ - test byte ptr [esi+KTHREAD_DEBUG_ACTIVE], 0xFF - - /* Set the thread's trap frame and clear direction flag */ - mov [esi+KTHREAD_TRAP_FRAME], ebp - cld - - /* Save DR registers if needed */ - //jnz Dr_kss_&Label - - /* Set the trap frame debug header */ - SET_TF_DEBUG_HEADER - -#ifdef DBG // FIXME: Is this for GDB? Can it be moved in the stub? - /* - * We want to know the address from where the syscall stub was called. - * If PrevMode is KernelMode, that address is stored in our own (kernel) - * stack, at location KTRAP_FRAME_ESP. - * If we're coming from UserMode, we load the usermode stack pointer - * and go back two frames (first frame is the syscall stub, second call - * is the caller of the stub). - */ - mov edi, [ebp+KTRAP_FRAME_ESP] - test byte ptr [esi+KTHREAD_PREVIOUS_MODE], 0x01 - jz 0f - mov edi, [edi+4] -0: - mov [ebp+KTRAP_FRAME_DEBUGEIP], edi -#endif - - /* Enable interrupts */ - sti -.endm - -// -// @name TRAP_EPILOG -// -// This macro creates an epilogue for leaving any system trap. -// It is used for exiting system calls, exceptions, interrupts and generic -// traps. -// -// @param SystemCall -// Specifies whether this trap will exit a system call. If so, special -// code will be assembled to potentially use SYSEXIT instead of IRETD. -// -// @param RestorePreviousMode -// Specifies if the previous mode should be restored. -// -// @param RestoreSegments -// Specifies if the segment registers should be restored. -// -// @param RestoreVolatiles -// Specifies if the volatile registers should be restored. -// -// @param RestoreAllRegs -// Specifies if volatiles and segments should both be restored. -// -// @remark -// -.macro TRAP_EPILOG SystemCall, RestorePreviousMode, RestoreSegments, RestoreVolatiles, RestoreAllRegs -#ifdef DBG - /* Assert the flags */ - pushfd - pop edx - test edx, EFLAGS_INTERRUPT_MASK - jnz 1f - - /* Assert the stack */ - cmp esp, ebp - jnz 1f - - /* Assert the trap frame */ -0: - //sub dword ptr [esp+KTRAP_FRAME_DEBUGARGMARK], 0xBADB0D00 - //jnz 2f - - /* Assert FS */ - mov bx, fs - cmp bx, KGDT_R0_PCR - jnz 1f - - /* Assert exception list */ - cmp dword ptr fs:[KPCR_EXCEPTION_LIST], 0 - jnz 4f -2: - add dword ptr [esp+KTRAP_FRAME_DEBUGARGMARK], 0xBADB0D00 -1: - int 3 - jmp 0b -4: -#endif - - /* Get exception list */ - mov edx, [esp+KTRAP_FRAME_EXCEPTION_LIST] - -#ifdef DBG - /* Assert the saved exception list */ - or edx, edx - jnz 5f - int 3 -5: -#endif - - /* Restore it */ - mov [fs:KPCR_EXCEPTION_LIST], edx - -.if \RestorePreviousMode - /* Get previous mode */ - mov ecx, [esp+KTRAP_FRAME_PREVIOUS_MODE] - -#ifdef DBG - /* Assert the saved previous mode */ - cmp ecx, -1 - jnz 6f - int 3 -6: -#endif - - /* Restore the previous mode */ - mov esi, [fs:KPCR_CURRENT_THREAD] - mov byte ptr [esi+KTHREAD_PREVIOUS_MODE], cl -.endif - - /* Check for V86 */ - test dword ptr [esp+KTRAP_FRAME_EFLAGS], EFLAGS_V86_MASK - jnz V86_Exit - - /* Check if the frame was edited */ - test word ptr [esp+KTRAP_FRAME_CS], FRAME_EDITED - jz 7f - -.ifeq \RestoreAllRegs - /* Check the old mode */ - cmp word ptr [esp+KTRAP_FRAME_CS], KGDT_R3_CODE + RPL_MASK - bt word ptr [esp+KTRAP_FRAME_CS], 0 - cmc - ja 8f -.endif - -.if \RestoreVolatiles - /* Restore volatiles */ - mov edx, [esp+KTRAP_FRAME_EDX] - mov ecx, [esp+KTRAP_FRAME_ECX] - mov eax, [esp+KTRAP_FRAME_EAX] -.endif - - /* Check if we were called from kernel mode */ - cmp dword ptr [ebp+KTRAP_FRAME_CS], KGDT_R0_CODE - jz 9f - -.if \RestoreSegments - /* Restore segment registers */ - lea esp, [ebp+KTRAP_FRAME_GS] - pop gs - pop es - pop ds -.endif - - /* Restore FS */ -3: - lea esp, [ebp+KTRAP_FRAME_FS] - pop fs - -9: - /* Skip debug information and unsaved registers */ - lea esp, [ebp+KTRAP_FRAME_EDI] - pop edi - pop esi - pop ebx - pop ebp - - /* Check for ABIOS */ - cmp word ptr [esp+8], 0x80 - ja AbiosExit - - /* Pop error code */ - add esp, 4 - -.if \SystemCall - /* Check if previous CS is from user-mode */ - test dword ptr [esp+4], 1 - - /* It is, so use Fast Exit */ - jnz FastExit - - /* Jump back to stub */ - pop edx - pop ecx - popf - jmp edx - -.ret: -.endif - iret - -.if \SystemCall -FastExit: - /* Is SYSEXIT Supported/Wanted? */ - cmp dword ptr ss:[_KiFastSystemCallDisable], 0 - jnz .ret - test dword ptr [esp+8], EFLAGS_TF - jnz .ret - - /* Restore FS to TIB */ - mov ecx, KGDT_R3_TEB + RPL_MASK - mov fs, ecx - - /* We will be cleaning up the stack ourselves */ - pop edx /* New Ring 3 EIP */ - add esp, 4 /* Skip Ring 3 DS */ - and dword ptr [esp], 0xfffffdff /* Remove EFLAGS_INTERRUPT_MASK from EFLAGS */ - popf /* Restore old EFLAGS */ - pop ecx /* Old Ring 3 SS:ESP */ - - /* - * At this point: - * ECX points to the old User Stack. - * EDX points to the instruction to execute in usermode after the sysenter - */ - sti - sysexit -.endif - -8: - /* Restore EAX */ - mov eax, [esp+KTRAP_FRAME_EAX] - - /* Skip registers */ - add esp, 0x30 - - /* Restore segments and volatiles */ - pop gs - pop es - pop ds - pop edx - pop ecx - - /* Jump back to mainline code */ - jmp 3b - -7: - /* Restore real CS value */ - mov ebx, [esp+KTRAP_FRAME_TEMPCS] - mov [esp+KTRAP_FRAME_CS], ebx - - /* - * If ESP was modified, then a special interrupt exit stack - * must be created to "update" ESP's value in a legal manner - */ - mov ebx, [esp+KTRAP_FRAME_TEMPESP] - sub ebx, 0xC - mov [esp+KTRAP_FRAME_ERROR_CODE], ebx - - /* Copy Interrupt Stack */ - mov esi, [esp+KTRAP_FRAME_EFLAGS] - mov [ebx+8], esi - mov esi, [esp+KTRAP_FRAME_CS] - mov [ebx+4], esi - mov esi, [esp+KTRAP_FRAME_EIP] - mov [ebx], esi - - /* Return */ - add esp, KTRAP_FRAME_EDI - pop edi - pop esi - pop ebx - pop ebp - mov esp, [esp] - iret -.endm - +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Kernel + * FILE: ntoskrnl/include/i386/asmmacro.S + * PURPOSE: Assembly Macros for Spinlocks and common Trap Code + * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) + */ + +/* INCLUDES ******************************************************************/ + +#include <ndk/asm.h> + +// Arguments for TRAP_EPILOG +#define FromSystemCall 1 +#define DoRestorePreviousMode 1 +#define DoRestoreEverything 1 +#define DoRestoreSegments 1 +#define DoRestoreVolatiles 1 +#define NotFromSystemCall 0 +#define DoNotRestorePreviousMode 0 +#define DoNotRestoreEverything 0 +#define DoNotRestoreSegments 0 +#define DoNotRestoreVolatiles 0 + +// Arguments for idt +#define INT_32_DPL0 0x8E00 +#define INT_32_DPL3 0xEE00 + +.intel_syntax noprefix + +// +// These macros are inlined equivalents of KiAcquire/ReleaseSpinlock, that is, +// they will not be compiled into non-SMP builds. Usage is as follows: +// +// .BeginYourFunction +// mov reg, lockaddr +// ACQUIRE_SPINLOCK(reg, .spin) +// <thread-safe code here> +// RELEASE_SPINLOCK(reg) +// <misc code here> +// retn +// #IFDEF CONFIG_SMP +// .spin +// <any necessary steps to be able to jump back safely> +/ SPIN_ON_LOCK(reg, .BeginYourFunction) +// #ENDIF +// +#ifdef CONFIG_SMP +#define LOCK lock +#define ACQUIRE_SPINLOCK(x, y) \ + lock bts dword ptr [x], 0; \ + jb y +#define RELEASE_SPINLOCK(x) mov byte ptr [x], 0 +#define SPIN_ON_LOCK(x, y) \ +1: \ + test dword ptr [x], 1; \ + jz y; \ + pause; \ + jmp 1b +#else +#define LOCK +#define ACQUIRE_SPINLOCK(x, y) +#define RELEASE_SPINLOCK(x) +#endif + +// +// @name SET_TF_DEBUG_HEADER +// +// This macro sets up the debug header in the trap frame. +// +// @param None. +// +// @remark ebp = PKTRAP_FRAME. +// edi/ebx = Have been saved and can be used. +// +.macro idt Handler, Bits + .long \Handler + .short \Bits + .short KGDT_R0_CODE +.endm + +// +// @name SET_TF_DEBUG_HEADER +// +// This macro sets up the debug header in the trap frame. +// +// @param None. +// +// @remark ebp = PKTRAP_FRAME. +// edi/ebx = Have been saved and can be used. +// +.macro SET_TF_DEBUG_HEADER + /* Get the Debug Trap Frame EBP/EIP */ + mov ebx, [ebp+KTRAP_FRAME_EBP] + mov edi, [ebp+KTRAP_FRAME_EIP] + + /* Write the debug data */ + mov [ebp+KTRAP_FRAME_DEBUGPOINTER], edx + mov dword ptr [ebp+KTRAP_FRAME_DEBUGARGMARK], 0xBADB0D00 + mov [ebp+KTRAP_FRAME_DEBUGEBP], ebx + mov [ebp+KTRAP_FRAME_DEBUGEIP], edi +.endm + +// +// @name CHECK_FOR_APC_DELIVER +// +// This macro checks if the trapframe indicates a return to user-mode, +// and, if so, checks if user-mode APCs should be delivered. +// +// @param PreserveEax +// Determines if EAX should be preserved. Implies that the segment +// registers will also be saved. +// +// @remark ebp = PKTRAP_FRAME. +// ebx = Saved and will be used. +// +.macro CHECK_FOR_APC_DELIVER PreserveEax + /* Check for V86 mode */ + test dword ptr [ebp+KTRAP_FRAME_EFLAGS], EFLAGS_V86_MASK + jnz 1f + + /* Deliver APCs only if we were called from user mode */ + test byte ptr [ebp+KTRAP_FRAME_CS], 1 + je 2f + + /* Get the current thread */ +1: + mov ebx, [fs:KPCR_CURRENT_THREAD] + + /* Make it non-alerted */ + mov byte ptr [ebx+KTHREAD_ALERTED], 0 + + /* And only if any are actually pending */ + cmp byte ptr [ebx+KTHREAD_PENDING_USER_APC], 0 + je 2f + + /* Save pointer to Trap Frame */ + mov ebx, ebp + +.if \PreserveEax + /* Save some stuff that raising IRQL will kill */ + mov [ebx+KTRAP_FRAME_EAX], eax + mov dword ptr [ebx+KTRAP_FRAME_FS], KGDT_R3_TEB + RPL_MASK + mov dword ptr [ebx+KTRAP_FRAME_DS], KGDT_R3_DATA + RPL_MASK + mov dword ptr [ebx+KTRAP_FRAME_ES], KGDT_R3_DATA + RPL_MASK + mov dword ptr [ebx+KTRAP_FRAME_GS], 0 +.endif + + /* Raise IRQL to APC_LEVEL */ + mov ecx, 1 + call @KfRaiseIrql@4 + + /* Save old IRQL */ + push eax + + /* Deliver APCs */ + sti + push ebx + push 0 + push UserMode + call _KiDeliverApc@12 + + /* Return to old IRQL */ + pop ecx + call @KfLowerIrql@4 + + /* Restore EAX (only in volatile case) */ +.if \PreserveEax + mov eax, [ebx+KTRAP_FRAME_EAX] +.endif + cli + jmp 1b +2: +.endm + +// +// @name TRAP_PROLOG +// +// This macro creates a standard trap entry prologue. +// It should be used for entry into any kernel trap (KiTrapXx), but not for +// system calls, which require special handling. +// +// @param Label +// Identifying name of the caller function; will be used to append +// to the name V86 and DR helper functions, which must already exist. +// +// @remark Use as follows: +// _KiTrap00: +// /* Push fake error code */ +// push 0 +// +// /* Enter common prologue */ +// TRAP_PROLOG(0) +// +// /* Handle trap */ +// <Your Trap Code Here> +// +#define TRAP_PROLOG(Label) \ + /* Just to be safe, clear out the HIWORD, since it's reserved */ \ + mov word ptr [esp+2], 0; \ +\ + /* Save the non-volatiles */ \ + push ebp; \ + push ebx; \ + push esi; \ + push edi; \ +\ + /* Save FS and set it to PCR */ \ + push fs; \ + mov ebx, KGDT_R0_PCR; \ + mov fs, bx; \ +\ + /* Save exception list and bogus previous mode */ \ + push fs:[KPCR_EXCEPTION_LIST]; \ + push -1; \ +\ + /* Save volatiles and segment registers */ \ + push eax; \ + push ecx; \ + push edx; \ + push ds; \ + push es; \ + push gs; \ +\ + /* Set the R3 data segment */ \ + mov ax, KGDT_R3_DATA + RPL_MASK; \ +\ + /* Skip debug registers and debug stuff */ \ + sub esp, 0x30; \ +\ + /* Load the segment registers */ \ + mov ds, ax; \ + mov es, ax; \ +\ + /* Set up frame */ \ + mov ebp, esp; \ +\ + /* Check if this was from V86 Mode */ \ + /* test dword ptr [ebp+KTRAP_FRAME_EFLAGS], EFLAGS_V86_MASK; */ \ + /* jnz V86_Label; */ \ +\ + /* Get current thread */ \ + mov ecx, [fs:KPCR_CURRENT_THREAD]; \ + cld; \ +\ + /* Flush DR7 */ \ + and dword ptr [ebp+KTRAP_FRAME_DR7], 0; \ +\ + /* Check if the thread was being debugged */ \ + /* test byte ptr [ecx+KTHREAD_DEBUG_ACTIVE], 0xFF; */ \ + /* jnz Dr_Label; */ \ +\ + /* Set the Trap Frame Debug Header */ \ + SET_TF_DEBUG_HEADER + +// +// @name SYSCALL_PROLOG +// +// This macro creates a system call entry prologue. +// It should be used for entry into any fast-system call (KiGetTickCount, +// KiCallbackReturn, KiRaiseAssertion) and the generic system call handler +// (KiSystemService) +// +// @param Label +// Unique label identifying the name of the caller function; will be +// used to append to the name of the DR helper function, which must +// already exist. +// +// @remark None. +// +.macro SYSCALL_PROLOG + /* Create a trap frame */ + push 0 + push ebp + push ebx + push esi + push edi + push fs + + /* Load PCR Selector into fs */ + mov ebx, KGDT_R0_PCR + mov fs, bx + + /* Get a pointer to the current thread */ + mov esi, [fs:KPCR_CURRENT_THREAD] + + /* Save the previous exception list */ + push [fs:KPCR_EXCEPTION_LIST] + + /* Set the exception handler chain terminator */ + mov dword ptr [fs:KPCR_EXCEPTION_LIST], -1 + + /* Save the old previous mode */ + push ss:[esi+KTHREAD_PREVIOUS_MODE] + + /* Skip the other registers */ + sub esp, 0x48 + + /* Hack: it seems that on VMWare someone damages ES/DS on exit. Investigate! */ + mov [esp+KTRAP_FRAME_DS], ds + mov [esp+KTRAP_FRAME_ES], es + + /* Set the new previous mode based on the saved CS selector */ + mov ebx, [esp+0x6C] + and ebx, 1 + mov byte ptr ss:[esi+KTHREAD_PREVIOUS_MODE], bl + + /* Go on the Kernel stack frame */ + mov ebp, esp + + /* Save the old trap frame pointer where EDX would be saved */ + mov ebx, [esi+KTHREAD_TRAP_FRAME] + mov [ebp+KTRAP_FRAME_EDX], ebx + + /* Flush DR7 */ + and dword ptr [ebp+KTRAP_FRAME_DR7], 0 + + /* Check if the thread was being debugged */ + test byte ptr [esi+KTHREAD_DEBUG_ACTIVE], 0xFF + + /* Set the thread's trap frame and clear direction flag */ + mov [esi+KTHREAD_TRAP_FRAME], ebp + cld + + /* Save DR registers if needed */ + //jnz Dr_kss_&Label + + /* Set the trap frame debug header */ + SET_TF_DEBUG_HEADER + +#ifdef DBG // FIXME: Is this for GDB? Can it be moved in the stub? + /* + * We want to know the address from where the syscall stub was called. + * If PrevMode is KernelMode, that address is stored in our own (kernel) + * stack, at location KTRAP_FRAME_ESP. + * If we're coming from UserMode, we load the usermode stack pointer + * and go back two frames (first frame is the syscall stub, second call + * is the caller of the stub). + */ + mov edi, [ebp+KTRAP_FRAME_ESP] + test byte ptr [esi+KTHREAD_PREVIOUS_MODE], 0x01 + jz 0f + mov edi, [edi+4] +0: + mov [ebp+KTRAP_FRAME_DEBUGEIP], edi +#endif + + /* Enable interrupts */ + sti +.endm + +// +// @name TRAP_EPILOG +// +// This macro creates an epilogue for leaving any system trap. +// It is used for exiting system calls, exceptions, interrupts and generic +// traps. +// +// @param SystemCall +// Specifies whether this trap will exit a system call. If so, special +// code will be assembled to potentially use SYSEXIT instead of IRETD. +// +// @param RestorePreviousMode +// Specifies if the previous mode should be restored. +// +// @param RestoreSegments +// Specifies if the segment registers should be restored. +// +// @param RestoreVolatiles +// Specifies if the volatile registers should be restored. +// +// @param RestoreAllRegs +// Specifies if volatiles and segments should both be restored. +// +// @remark +// +.macro TRAP_EPILOG SystemCall, RestorePreviousMode, RestoreSegments, RestoreVolatiles, RestoreAllRegs +#ifdef DBG + /* Assert the flags */ + pushfd + pop edx + test edx, EFLAGS_INTERRUPT_MASK + jnz 1f + + /* Assert the stack */ + cmp esp, ebp + jnz 1f + + /* Assert the trap frame */ +0: + //sub dword ptr [esp+KTRAP_FRAME_DEBUGARGMARK], 0xBADB0D00 + //jnz 2f + + /* Assert FS */ + mov bx, fs + cmp bx, KGDT_R0_PCR + jnz 1f + + /* Assert exception list */ + cmp dword ptr fs:[KPCR_EXCEPTION_LIST], 0 + jnz 4f +2: + add dword ptr [esp+KTRAP_FRAME_DEBUGARGMARK], 0xBADB0D00 +1: + int 3 + jmp 0b +4: +#endif + + /* Get exception list */ + mov edx, [esp+KTRAP_FRAME_EXCEPTION_LIST] + +#ifdef DBG + /* Assert the saved exception list */ + or edx, edx + jnz 5f + int 3 +5: +#endif + + /* Restore it */ + mov [fs:KPCR_EXCEPTION_LIST], edx + +.if \RestorePreviousMode + /* Get previous mode */ + mov ecx, [esp+KTRAP_FRAME_PREVIOUS_MODE] + +#ifdef DBG + /* Assert the saved previous mode */ + cmp ecx, -1 + jnz 6f + int 3 +6: +#endif + + /* Restore the previous mode */ + mov esi, [fs:KPCR_CURRENT_THREAD] + mov byte ptr [esi+KTHREAD_PREVIOUS_MODE], cl +.endif + + /* Check for V86 */ + test dword ptr [esp+KTRAP_FRAME_EFLAGS], EFLAGS_V86_MASK + jnz V86_Exit + + /* Check if the frame was edited */ + test word ptr [esp+KTRAP_FRAME_CS], FRAME_EDITED + jz 7f + +.ifeq \RestoreAllRegs + /* Check the old mode */ + cmp word ptr [esp+KTRAP_FRAME_CS], KGDT_R3_CODE + RPL_MASK + bt word ptr [esp+KTRAP_FRAME_CS], 0 + cmc + ja 8f +.endif + +.if \RestoreVolatiles + /* Restore volatiles */ + mov edx, [esp+KTRAP_FRAME_EDX] + mov ecx, [esp+KTRAP_FRAME_ECX] + mov eax, [esp+KTRAP_FRAME_EAX] +.endif + + /* Check if we were called from kernel mode */ + cmp dword ptr [ebp+KTRAP_FRAME_CS], KGDT_R0_CODE + jz 9f + +.if \RestoreSegments + /* Restore segment registers */ + lea esp, [ebp+KTRAP_FRAME_GS] + pop gs + pop es + pop ds +.endif + + /* Restore FS */ +3: + lea esp, [ebp+KTRAP_FRAME_FS] + pop fs + +9: + /* Skip debug information and unsaved registers */ + lea esp, [ebp+KTRAP_FRAME_EDI] + pop edi + pop esi + pop ebx + pop ebp + + /* Check for ABIOS */ + cmp word ptr [esp+8], 0x80 + ja AbiosExit + + /* Pop error code */ + add esp, 4 + +.if \SystemCall + /* Check if previous CS is from user-mode */ + test dword ptr [esp+4], 1 + + /* It is, so use Fast Exit */ + jnz FastExit + + /* Jump back to stub */ + pop edx + pop ecx + popf + jmp edx + +.ret: +.endif + iret + +.if \SystemCall +FastExit: + /* Is SYSEXIT Supported/Wanted? */ + cmp dword ptr ss:[_KiFastSystemCallDisable], 0 + jnz .ret + test dword ptr [esp+8], EFLAGS_TF + jnz .ret + + /* Restore FS to TIB */ + mov ecx, KGDT_R3_TEB + RPL_MASK + mov fs, ecx + + /* We will be cleaning up the stack ourselves */ + pop edx /* New Ring 3 EIP */ + add esp, 4 /* Skip Ring 3 DS */ + and dword ptr [esp], 0xfffffdff /* Remove EFLAGS_INTERRUPT_MASK from EFLAGS */ + popf /* Restore old EFLAGS */ + pop ecx /* Old Ring 3 SS:ESP */ + + /* + * At this point: + * ECX points to the old User Stack. + * EDX points to the instruction to execute in usermode after the sysenter + */ + sti + sysexit +.endif + +8: + /* Restore EAX */ + mov eax, [esp+KTRAP_FRAME_EAX] + + /* Skip registers */ + add esp, 0x30 + + /* Restore segments and volatiles */ + pop gs + pop es + pop ds + pop edx + pop ecx + + /* Jump back to mainline code */ + jmp 3b + +7: + /* Restore real CS value */ + mov ebx, [esp+KTRAP_FRAME_TEMPCS] + mov [esp+KTRAP_FRAME_CS], ebx + + /* + * If ESP was modified, then a special interrupt exit stack + * must be created to "update" ESP's value in a legal manner + */ + mov ebx, [esp+KTRAP_FRAME_TEMPESP] + sub ebx, 0xC + mov [esp+KTRAP_FRAME_ERROR_CODE], ebx + + /* Copy Interrupt Stack */ + mov esi, [esp+KTRAP_FRAME_EFLAGS] + mov [ebx+8], esi + mov esi, [esp+KTRAP_FRAME_CS] + mov [ebx+4], esi + mov esi, [esp+KTRAP_FRAME_EIP] + mov [ebx], esi + + /* Return */ + add esp, KTRAP_FRAME_EDI + pop edi + pop esi + pop ebx + pop ebp + mov esp, [esp] + iret +.endm + Propchange: trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/ntoskrnl/include/internal/i386/v86m.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/include/internal/i… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/v86m.h (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/v86m.h Sat May 20 14:39:53 2006 @@ -1,126 +1,126 @@ -#ifndef __V86M_ -#define __V86M_ - -#include "ketypes.h" - -/* Emulate cli/sti instructions */ -#define KV86M_EMULATE_CLI_STI (0x1) -/* Allow the v86 mode code to access i/o ports */ -#define KV86M_ALLOW_IO_PORT_ACCESS (0x2) - -typedef struct _KV86M_REGISTERS -{ - /* - * General purpose registers - */ - ULONG Ebp; - ULONG Edi; - ULONG Esi; - ULONG Edx; - ULONG Ecx; - ULONG Ebx; - ULONG Eax; - ULONG Ds; - ULONG Es; - ULONG Fs; - ULONG Gs; - - /* - * Control registers - */ - ULONG Eip; - ULONG Cs; - ULONG Eflags; - ULONG Esp; - ULONG Ss; - - /* - * Control structures - */ - ULONG RecoveryAddress; - UCHAR RecoveryInstruction[4]; - ULONG Vif; - ULONG Flags; - PNTSTATUS PStatus; -} KV86M_REGISTERS, *PKV86M_REGISTERS; - -typedef struct _KV86M_TRAP_FRAME -{ - KTRAP_FRAME Tf; - - ULONG SavedExceptionStack; - - /* - * These are put on the top of the stack by the routine that entered - * v86 mode so the exception handlers can find the control information - */ - struct _KV86M_REGISTERS* regs; - ULONG orig_ebp; -} KV86M_TRAP_FRAME, *PKV86M_TRAP_FRAME; - -#endif - -/* EOF */ -#ifndef __V86M_ -#define __V86M_ - -#include "ketypes.h" - -/* Emulate cli/sti instructions */ -#define KV86M_EMULATE_CLI_STI (0x1) -/* Allow the v86 mode code to access i/o ports */ -#define KV86M_ALLOW_IO_PORT_ACCESS (0x2) - -typedef struct _KV86M_REGISTERS -{ - /* - * General purpose registers - */ - ULONG Ebp; - ULONG Edi; - ULONG Esi; - ULONG Edx; - ULONG Ecx; - ULONG Ebx; - ULONG Eax; - ULONG Ds; - ULONG Es; - ULONG Fs; - ULONG Gs; - - /* - * Control registers - */ - ULONG Eip; - ULONG Cs; - ULONG Eflags; - ULONG Esp; - ULONG Ss; - - /* - * Control structures - */ - ULONG RecoveryAddress; - UCHAR RecoveryInstruction[4]; - ULONG Vif; - ULONG Flags; - PNTSTATUS PStatus; -} KV86M_REGISTERS, *PKV86M_REGISTERS; - -typedef struct _KV86M_TRAP_FRAME -{ - KTRAP_FRAME Tf; - - ULONG SavedExceptionStack; - - /* - * These are put on the top of the stack by the routine that entered - * v86 mode so the exception handlers can find the control information - */ - struct _KV86M_REGISTERS* regs; - ULONG orig_ebp; -} KV86M_TRAP_FRAME, *PKV86M_TRAP_FRAME; - -#endif - -/* EOF */ +#ifndef __V86M_ +#define __V86M_ + +#include "ketypes.h" + +/* Emulate cli/sti instructions */ +#define KV86M_EMULATE_CLI_STI (0x1) +/* Allow the v86 mode code to access i/o ports */ +#define KV86M_ALLOW_IO_PORT_ACCESS (0x2) + +typedef struct _KV86M_REGISTERS +{ + /* + * General purpose registers + */ + ULONG Ebp; + ULONG Edi; + ULONG Esi; + ULONG Edx; + ULONG Ecx; + ULONG Ebx; + ULONG Eax; + ULONG Ds; + ULONG Es; + ULONG Fs; + ULONG Gs; + + /* + * Control registers + */ + ULONG Eip; + ULONG Cs; + ULONG Eflags; + ULONG Esp; + ULONG Ss; + + /* + * Control structures + */ + ULONG RecoveryAddress; + UCHAR RecoveryInstruction[4]; + ULONG Vif; + ULONG Flags; + PNTSTATUS PStatus; +} KV86M_REGISTERS, *PKV86M_REGISTERS; + +typedef struct _KV86M_TRAP_FRAME +{ + KTRAP_FRAME Tf; + + ULONG SavedExceptionStack; + + /* + * These are put on the top of the stack by the routine that entered + * v86 mode so the exception handlers can find the control information + */ + struct _KV86M_REGISTERS* regs; + ULONG orig_ebp; +} KV86M_TRAP_FRAME, *PKV86M_TRAP_FRAME; + +#endif + +/* EOF */ +#ifndef __V86M_ +#define __V86M_ + +#include "ketypes.h" + +/* Emulate cli/sti instructions */ +#define KV86M_EMULATE_CLI_STI (0x1) +/* Allow the v86 mode code to access i/o ports */ +#define KV86M_ALLOW_IO_PORT_ACCESS (0x2) + +typedef struct _KV86M_REGISTERS +{ + /* + * General purpose registers + */ + ULONG Ebp; + ULONG Edi; + ULONG Esi; + ULONG Edx; + ULONG Ecx; + ULONG Ebx; + ULONG Eax; + ULONG Ds; + ULONG Es; + ULONG Fs; + ULONG Gs; + + /* + * Control registers + */ + ULONG Eip; + ULONG Cs; + ULONG Eflags; + ULONG Esp; + ULONG Ss; + + /* + * Control structures + */ + ULONG RecoveryAddress; + UCHAR RecoveryInstruction[4]; + ULONG Vif; + ULONG Flags; + PNTSTATUS PStatus; +} KV86M_REGISTERS, *PKV86M_REGISTERS; + +typedef struct _KV86M_TRAP_FRAME +{ + KTRAP_FRAME Tf; + + ULONG SavedExceptionStack; + + /* + * These are put on the top of the stack by the routine that entered + * v86 mode so the exception handlers can find the control information + */ + struct _KV86M_REGISTERS* regs; + ULONG orig_ebp; +} KV86M_TRAP_FRAME, *PKV86M_TRAP_FRAME; + +#endif + +/* EOF */ Propchange: trunk/reactos/ntoskrnl/include/internal/i386/v86m.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/ntoskrnl/include/ntoskrnl.h ------------------------------------------------------------------------------ --- svn:executable (original) +++ svn:executable (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/ntoskrnl/tests/setup.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/ntoskrnl/tests/stubs.tst ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Modified: trunk/reactos/ntoskrnl/tests/tests/VirtualMemory.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/tests/tests/Virtua… ============================================================================== --- trunk/reactos/ntoskrnl/tests/tests/VirtualMemory.c (original) +++ trunk/reactos/ntoskrnl/tests/tests/VirtualMemory.c Sat May 20 14:39:53 2006 @@ -5,7 +5,7 @@ * FILE: ntoskrnl/tests/tests/VirtualMemory.c * PURPOSE: No purpose listed. * - * PROGRAMMERS: No programmer listed. + * PROGRAMMERS: Casper S. Hornstrup (chorns(a)users.sourceforge.net) */ #include <ntoskrnl.h> Propchange: trunk/reactos/ntoskrnl/tests/tests/VirtualMemory.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/regtests/regtests/regtests.c ------------------------------------------------------------------------------ --- svn:executable (original) +++ svn:executable (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/regtests/shared/regtests.c ------------------------------------------------------------------------------ --- svn:executable (original) +++ svn:executable (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/regtests/shared/regtests.h ------------------------------------------------------------------------------ --- svn:executable (original) +++ svn:executable (removed) @@ -1,1 +1,0 @@ -*

1 0

[mbosma] 21945: Only stubs
by mbosma＠svn.reactos.org 20 May '06

20 May '06

Author: mbosma Date: Sat May 20 12:59:59 2006 New Revision: 21945 URL: http://svn.reactos.ru/svn/reactos?rev=21945&view=rev Log: Only stubs Modified: trunk/reactos/ntoskrnl/mm/physical.c (props changed) trunk/reactos/ntoskrnl/mm/verifier.c (props changed) Propchange: trunk/reactos/ntoskrnl/mm/physical.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/ntoskrnl/mm/verifier.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[mbosma] 21944: [AUDIT] Does just contain one stub.
by mbosma＠svn.reactos.org 20 May '06

20 May '06

Author: mbosma Date: Sat May 20 12:50:42 2006 New Revision: 21944 URL: http://svn.reactos.ru/svn/reactos?rev=21944&view=rev Log: [AUDIT] Does just contain one stub. Modified: trunk/reactos/ntoskrnl/mm/paging.c (props changed) Propchange: trunk/reactos/ntoskrnl/mm/paging.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[greatlrd] 21943: patch from w3seek make the kdbg build again
by greatlrd＠svn.reactos.org 19 May '06

19 May '06

Author: greatlrd Date: Fri May 19 16:31:19 2006 New Revision: 21943 URL: http://svn.reactos.ru/svn/reactos?rev=21943&view=rev Log: patch from w3seek make the kdbg build again Modified: trunk/reactos/ntoskrnl/kdbg/kdb.c Modified: trunk/reactos/ntoskrnl/kdbg/kdb.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb.c?rev=219… ============================================================================== --- trunk/reactos/ntoskrnl/kdbg/kdb.c (original) +++ trunk/reactos/ntoskrnl/kdbg/kdb.c Fri May 19 16:31:19 2006 @@ -191,7 +191,7 @@ KAPC_STATE ApcState; /* Get the protection for the address. */ - Protect = MmGetPageProtect((PROS_EPROCESS)Process, (PVOID)PAGE_ROUND_DOWN(Address)); + Protect = MmGetPageProtect(Process, (PVOID)PAGE_ROUND_DOWN(Address)); /* Return if that page isn't present. */ if (Protect & PAGE_NOACCESS) @@ -208,7 +208,7 @@ /* Make the page writeable if it is read only. */ if (Protect & (PAGE_READONLY|PAGE_EXECUTE|PAGE_EXECUTE_READ)) { - MmSetPageProtect((PROS_EPROCESS)Process, (PVOID)PAGE_ROUND_DOWN(Address), + MmSetPageProtect(Process, (PVOID)PAGE_ROUND_DOWN(Address), (Protect & ~(PAGE_READONLY|PAGE_EXECUTE|PAGE_EXECUTE_READ)) | PAGE_READWRITE); } @@ -220,7 +220,7 @@ { if (Protect & (PAGE_READONLY|PAGE_EXECUTE|PAGE_EXECUTE_READ)) { - MmSetPageProtect((PROS_EPROCESS)Process, (PVOID)PAGE_ROUND_DOWN(Address), Protect); + MmSetPageProtect(Process, (PVOID)PAGE_ROUND_DOWN(Address), Protect); } /* Detach from process */ if (CurrentProcess != Process) @@ -237,7 +237,7 @@ /* Restore the page protection. */ if (Protect & (PAGE_READONLY|PAGE_EXECUTE|PAGE_EXECUTE_READ)) { - MmSetPageProtect((PROS_EPROCESS)Process, (PVOID)PAGE_ROUND_DOWN(Address), Protect); + MmSetPageProtect(Process, (PVOID)PAGE_ROUND_DOWN(Address), Protect); } /* Detach from process */

1 0

[ion] 21942: - Use the proper HANDLE_TABLE and HANDLE_TABLE_ENTRY structures.
by ion＠svn.reactos.org 19 May '06

19 May '06

Author: ion Date: Fri May 19 04:32:50 2006 New Revision: 21942 URL: http://svn.reactos.ru/svn/reactos?rev=21942&view=rev Log: - Use the proper HANDLE_TABLE and HANDLE_TABLE_ENTRY structures. Modified: trunk/reactos/include/ndk/extypes.h trunk/reactos/ntoskrnl/ex/handle.c trunk/reactos/ntoskrnl/include/internal/ex.h trunk/reactos/ntoskrnl/ob/handle.c trunk/reactos/ntoskrnl/ob/wait.c trunk/reactos/ntoskrnl/ps/process.c trunk/reactos/ntoskrnl/ps/psmgr.c trunk/reactos/ntoskrnl/ps/thread.c trunk/reactos/ntoskrnl/rtl/libsupp.c Modified: trunk/reactos/include/ndk/extypes.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/include/ndk/extypes.h?rev=2… ============================================================================== --- trunk/reactos/include/ndk/extypes.h (original) +++ trunk/reactos/include/ndk/extypes.h Fri May 19 04:32:50 2006 @@ -467,6 +467,24 @@ // // Handle Table Structures // +typedef struct _HANDLE_TRACE_DB_ENTRY +{ + CLIENT_ID ClientId; + HANDLE Handle; + ULONG Type; + PVOID StackTrace[16]; +} HANDLE_TRACE_DB_ENTRY, *PHANDLE_TRACE_DB_ENTRY; + +typedef struct _HANDLE_TRACE_DEBUG_INFO +{ + LONG RefCount; + ULONG TableSize; + ULONG BitMaskFlags; + FAST_MUTEX CloseCompatcionLock; + ULONG CurrentStackIndex; + HANDLE_TRACE_DB_ENTRY TraceDb[1]; +} HANDLE_TRACE_DEBUG_INFO, *PHANDLE_TRACE_DEBUG_INFO; + typedef struct _HANDLE_TABLE_ENTRY_INFO { ULONG AuditMask; @@ -480,27 +498,60 @@ ULONG_PTR ObAttributes; PHANDLE_TABLE_ENTRY_INFO InfoTable; ULONG_PTR Value; - } u1; + }; union { ULONG GrantedAccess; - USHORT GrantedAccessIndex; + struct + { + USHORT GrantedAccessIndex; + USHORT CreatorBackTraceIndex; + }; LONG NextFreeTableEntry; - } u2; + }; } HANDLE_TABLE_ENTRY, *PHANDLE_TABLE_ENTRY; typedef struct _HANDLE_TABLE { - ULONG Flags; - LONG HandleCount; +#if (NTDDI_VERSION >= NTDDI_WINXP) + ULONG TableCode; +#else PHANDLE_TABLE_ENTRY **Table; +#endif PEPROCESS QuotaProcess; - HANDLE UniqueProcessId; - LONG FirstFreeTableEntry; - LONG NextIndexNeedingPool; - ERESOURCE HandleTableLock; + PVOID UniqueProcessId; +#if (NTDDI_VERSION >= NTDDI_WINXP) + EX_PUSH_LOCK HandleLock; + LIST_ENTRY HandleTableList; + EX_PUSH_LOCK HandleContentionEvent; +#else + ERESOURCE HandleLock; LIST_ENTRY HandleTableList; KEVENT HandleContentionEvent; +#endif + PHANDLE_TRACE_DEBUG_INFO DebugInfo; + LONG ExtraInfoPages; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) + union + { + ULONG Flags; + UCHAR StrictFIFO:1; + }; + LONG FirstFreeHandle; + PHANDLE_TABLE_ENTRY LastFreeHandleEntry; + LONG HandleCount; + ULONG NextHandleNeedingPool; +#else + ULONG FirstFree; + ULONG LastFree; + ULONG NextHandleNeedingPool; + LONG HandleCount; + union + { + ULONG Flags; + UCHAR StrictFIFO:1; + }; +#endif } HANDLE_TABLE, *PHANDLE_TABLE; #endif Modified: trunk/reactos/ntoskrnl/ex/handle.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ex/handle.c?rev=21… ============================================================================== --- trunk/reactos/ntoskrnl/ex/handle.c (original) +++ trunk/reactos/ntoskrnl/ex/handle.c Fri May 19 04:32:50 2006 @@ -33,14 +33,14 @@ #define ExReleaseHandleTableListLock() \ ExReleaseFastMutexUnsafe(&ExpHandleTableListLock) -#define ExAcquireHandleTableLockExclusive(HandleTable) \ - ExAcquireResourceExclusiveLite(&(HandleTable)->HandleTableLock, TRUE) - -#define ExAcquireHandleTableLockShared(HandleTable) \ - ExAcquireResourceSharedLite(&(HandleTable)->HandleTableLock, TRUE) - -#define ExReleaseHandleTableLock(HandleTable) \ - ExReleaseResourceLite(&(HandleTable)->HandleTableLock) +#define ExAcquireHandleLockExclusive(HandleTable) \ + ExAcquireResourceExclusiveLite(&(HandleTable)->HandleLock, TRUE) + +#define ExAcquireHandleLockShared(HandleTable) \ + ExAcquireResourceSharedLite(&(HandleTable)->HandleLock, TRUE) + +#define ExReleaseHandleLock(HandleTable) \ + ExReleaseResourceLite(&(HandleTable)->HandleLock) /* 5 bits: reserved @@ -123,11 +123,11 @@ HandleTable->HandleCount = 0; HandleTable->Table = (PHANDLE_TABLE_ENTRY**)(HandleTable + 1); HandleTable->QuotaProcess = QuotaProcess; - HandleTable->FirstFreeTableEntry = -1; /* no entries freed so far */ - HandleTable->NextIndexNeedingPool = 0; /* no entries freed so far, so we have to allocate already for the first handle */ + HandleTable->FirstFree = -1; /* no entries freed so far */ + HandleTable->NextHandleNeedingPool = 0; /* no entries freed so far, so we have to allocate already for the first handle */ HandleTable->UniqueProcessId = (QuotaProcess ? QuotaProcess->UniqueProcessId : NULL); - ExInitializeResource(&HandleTable->HandleTableLock); + ExInitializeResource(&HandleTable->HandleLock); KeInitializeEvent(&HandleTable->HandleContentionEvent, NotificationEvent, @@ -176,7 +176,7 @@ KeEnterCriticalRegion(); /* ensure there's no other operations going by acquiring an exclusive lock */ - ExAcquireHandleTableLockExclusive(HandleTable); + ExAcquireHandleLockExclusive(HandleTable); ASSERT(!(HandleTable->Flags & EX_HANDLE_TABLE_CLOSING)); @@ -206,10 +206,10 @@ curee != laste; curee++) { - if(curee->u1.Object != NULL && SweepHandleCallback != NULL) + if(curee->Object != NULL && SweepHandleCallback != NULL) { - curee->u1.ObAttributes |= EX_HANDLE_ENTRY_LOCKED; - SweepHandleCallback(HandleTable, curee->u1.Object, curee->u2.GrantedAccess, Context); + curee->ObAttributes |= EX_HANDLE_ENTRY_LOCKED; + SweepHandleCallback(HandleTable, curee->Object, curee->GrantedAccess, Context); } } } @@ -217,7 +217,7 @@ } } - ExReleaseHandleTableLock(HandleTable); + ExReleaseHandleLock(HandleTable); KeLeaveCriticalRegion(); } @@ -281,7 +281,7 @@ KeLeaveCriticalRegion(); /* free the handle table */ - ExDeleteResource(&HandleTable->HandleTableLock); + ExDeleteResource(&HandleTable->HandleLock); ExFreePool(HandleTable); if(QuotaProcess != NULL) @@ -311,7 +311,7 @@ tli = mli = eli = 0; /* make sure the other handle table isn't being changed during the duplication */ - ExAcquireHandleTableLockShared(SourceHandleTable); + ExAcquireHandleLockShared(SourceHandleTable); /* allocate enough tables */ etlp = SourceHandleTable->Table + N_TOPLEVEL_POINTERS; @@ -372,7 +372,7 @@ freehandletable: DPRINT1("Failed to duplicate handle table 0x%p\n", SourceHandleTable); - ExReleaseHandleTableLock(SourceHandleTable); + ExReleaseHandleLock(SourceHandleTable); ExDestroyHandleTable(HandleTable); /* allocate an empty handle table */ @@ -383,8 +383,8 @@ /* duplicate the handles */ HandleTable->HandleCount = SourceHandleTable->HandleCount; - HandleTable->FirstFreeTableEntry = SourceHandleTable->FirstFreeTableEntry; - HandleTable->NextIndexNeedingPool = SourceHandleTable->NextIndexNeedingPool; + HandleTable->FirstFree = SourceHandleTable->FirstFree; + HandleTable->NextHandleNeedingPool = SourceHandleTable->NextHandleNeedingPool; /* make sure all tables are zeroed */ KeMemoryBarrier(); @@ -414,7 +414,7 @@ srcstbl++, stbl++, eli++) { /* try to duplicate the source handle */ - if(srcstbl->u1.Object != NULL && + if(srcstbl->Object != NULL && ExLockHandleTableEntry(SourceHandleTable, srcstbl)) { @@ -426,15 +426,15 @@ { /* free the entry and chain it into the free list */ HandleTable->HandleCount--; - stbl->u1.Object = NULL; - stbl->u2.NextFreeTableEntry = HandleTable->FirstFreeTableEntry; - HandleTable->FirstFreeTableEntry = BUILD_HANDLE(tli, mli, eli); + stbl->Object = NULL; + stbl->NextFreeTableEntry = HandleTable->FirstFree; + HandleTable->FirstFree = BUILD_HANDLE(tli, mli, eli); } else { /* duplicate the handle and unlock it */ - stbl->u2.GrantedAccess = srcstbl->u2.GrantedAccess; - stbl->u1.ObAttributes = srcstbl->u1.ObAttributes & ~EX_HANDLE_ENTRY_LOCKED; + stbl->GrantedAccess = srcstbl->GrantedAccess; + stbl->ObAttributes = srcstbl->ObAttributes & ~EX_HANDLE_ENTRY_LOCKED; } ExUnlockHandleTableEntry(SourceHandleTable, srcstbl); @@ -452,7 +452,7 @@ } /* release the source handle table */ - ExReleaseHandleTableLock(SourceHandleTable); + ExReleaseHandleLock(SourceHandleTable); } return HandleTable; @@ -476,12 +476,12 @@ { ULONG tli, mli, eli; - if(HandleTable->FirstFreeTableEntry != -1) + if(HandleTable->FirstFree != -1) { /* there's a free handle entry we can just grab and use */ - tli = TLI_FROM_HANDLE(HandleTable->FirstFreeTableEntry); - mli = MLI_FROM_HANDLE(HandleTable->FirstFreeTableEntry); - eli = ELI_FROM_HANDLE(HandleTable->FirstFreeTableEntry); + tli = TLI_FROM_HANDLE(HandleTable->FirstFree); + mli = MLI_FROM_HANDLE(HandleTable->FirstFree); + eli = ELI_FROM_HANDLE(HandleTable->FirstFree); /* the pointer should be valid in any way!!! */ ASSERT(HandleTable->Table[tli]); @@ -489,12 +489,12 @@ Entry = &HandleTable->Table[tli][mli][eli]; - *Handle = EX_HANDLE_TO_HANDLE(HandleTable->FirstFreeTableEntry); + *Handle = EX_HANDLE_TO_HANDLE(HandleTable->FirstFree); /* save the index to the next free handle (if available) */ - HandleTable->FirstFreeTableEntry = Entry->u2.NextFreeTableEntry; - Entry->u2.NextFreeTableEntry = 0; - Entry->u1.Object = NULL; + HandleTable->FirstFree = Entry->NextFreeTableEntry; + Entry->NextFreeTableEntry = 0; + Entry->Object = NULL; HandleTable->HandleCount++; } @@ -505,18 +505,18 @@ ULONG i; BOOLEAN AllocatedMtbl; - ASSERT(HandleTable->NextIndexNeedingPool <= N_MAX_HANDLE); + ASSERT(HandleTable->NextHandleNeedingPool <= N_MAX_HANDLE); /* the index of the next table to be allocated was saved in - NextIndexNeedingPool the last time a handle entry was allocated and + NextHandleNeedingPool the last time a handle entry was allocated and the subhandle entry list was full. the subhandle entry index of - NextIndexNeedingPool should be 0 here! */ - tli = TLI_FROM_HANDLE(HandleTable->NextIndexNeedingPool); - mli = MLI_FROM_HANDLE(HandleTable->NextIndexNeedingPool); - DPRINT("HandleTable->NextIndexNeedingPool: 0x%x\n", HandleTable->NextIndexNeedingPool); - DPRINT("tli: 0x%x mli: 0x%x eli: 0x%x\n", tli, mli, ELI_FROM_HANDLE(HandleTable->NextIndexNeedingPool)); - - ASSERT(ELI_FROM_HANDLE(HandleTable->NextIndexNeedingPool) == 0); + NextHandleNeedingPool should be 0 here! */ + tli = TLI_FROM_HANDLE(HandleTable->NextHandleNeedingPool); + mli = MLI_FROM_HANDLE(HandleTable->NextHandleNeedingPool); + DPRINT("HandleTable->NextHandleNeedingPool: 0x%x\n", HandleTable->NextHandleNeedingPool); + DPRINT("tli: 0x%x mli: 0x%x eli: 0x%x\n", tli, mli, ELI_FROM_HANDLE(HandleTable->NextHandleNeedingPool)); + + ASSERT(ELI_FROM_HANDLE(HandleTable->NextHandleNeedingPool) == 0); DPRINT("HandleTable->Table[%d] == 0x%p\n", tli, HandleTable->Table[tli]); @@ -595,25 +595,25 @@ /* let's just use the very first entry */ Entry = ntbl; - Entry->u1.ObAttributes = EX_HANDLE_ENTRY_LOCKED; - Entry->u2.NextFreeTableEntry = 0; - - *Handle = EX_HANDLE_TO_HANDLE(HandleTable->NextIndexNeedingPool); + Entry->ObAttributes = EX_HANDLE_ENTRY_LOCKED; + Entry->NextFreeTableEntry = 0; + + *Handle = EX_HANDLE_TO_HANDLE(HandleTable->NextHandleNeedingPool); HandleTable->HandleCount++; - /* set the FirstFreeTableEntry member to the second entry and chain the + /* set the FirstFree member to the second entry and chain the free entries */ - HandleTable->FirstFreeTableEntry = HandleTable->NextIndexNeedingPool + 1; - for(cure = Entry + 1, laste = Entry + N_SUBHANDLE_ENTRIES, i = HandleTable->FirstFreeTableEntry + 1; + HandleTable->FirstFree = HandleTable->NextHandleNeedingPool + 1; + for(cure = Entry + 1, laste = Entry + N_SUBHANDLE_ENTRIES, i = HandleTable->FirstFree + 1; cure != laste; cure++, i++) { - cure->u1.Object = NULL; - cure->u2.NextFreeTableEntry = i; + cure->Object = NULL; + cure->NextFreeTableEntry = i; } /* truncate the free entry list */ - (cure - 1)->u2.NextFreeTableEntry = -1; + (cure - 1)->NextFreeTableEntry = -1; /* save the pointers to the allocated list(s) */ (void)InterlockedExchangePointer(&nmtbl[mli], ntbl); @@ -622,9 +622,9 @@ (void)InterlockedExchangePointer(&HandleTable->Table[tli], nmtbl); } - /* increment the NextIndexNeedingPool to the next index where we need to + /* increment the NextHandleNeedingPool to the next index where we need to allocate new memory */ - HandleTable->NextIndexNeedingPool += N_SUBHANDLE_ENTRIES; + HandleTable->NextHandleNeedingPool += N_SUBHANDLE_ENTRIES; } } else @@ -651,9 +651,9 @@ /* automatically unlock the entry if currently locked. We however don't notify anyone who waited on the handle because we're holding an exclusive lock after all and these locks will fail then */ - (void)InterlockedExchangePointer(&Entry->u1.Object, NULL); - Entry->u2.NextFreeTableEntry = HandleTable->FirstFreeTableEntry; - HandleTable->FirstFreeTableEntry = Handle; + (void)InterlockedExchangePointer(&Entry->Object, NULL); + Entry->NextFreeTableEntry = HandleTable->FirstFree; + HandleTable->FirstFree = Handle; HandleTable->HandleCount--; } @@ -678,11 +678,11 @@ eli = ELI_FROM_HANDLE(Handle); mlp = HandleTable->Table[tli]; - if(Handle < HandleTable->NextIndexNeedingPool && - mlp != NULL && mlp[mli] != NULL && mlp[mli][eli].u1.Object != NULL) + if(Handle < HandleTable->NextHandleNeedingPool && + mlp != NULL && mlp[mli] != NULL && mlp[mli][eli].Object != NULL) { Entry = &mlp[mli][eli]; - DPRINT("handle lookup 0x%x -> entry 0x%p [HT:0x%p] ptr: 0x%p\n", Handle, Entry, HandleTable, mlp[mli][eli].u1.Object); + DPRINT("handle lookup 0x%x -> entry 0x%p [HT:0x%p] ptr: 0x%p\n", Handle, Entry, HandleTable, mlp[mli][eli].Object); } } else @@ -708,7 +708,7 @@ for(;;) { - Current = (volatile ULONG_PTR)Entry->u1.Object; + Current = (volatile ULONG_PTR)Entry->Object; if(!Current || (HandleTable->Flags & EX_HANDLE_TABLE_CLOSING)) { @@ -719,7 +719,7 @@ if(!(Current & EX_HANDLE_ENTRY_LOCKED)) { New = Current | EX_HANDLE_ENTRY_LOCKED; - if(InterlockedCompareExchangePointer(&Entry->u1.Object, + if(InterlockedCompareExchangePointer(&Entry->Object, (PVOID)New, (PVOID)Current) == (PVOID)Current) { @@ -756,13 +756,13 @@ DPRINT("ExUnlockHandleTableEntry HT:0x%p Entry:0x%p\n", HandleTable, Entry); - Current = (volatile ULONG_PTR)Entry->u1.Object; + Current = (volatile ULONG_PTR)Entry->Object; ASSERT(Current & EX_HANDLE_ENTRY_LOCKED); New = Current & ~EX_HANDLE_ENTRY_LOCKED; - (void)InterlockedExchangePointer(&Entry->u1.Object, + (void)InterlockedExchangePointer(&Entry->Object, (PVOID)New); /* we unlocked the entry, pulse the contention event so threads who're waiting @@ -784,13 +784,13 @@ ASSERT(HandleTable); ASSERT(Entry); - /* The highest bit in Entry->u1.Object has to be 1 so we make sure it's a + /* The highest bit in Entry->Object has to be 1 so we make sure it's a pointer to kmode memory. It will cleared though because it also indicates the lock */ - ASSERT((ULONG_PTR)Entry->u1.Object & EX_HANDLE_ENTRY_LOCKED); + ASSERT((ULONG_PTR)Entry->Object & EX_HANDLE_ENTRY_LOCKED); KeEnterCriticalRegion(); - ExAcquireHandleTableLockExclusive(HandleTable); + ExAcquireHandleLockExclusive(HandleTable); NewHandleTableEntry = ExpAllocateHandleTableEntry(HandleTable, &Handle); @@ -802,7 +802,7 @@ NewHandleTableEntry); } - ExReleaseHandleTableLock(HandleTable); + ExReleaseHandleLock(HandleTable); KeLeaveCriticalRegion(); return Handle; @@ -823,7 +823,7 @@ ExHandle = HANDLE_TO_EX_HANDLE(Handle); KeEnterCriticalRegion(); - ExAcquireHandleTableLockExclusive(HandleTable); + ExAcquireHandleLockExclusive(HandleTable); HandleTableEntry = ExpLookupHandleTableEntry(HandleTable, ExHandle); @@ -838,7 +838,7 @@ Ret = TRUE; } - ExReleaseHandleTableLock(HandleTable); + ExReleaseHandleLock(HandleTable); KeLeaveCriticalRegion(); return Ret; @@ -855,12 +855,12 @@ ASSERT(Entry); /* This routine requires the entry to be locked */ - ASSERT((ULONG_PTR)Entry->u1.Object & EX_HANDLE_ENTRY_LOCKED); + ASSERT((ULONG_PTR)Entry->Object & EX_HANDLE_ENTRY_LOCKED); DPRINT("DestroyHandleByEntry HT:0x%p Entry:0x%p\n", HandleTable, Entry); KeEnterCriticalRegion(); - ExAcquireHandleTableLockExclusive(HandleTable); + ExAcquireHandleLockExclusive(HandleTable); /* free and automatically unlock the handle. However we don't need to pulse the contention event since other locks on this entry will fail */ @@ -868,7 +868,7 @@ Entry, HANDLE_TO_EX_HANDLE(Handle)); - ExReleaseHandleTableLock(HandleTable); + ExReleaseHandleLock(HandleTable); KeLeaveCriticalRegion(); } Modified: trunk/reactos/ntoskrnl/include/internal/ex.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/include/internal/e… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ex.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ex.h Fri May 19 04:32:50 2006 @@ -11,7 +11,7 @@ #define EX_OBJ_TO_HDR(eob) ((PROS_OBJECT_HEADER)((ULONG_PTR)(eob) & \ ~(EX_HANDLE_ENTRY_PROTECTFROMCLOSE | EX_HANDLE_ENTRY_INHERITABLE | \ EX_HANDLE_ENTRY_AUDITONCLOSE))) -#define EX_HTE_TO_HDR(hte) ((PROS_OBJECT_HEADER)((ULONG_PTR)((hte)->u1.Object) & \ +#define EX_HTE_TO_HDR(hte) ((PROS_OBJECT_HEADER)((ULONG_PTR)((hte)->Object) & \ ~(EX_HANDLE_ENTRY_PROTECTFROMCLOSE | EX_HANDLE_ENTRY_INHERITABLE | \ EX_HANDLE_ENTRY_AUDITONCLOSE))) Modified: trunk/reactos/ntoskrnl/ob/handle.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ob/handle.c?rev=21… ============================================================================== --- trunk/reactos/ntoskrnl/ob/handle.c (original) +++ trunk/reactos/ntoskrnl/ob/handle.c Fri May 19 04:32:50 2006 @@ -123,8 +123,8 @@ Handle); if (HandleTableEntry != NULL) { - HandleInfo->Inherit = (HandleTableEntry->u1.ObAttributes & EX_HANDLE_ENTRY_INHERITABLE) != 0; - HandleInfo->ProtectFromClose = (HandleTableEntry->u1.ObAttributes & EX_HANDLE_ENTRY_PROTECTFROMCLOSE) != 0; + HandleInfo->Inherit = (HandleTableEntry->ObAttributes & EX_HANDLE_ENTRY_INHERITABLE) != 0; + HandleInfo->ProtectFromClose = (HandleTableEntry->ObAttributes & EX_HANDLE_ENTRY_PROTECTFROMCLOSE) != 0; ExUnlockHandleTableEntry(Process->ObjectTable, HandleTableEntry); @@ -183,14 +183,14 @@ if (HandleTableEntry != NULL) { if (HandleInfo->Inherit) - HandleTableEntry->u1.ObAttributes |= EX_HANDLE_ENTRY_INHERITABLE; + HandleTableEntry->ObAttributes |= EX_HANDLE_ENTRY_INHERITABLE; else - HandleTableEntry->u1.ObAttributes &= ~EX_HANDLE_ENTRY_INHERITABLE; + HandleTableEntry->ObAttributes &= ~EX_HANDLE_ENTRY_INHERITABLE; if (HandleInfo->ProtectFromClose) - HandleTableEntry->u1.ObAttributes |= EX_HANDLE_ENTRY_PROTECTFROMCLOSE; + HandleTableEntry->ObAttributes |= EX_HANDLE_ENTRY_PROTECTFROMCLOSE; else - HandleTableEntry->u1.ObAttributes &= ~EX_HANDLE_ENTRY_PROTECTFROMCLOSE; + HandleTableEntry->ObAttributes &= ~EX_HANDLE_ENTRY_PROTECTFROMCLOSE; /* FIXME: Do we need to set anything in the object header??? */ @@ -231,7 +231,7 @@ Handle); if(HandleEntry != NULL) { - if(HandleEntry->u1.ObAttributes & EX_HANDLE_ENTRY_PROTECTFROMCLOSE) + if(HandleEntry->ObAttributes & EX_HANDLE_ENTRY_PROTECTFROMCLOSE) { ExUnlockHandleTableEntry(ObjectTable, HandleEntry); @@ -316,17 +316,17 @@ ObjectHeader = EX_HTE_TO_HDR(SourceHandleEntry); ObjectBody = &ObjectHeader->Body; - NewHandleEntry.u1.Object = SourceHandleEntry->u1.Object; + NewHandleEntry.Object = SourceHandleEntry->Object; if(HandleAttributes & OBJ_INHERIT) - NewHandleEntry.u1.ObAttributes |= EX_HANDLE_ENTRY_INHERITABLE; + NewHandleEntry.ObAttributes |= EX_HANDLE_ENTRY_INHERITABLE; else - NewHandleEntry.u1.ObAttributes &= ~EX_HANDLE_ENTRY_INHERITABLE; - NewHandleEntry.u2.GrantedAccess = ((Options & DUPLICATE_SAME_ACCESS) ? - SourceHandleEntry->u2.GrantedAccess : + NewHandleEntry.ObAttributes &= ~EX_HANDLE_ENTRY_INHERITABLE; + NewHandleEntry.GrantedAccess = ((Options & DUPLICATE_SAME_ACCESS) ? + SourceHandleEntry->GrantedAccess : DesiredAccess); if (Options & DUPLICATE_SAME_ACCESS) { - NewHandleEntry.u2.GrantedAccess = SourceHandleEntry->u2.GrantedAccess; + NewHandleEntry.GrantedAccess = SourceHandleEntry->GrantedAccess; } else { @@ -335,7 +335,7 @@ RtlMapGenericMask(&DesiredAccess, &ObjectHeader->Type->TypeInfo.GenericMapping); } - NewHandleEntry.u2.GrantedAccess = DesiredAccess; + NewHandleEntry.GrantedAccess = DesiredAccess; } /* reference the object so it doesn't get deleted after releasing the lock @@ -634,7 +634,7 @@ PAGED_CODE(); - Ret = (HandleTableEntry->u1.ObAttributes & EX_HANDLE_ENTRY_INHERITABLE) != 0; + Ret = (HandleTableEntry->ObAttributes & EX_HANDLE_ENTRY_INHERITABLE) != 0; if(Ret) { ObjectHeader = EX_HTE_TO_HDR(HandleTableEntry); @@ -739,12 +739,12 @@ &ObjectHeader->Type->TypeInfo.GenericMapping); } - NewEntry.u1.Object = ObjectHeader; + NewEntry.Object = ObjectHeader; if(HandleAttributes & OBJ_INHERIT) - NewEntry.u1.ObAttributes |= EX_HANDLE_ENTRY_INHERITABLE; + NewEntry.ObAttributes |= EX_HANDLE_ENTRY_INHERITABLE; else - NewEntry.u1.ObAttributes &= ~EX_HANDLE_ENTRY_INHERITABLE; - NewEntry.u2.GrantedAccess = GrantedAccess; + NewEntry.ObAttributes &= ~EX_HANDLE_ENTRY_INHERITABLE; + NewEntry.GrantedAccess = GrantedAccess; if ((HandleAttributes & OBJ_KERNEL_HANDLE) && ExGetPreviousMode == KernelMode) @@ -834,7 +834,7 @@ Handle); if(HandleEntry != NULL) { - *GenerateOnClose = (HandleEntry->u1.ObAttributes & EX_HANDLE_ENTRY_AUDITONCLOSE) != 0; + *GenerateOnClose = (HandleEntry->ObAttributes & EX_HANDLE_ENTRY_AUDITONCLOSE) != 0; ExUnlockHandleTableEntry(Process->ObjectTable, HandleEntry); @@ -1013,7 +1013,7 @@ &BODY_TO_HEADER(ObjectBody)->Type->TypeInfo.GenericMapping); } - GrantedAccess = HandleEntry->u2.GrantedAccess; + GrantedAccess = HandleEntry->GrantedAccess; /* Unless running as KernelMode, deny access if caller desires more access rights than the handle can grant */ @@ -1036,7 +1036,7 @@ ObReferenceObject(ObjectBody); - Attributes = HandleEntry->u1.ObAttributes & (EX_HANDLE_ENTRY_PROTECTFROMCLOSE | + Attributes = HandleEntry->ObAttributes & (EX_HANDLE_ENTRY_PROTECTFROMCLOSE | EX_HANDLE_ENTRY_INHERITABLE | EX_HANDLE_ENTRY_AUDITONCLOSE); Modified: trunk/reactos/ntoskrnl/ob/wait.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ob/wait.c?rev=2194… ============================================================================== --- trunk/reactos/ntoskrnl/ob/wait.c (original) +++ trunk/reactos/ntoskrnl/ob/wait.c Fri May 19 04:32:50 2006 @@ -132,7 +132,7 @@ } /* Check for synchronize access */ - GrantedAccess = HandleEntry->u2.GrantedAccess; + GrantedAccess = HandleEntry->GrantedAccess; if ((PreviousMode != KernelMode) && (!(GrantedAccess & SYNCHRONIZE))) { /* Unlock the entry and fail */ Modified: trunk/reactos/ntoskrnl/ps/process.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ps/process.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ps/process.c (original) +++ trunk/reactos/ntoskrnl/ps/process.c Fri May 19 04:32:50 2006 @@ -383,8 +383,8 @@ /* Create a handle for the Process */ DPRINT("Initialzing Process CID Handle\n"); - CidEntry.u1.Object = Process; - CidEntry.u2.GrantedAccess = 0; + CidEntry.Object = Process; + CidEntry.GrantedAccess = 0; Process->UniqueProcessId = ExCreateHandle(PspCidTable, &CidEntry); DPRINT("Created CID: %d\n", Process->UniqueProcessId); if(!Process->UniqueProcessId) @@ -499,7 +499,7 @@ ProcessId))) { /* Get the Process */ - FoundProcess = CidEntry->u1.Object; + FoundProcess = CidEntry->Object; /* Make sure it's really a process */ if (FoundProcess->Pcb.Header.Type == ProcessObject) @@ -541,7 +541,7 @@ Cid->UniqueThread))) { /* Get the Process */ - FoundThread = CidEntry->u1.Object; + FoundThread = CidEntry->Object; /* Make sure it's really a thread and this process' */ if ((FoundThread->Tcb.DispatcherHeader.Type == ThreadObject) && Modified: trunk/reactos/ntoskrnl/ps/psmgr.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ps/psmgr.c?rev=219… ============================================================================== --- trunk/reactos/ntoskrnl/ps/psmgr.c (original) +++ trunk/reactos/ntoskrnl/ps/psmgr.c Fri May 19 04:32:50 2006 @@ -306,8 +306,8 @@ ObCreateHandleTable(NULL, FALSE, PsInitialSystemProcess); ObpKernelHandleTable = PsInitialSystemProcess->ObjectTable; - CidEntry.u1.Object = PsInitialSystemProcess; - CidEntry.u2.GrantedAccess = 0; + CidEntry.Object = PsInitialSystemProcess; + CidEntry.GrantedAccess = 0; PsInitialSystemProcess->UniqueProcessId = ExCreateHandle(PspCidTable, &CidEntry); if(!PsInitialSystemProcess->UniqueProcessId) Modified: trunk/reactos/ntoskrnl/ps/thread.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ps/thread.c?rev=21… ============================================================================== --- trunk/reactos/ntoskrnl/ps/thread.c (original) +++ trunk/reactos/ntoskrnl/ps/thread.c Fri May 19 04:32:50 2006 @@ -182,8 +182,8 @@ /* Create Cid Handle */ DPRINT("Creating Thread Handle (CID)\n"); - CidEntry.u1.Object = Thread; - CidEntry.u2.GrantedAccess = 0; + CidEntry.Object = Thread; + CidEntry.GrantedAccess = 0; Thread->Cid.UniqueThread = ExCreateHandle(PspCidTable, &CidEntry); if (!Thread->Cid.UniqueThread) { @@ -378,7 +378,7 @@ ThreadId))) { /* Get the Process */ - FoundThread = CidEntry->u1.Object; + FoundThread = CidEntry->Object; /* Make sure it's really a process */ if (FoundThread->Tcb.DispatcherHeader.Type == ThreadObject) Modified: trunk/reactos/ntoskrnl/rtl/libsupp.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/rtl/libsupp.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/rtl/libsupp.c (original) +++ trunk/reactos/ntoskrnl/rtl/libsupp.c Fri May 19 04:32:50 2006 @@ -292,8 +292,8 @@ HANDLE Handle; USHORT HandleIndex; - ExEntry.u1.Object = Entry; - ExEntry.u2.GrantedAccess = 0x1; /* FIXME - valid handle */ + ExEntry.Object = Entry; + ExEntry.GrantedAccess = 0x1; /* FIXME - valid handle */ Handle = ExCreateHandle(AtomTable->ExHandleTable, &ExEntry); @@ -330,7 +330,7 @@ (HANDLE)((ULONG_PTR)Index << 2)); if (ExEntry != NULL) { - Entry = ExEntry->u1.Object; + Entry = ExEntry->Object; ExUnlockHandleTableEntry(AtomTable->ExHandleTable, ExEntry);

1 0

[greatlrd] 21941: forget this file
by greatlrd＠svn.reactos.org 19 May '06

19 May '06

Author: greatlrd Date: Fri May 19 04:14:05 2006 New Revision: 21941 URL: http://svn.reactos.ru/svn/reactos?rev=21941&view=rev Log: forget this file Modified: trunk/reactos/lib/crt/crt.rbuild Modified: trunk/reactos/lib/crt/crt.rbuild URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/lib/crt/crt.rbuild?rev=2194… ============================================================================== --- trunk/reactos/lib/crt/crt.rbuild (original) +++ trunk/reactos/lib/crt/crt.rbuild Fri May 19 04:14:05 2006 @@ -119,6 +119,7 @@ <file>jn_yn.c</file> <file>ldexp.c</file> <file>log10.c</file> + <file>modf.c</file> <file>s_modf.c</file> <file>pow.c</file> <file>sinh.c</file>

1 0

[greatlrd] 21940: fix the build after me
by greatlrd＠svn.reactos.org 19 May '06

19 May '06

Author: greatlrd Date: Fri May 19 04:13:28 2006 New Revision: 21940 URL: http://svn.reactos.ru/svn/reactos?rev=21940&view=rev Log: fix the build after me Modified: trunk/reactos/lib/crt/math/math.c trunk/reactos/lib/crt/math/modf.c Modified: trunk/reactos/lib/crt/math/math.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/lib/crt/math/math.c?rev=219… ============================================================================== --- trunk/reactos/lib/crt/math/math.c (original) +++ trunk/reactos/lib/crt/math/math.c Fri May 19 04:13:28 2006 @@ -33,6 +33,10 @@ return 0; } +double linkme_fmod(double __x, double __y) +{ + return fmod(__x, __y); +} double linkme_sqrt(double __x) { Modified: trunk/reactos/lib/crt/math/modf.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/lib/crt/math/modf.c?rev=219… ============================================================================== --- trunk/reactos/lib/crt/math/modf.c (original) +++ trunk/reactos/lib/crt/math/modf.c Fri May 19 04:13:28 2006 @@ -14,74 +14,6 @@ //static const double one = 1.0; -double modf(double __x, double *__i) -{ - union - { - double* __x; - double_t* x; - } x; - union - { - double* __i; - double_t* iptr; - } iptr; - - int j0; - unsigned int i; - - x.__x = &__x; - iptr.__i = __i; - - - j0 = x.x->exponent - 0x3ff; /* exponent of x */ - if(j0<20) { /* integer part in high x */ - if(j0<0) { /* |x|<1 */ - *__i = 0.0; - iptr.iptr->sign = x.x->sign; - return __x; - } else { - - if ( x.x->mantissah == 0 && x.x->mantissal == 0 ) { - *__i = __x; - return 0.0; - } - - i = (0x000fffff)>>j0; - iptr.iptr->sign = x.x->sign; - iptr.iptr->exponent = x.x->exponent; - iptr.iptr->mantissah = x.x->mantissah&(~i); - iptr.iptr->mantissal = 0; - if ( __x == *__i ) { - __x = 0.0; - x.x->sign = iptr.iptr->sign; - return __x; - } - return __x - *__i; - } - } else if (j0>51) { /* no fraction part */ - *__i = __x; - if ( _isnan(__x) || _isinf(__x) ) - return __x; - - __x = 0.0; - x.x->sign = iptr.iptr->sign; - return __x; - } else { /* fraction part in low x */ - - i = ((unsigned)(0xffffffff))>>(j0-20); - iptr.iptr->sign = x.x->sign; - iptr.iptr->exponent = x.x->exponent; - iptr.iptr->mantissah = x.x->mantissah; - iptr.iptr->mantissal = x.x->mantissal&(~i); - if ( __x == *__i ) { - __x = 0.0; - x.x->sign = iptr.iptr->sign; - return __x; - } - return __x - *__i; - } -} long double modfl(long double __x, long double *__i)

1 0

[greatlrd] 21939: [AUDIT] The code is from Sun that is free to use. checked in djgpp, djgpp contain same code.
by greatlrd＠svn.reactos.org 19 May '06

19 May '06

Author: greatlrd Date: Fri May 19 04:12:11 2006 New Revision: 21939 URL: http://svn.reactos.ru/svn/reactos?rev=21939&view=rev Log: [AUDIT] The code is from Sun that is free to use. checked in djgpp, djgpp contain same code. Modified: trunk/reactos/lib/crt/math/modf.c (props changed) Propchange: trunk/reactos/lib/crt/math/modf.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[greatlrd] 21938: did delete wrong file sorry
by greatlrd＠svn.reactos.org 18 May '06

18 May '06

Author: greatlrd Date: Fri May 19 03:53:42 2006 New Revision: 21938 URL: http://svn.reactos.ru/svn/reactos?rev=21938&view=rev Log: did delete wrong file sorry Added: trunk/reactos/lib/crt/math/fmod.c - copied unchanged from r21936, trunk/reactos/lib/crt/math/fmod.c

1 0

[greatlrd] 21937: Fix the calc bug, modf is compelete wrong, replace it with DJGPP C version of modf with small changes from me. so it compile in ReactOS, Follow bugs did I notice in our modf 1. bug did not clear the st reg before it was use 2. bug did not load the reg right 3. bug did not handler all case
by greatlrd＠svn.reactos.org 18 May '06

18 May '06

Author: greatlrd Date: Fri May 19 03:42:50 2006 New Revision: 21937 URL: http://svn.reactos.ru/svn/reactos?rev=21937&view=rev Log: Fix the calc bug, modf is compelete wrong, replace it with DJGPP C version of modf with small changes from me. so it compile in ReactOS, Follow bugs did I notice in our modf 1. bug did not clear the st reg before it was use 2. bug did not load the reg right 3. bug did not handler all case Added: trunk/reactos/lib/crt/math/s_modf.c Removed: trunk/reactos/lib/crt/math/fmod.c Modified: trunk/reactos/lib/crt/crt.rbuild trunk/reactos/lib/crt/math/math.c Modified: trunk/reactos/lib/crt/crt.rbuild URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/lib/crt/crt.rbuild?rev=2193… ============================================================================== --- trunk/reactos/lib/crt/crt.rbuild (original) +++ trunk/reactos/lib/crt/crt.rbuild Fri May 19 03:42:50 2006 @@ -119,7 +119,7 @@ <file>jn_yn.c</file> <file>ldexp.c</file> <file>log10.c</file> - <file>modf.c</file> + <file>s_modf.c</file> <file>pow.c</file> <file>sinh.c</file> <file>stubs.c</file> Removed: trunk/reactos/lib/crt/math/fmod.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/lib/crt/math/fmod.c?rev=219… ============================================================================== --- trunk/reactos/lib/crt/math/fmod.c (original) +++ trunk/reactos/lib/crt/math/fmod.c (removed) @@ -1,39 +1,0 @@ -/* Math functions for i387. - Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by John C. Bowman <bowman(a)ipp-garching.mpg.de>, 1995. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with the GNU C Library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ - -#include <math.h> - -double fmod (double __x, double __y); - -double fmod (double __x, double __y) -{ - register double __val; -#ifdef __GNUC__ - __asm __volatile__ - ("1: fprem\n\t" - "fstsw %%ax\n\t" - "sahf\n\t" - "jp 1b" - : "=t" (__val) : "0" (__x), "u" (__y) : "ax", "cc"); -#else - __val = linkme_fmod(__x, __y); -#endif /*__GNUC__*/ - return __val; -} Modified: trunk/reactos/lib/crt/math/math.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/lib/crt/math/math.c?rev=219… ============================================================================== --- trunk/reactos/lib/crt/math/math.c (original) +++ trunk/reactos/lib/crt/math/math.c Fri May 19 03:42:50 2006 @@ -33,10 +33,6 @@ return 0; } -double linkme_fmod(double __x, double __y) -{ - return fmod(__x, __y); -} double linkme_sqrt(double __x) { Added: trunk/reactos/lib/crt/math/s_modf.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/lib/crt/math/s_modf.c?rev=2… ============================================================================== --- trunk/reactos/lib/crt/math/s_modf.c (added) +++ trunk/reactos/lib/crt/math/s_modf.c Fri May 19 03:42:50 2006 @@ -1,0 +1,194 @@ + + +/* @(#)s_modf.c 5.1 93/09/24 */ +/* + * ==================================================== + * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved. + * + * Developed at SunPro, a Sun Microsystems, Inc. business. + * Permission to use, copy, modify, and distribute this + * software is freely granted, provided that this notice + * is preserved. + * ==================================================== + */ + +/* +FUNCTION + <<modf>>, <<modff>>---split fractional and integer parts + +INDEX + modf +INDEX + modff + +ANSI_SYNOPSIS + #include <math.h> + double modf(double <[val]>, double *<[ipart]>); + float modff(float <[val]>, float *<[ipart]>); + +TRAD_SYNOPSIS + #include <math.h> + double modf(<[val]>, <[ipart]>) + double <[val]>; + double *<[ipart]>; + + float modff(<[val]>, <[ipart]>) + float <[val]>; + float *<[ipart]>; + +DESCRIPTION + <<modf>> splits the double <[val]> apart into an integer part + and a fractional part, returning the fractional part and + storing the integer part in <<*<[ipart]>>>. No rounding + whatsoever is done; the sum of the integer and fractional + parts is guaranteed to be exactly equal to <[val]>. That + is, if . <[realpart]> = modf(<[val]>, &<[intpart]>); then + `<<<[realpart]>+<[intpart]>>>' is the same as <[val]>. + <<modff>> is identical, save that it takes and returns + <<float>> rather than <<double>> values. + +RETURNS + The fractional part is returned. Each result has the same + sign as the supplied argument <[val]>. + +PORTABILITY + <<modf>> is ANSI C. <<modff>> is an extension. + +QUICKREF + modf ansi pure + modff - pure + +*/ + +/* + * modf(double x, double *iptr) + * return fraction part of x, and return x's integral part in *iptr. + * Method: + * Bit twiddling. + * + * Exception: + * No exception. + */ + + +static const double one = 1.0; + +#define __int32_t long +#define __uint32_t unsigned long +#define __IEEE_LITTLE_ENDIAN + +#ifdef __IEEE_BIG_ENDIAN + +typedef union +{ + struct + { + __uint32_t msw; + __uint32_t lsw; + } parts; + double value; +} ieee_double_shape_type; + +#endif + +#ifdef __IEEE_LITTLE_ENDIAN + +typedef union +{ + struct + { + __uint32_t lsw; + __uint32_t msw; + } parts; + double value; +} ieee_double_shape_type; + +#endif + + +/* Get two 32 bit ints from a double. */ + +#define EXTRACT_WORDS(ix0,ix1,d) \ +do { \ + ieee_double_shape_type ew_u; \ + ew_u.value = (d); \ + (ix0) = ew_u.parts.msw; \ + (ix1) = ew_u.parts.lsw; \ +} while (0) + +/* Get the more significant 32 bit int from a double. */ + +#define GET_HIGH_WORD(i,d) \ +do { \ + ieee_double_shape_type gh_u; \ + gh_u.value = (d); \ + (i) = gh_u.parts.msw; \ +} while (0) + +/* Get the less significant 32 bit int from a double. */ + +#define GET_LOW_WORD(i,d) \ +do { \ + ieee_double_shape_type gl_u; \ + gl_u.value = (d); \ + (i) = gl_u.parts.lsw; \ +} while (0) + +/* Set a double from two 32 bit ints. */ + +#define INSERT_WORDS(d,ix0,ix1) \ +do { \ + ieee_double_shape_type iw_u; \ + iw_u.parts.msw = (ix0); \ + iw_u.parts.lsw = (ix1); \ + (d) = iw_u.value; \ +} while (0) + + + + +double modf(double x, double *iptr) +{ + __int32_t i0,i1,j_0; + __uint32_t i; + EXTRACT_WORDS(i0,i1,x); + j_0 = ((i0>>20)&0x7ff)-0x3ff; /* exponent of x */ + if(j_0<20) { /* integer part in high x */ + if(j_0<0) { /* |x|<1 */ + INSERT_WORDS(*iptr,i0&0x80000000U,0); /* *iptr = +-0 */ + return x; + } else { + i = (0x000fffff)>>j_0; + if(((i0&i)|i1)==0) { /* x is integral */ + __uint32_t high; + *iptr = x; + GET_HIGH_WORD(high,x); + INSERT_WORDS(x,high&0x80000000U,0); /* return +-0 */ + return x; + } else { + INSERT_WORDS(*iptr,i0&(~i),0); + return x - *iptr; + } + } + } else if (j_0>51) { /* no fraction part */ + __uint32_t high; + *iptr = x*one; + GET_HIGH_WORD(high,x); + INSERT_WORDS(x,high&0x80000000U,0); /* return +-0 */ + return x; + } else { /* fraction part in low x */ + i = ((__uint32_t)(0xffffffffU))>>(j_0-20); + if((i1&i)==0) { /* x is integral */ + __uint32_t high; + *iptr = x; + GET_HIGH_WORD(high,x); + INSERT_WORDS(x,high&0x80000000U,0); /* return +-0 */ + return x; + } else { + INSERT_WORDS(*iptr,i0,i1&(~i)); + return x - *iptr; + } + } +} + +//#endif /* _DOUBLE_IS_32BITS */

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