Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gedmurphy] 20937: program files should use a separate a resource from directories.
by gedmurphy＠svn.reactos.org 17 Jan '06

17 Jan '06

program files should use a separate a resource from directories. Modified: trunk/reactos/subsys/system/explorer/explorer-en.rc Modified: trunk/reactos/subsys/system/explorer/res/apps.ico Modified: trunk/reactos/subsys/system/explorer/taskbar/startmenu.cpp _____ Modified: trunk/reactos/subsys/system/explorer/explorer-en.rc --- trunk/reactos/subsys/system/explorer/explorer-en.rc 2006-01-17 06:36:35 UTC (rev 20936) +++ trunk/reactos/subsys/system/explorer/explorer-en.rc 2006-01-17 16:39:50 UTC (rev 20937) @@ -333,7 +333,7 @@ IDS_LAUNCH "Run..." IDS_START_HELP "Help" IDS_SEARCH_FILES "Search..." - IDS_DOCUMENTS "Documents" + IDS_DOCUMENTS "My Documents" IDS_FAVORITES "Favorites" IDS_PROGRAMS "Programs" IDS_SETTINGS "Settings" _____ Modified: trunk/reactos/subsys/system/explorer/res/apps.ico (Binary files differ) _____ Modified: trunk/reactos/subsys/system/explorer/taskbar/startmenu.cpp --- trunk/reactos/subsys/system/explorer/taskbar/startmenu.cpp 2006-01-17 06:36:35 UTC (rev 20936) +++ trunk/reactos/subsys/system/explorer/taskbar/startmenu.cpp 2006-01-17 16:39:50 UTC (rev 20937) @@ -1101,7 +1101,7 @@ ICON_ID icon_id; if (entry->_data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) - icon_id = ICID_FOLDER; + icon_id = ICID_APPS; else icon_id = (ICON_ID)/*@@*/ entry->_icon_id; @@ -1113,7 +1113,7 @@ ICON_ID icon_id; if (entry->_data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) - icon_id = ICID_FOLDER; + icon_id = ICID_APPS; else icon_id = (ICON_ID)/*@@*/ entry->_icon_id;

1 0

[ion] 20936: - Move some assembly functions around in better suited locations.
by ion＠svn.reactos.org 17 Jan '06

17 Jan '06

- Move some assembly functions around in better suited locations. - Merge syscall.S and trap.S into trap.S, and nicely document the software interrupt table that we service, as well as special cases. Modified: trunk/reactos/ntoskrnl/ke/i386/cpu.S Modified: trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S Deleted: trunk/reactos/ntoskrnl/ke/i386/syscall.S Modified: trunk/reactos/ntoskrnl/ke/i386/trap.s Modified: trunk/reactos/ntoskrnl/ntoskrnl.xml _____ Modified: trunk/reactos/ntoskrnl/ke/i386/cpu.S --- trunk/reactos/ntoskrnl/ke/i386/cpu.S 2006-01-17 05:54:35 UTC (rev 20935) +++ trunk/reactos/ntoskrnl/ke/i386/cpu.S 2006-01-17 06:36:35 UTC (rev 20936) @@ -46,3 +46,26 @@ mov cr3, eax ret .endfunc + +.globl _KiCoprocessorError@0 +.func KiCoprocessorError@0 +_KiCoprocessorError@0: + + /* Get the NPX Thread's Initial stack */ + mov eax, [fs:KPCR_NPX_THREAD] + mov eax, [eax+KTHREAD_INITIAL_STACK] + + /* Make space for the FPU Save area */ + sub eax, SIZEOF_FX_SAVE_AREA + + /* Set the CR0 State */ + mov dword ptr [eax+FN_CR0_NPX_STATE], 8 + + /* Update it */ + mov eax, cr0 + or eax, 8 + mov cr0, eax + + /* Return to caller */ + ret +.endfunc _____ Modified: trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S --- trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S 2006-01-17 05:54:35 UTC (rev 20935) +++ trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S 2006-01-17 06:36:35 UTC (rev 20936) @@ -329,3 +329,37 @@ add esp, 4 * 4 ret +.globl _Ki386AdjustEsp0@4 +.func Ki386AdjustEsp0@4 +_Ki386AdjustEsp0@4: + + /* Get the current thread */ + mov eax, [fs:KPCR_CURRENT_THREAD] + + /* Get trap frame and stack */ + mov edx, [esp+4] + mov eax, [eax+KTHREAD_INITIAL_STACK] + + /* Check if V86 */ + test dword ptr [edx+KTRAP_FRAME_EFLAGS], EFLAGS_V86_MASK + jnz 1f + + /* Bias the stack */ + sub eax, KTRAP_FRAME_V86_GS - KTRAP_FRAME_SS + +1: + /* Skip FX Save Area */ + sub eax, SIZEOF_FX_SAVE_AREA + + /* Disable interrupts */ + pushf + cli + + /* Adjust ESP0 */ + mov edx, [fs:KPCR_TSS] + mov ss:[edx+KTSS_ESP0], eax + + /* Enable interrupts and return */ + popf + ret 4 +.endfunc _____ Deleted: trunk/reactos/ntoskrnl/ke/i386/syscall.S --- trunk/reactos/ntoskrnl/ke/i386/syscall.S 2006-01-17 05:54:35 UTC (rev 20935) +++ trunk/reactos/ntoskrnl/ke/i386/syscall.S 2006-01-17 06:36:35 UTC (rev 20936) @@ -1,584 +0,0 @@ -/* - * FILE: ntoskrnl/ke/i386/syscall.S - * COPYRIGHT: See COPYING in the top level directory - * PURPOSE: System Call Handler - * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) - */ - -#include <asm.h> -#include <internal/i386/asmmacro.S> - -.globl _KiServiceExit -.globl _KiServiceExit2 -.globl _KiFastCallEntry -.globl _KiSystemService -.globl _KiDebugService -.globl _Kei386EoiHelper@0 -.globl _NtRaiseException@12 -.globl _NtContinue@8 -.intel_syntax noprefix - -/* - * FIXMEs: - * - Figure out why ES/DS gets messed up in VMWare, when doing KiServiceExit only, - * and only when called from user-mode, and returning to user-mode. - * - Merge with trap.S and document all traps. - * - Use MmProbe when copying arguments to syscall. - * - Add DR macro/save and VM macro/save. - * - Implement KiCallbackReturn, KiGetTickCount, KiRaiseAssertion - */ - -/* FUNCTIONS ***************************************************************/ - -.func KiSystemService -_KiSystemService: - - /* Enter the shared system call prolog */ - SYSCALL_PROLOG - - /* Jump to the actual handler */ - jmp SharedCode -.endfunc - -BadStack: - - /* Restore ESP0 stack */ - mov ecx, [fs:KPCR_TSS] - mov esp, ss:[ecx+KTSS_ESP0] - - /* Generate V86M Stack for Trap 6 */ - push 0 - push 0 - push 0 - push 0 - - /* Generate interrupt stack for Trap 6 */ - push KGDT_R3_DATA + RPL_MASK - push 0 - push 0x20202 - push KGDT_R3_CODE + RPL_MASK - push 0 - jmp _KiTrap6 - -.func KiFastCallEntry -_KiFastCallEntry: - - /* Set FS to PCR */ - mov ecx, KGDT_R0_PCR - mov fs, cx - - /* Set DS/ES to Kernel Selector */ - mov ecx, KGDT_R0_DATA - mov ds, cx - mov es, cx - - /* Set the current stack to Kernel Stack */ - mov ecx, [fs:KPCR_TSS] - mov esp, ss:[ecx+KTSS_ESP0] - - /* Set up a fake INT Stack. */ - push KGDT_R3_DATA + RPL_MASK - push edx /* Ring 3 SS:ESP */ - pushf /* Ring 3 EFLAGS */ - push 2 /* Ring 0 EFLAGS */ - add edx, 8 /* Skip user parameter list */ - popf /* Set our EFLAGS */ - or dword ptr [esp], EFLAGS_INTERRUPT_MASK /* Re-enable IRQs in EFLAGS, to fake INT */ - push KGDT_R3_CODE + RPL_MASK - push KUSER_SHARED_SYSCALL_RET - - /* Setup the Trap Frame stack */ - push 0 - push ebp - push ebx - push esi - push edi - push KGDT_R3_TEB + RPL_MASK - - /* Save pointer to our PCR */ - mov ebx, [fs:KPCR_SELF] - - /* Get a pointer to the current thread */ - mov esi, [ebx+KPCR_CURRENT_THREAD] - - /* Set the exception handler chain terminator */ - push [ebx+KPCR_EXCEPTION_LIST] - mov dword ptr [ebx+KPCR_EXCEPTION_LIST], -1 - - /* Use the thread's stack */ - mov ebp, [esi+KTHREAD_INITIAL_STACK] - - /* Push previous mode */ - push UserMode - - /* Skip the other registers */ - sub esp, 0x48 - - /* Hack: it seems that on VMWare someone damages ES/DS on exit. Investigate! */ - mov dword ptr [esp+KTRAP_FRAME_DS], KGDT_R3_DATA + RPL_MASK - mov dword ptr [esp+KTRAP_FRAME_ES], KGDT_R3_DATA + RPL_MASK - - /* Make space for us on the stack */ - sub ebp, 0x29C - - /* Write the previous mode */ - mov byte ptr [esi+KTHREAD_PREVIOUS_MODE], UserMode - - /* Sanity check */ - cmp ebp, esp - jnz BadStack - - /* 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 */ - mov [esi+KTHREAD_TRAP_FRAME], ebp - - /* Save DR registers if needed */ - //jnz Dr_FastCallDrSave - - /* 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 PrevWasKernelMode - mov edi, [edi+4] -PrevWasKernelMode: - mov [ebp+KTRAP_FRAME_DEBUGEIP], edi -#endif - - /* Enable interrupts */ - sti - -SharedCode: - - /* - * Find out which table offset to use. Converts 0x1124 into 0x10. - * The offset is related to the Table Index as such: Offset = TableIndex x 10 - */ - mov edi, eax - shr edi, SERVICE_TABLE_SHIFT - and edi, SERVICE_TABLE_MASK - mov ecx, edi - - /* Now add the thread's base system table to the offset */ - add edi, [esi+KTHREAD_SERVICE_TABLE] - - /* Get the true syscall ID and check it */ - mov ebx, eax - and eax, SERVICE_NUMBER_MASK - cmp eax, [edi+SERVICE_DESCRIPTOR_LIMIT] - - /* Invalid ID, try to load Win32K Table */ - jnb KiBBTUnexpectedRange - -#if 0 // <== Disabled for two reasons: We don't save TEB in 0x18, but KPCR. - // <== We don't have a KeGdiFlushUserBatch callback yet (needs to be - // sent through the PsInitializeWin32Callouts structure) - /* Check if this was Win32K */ - cmp ecx, SERVICE_TABLE_TEST - jnz NotWin32K - - /* Get the TEB */ - mov ecx, [fs:KPCR_TEB] - - /* Check if we should flush the User Batch */ - xor ebx, ebx - or ebx, [ecx+TEB_GDI_BATCH_COUNT] - jz NoWin32K - - /* Flush it */ - push edx - push eax - call [_KeGdiFlushUserBatch] - pop eax - pop edx -#endif - -NotWin32K: - /* Increase total syscall count */ - inc dword ptr fs:[KPCR_SYSTEM_CALLS] - -#ifdef DBG - /* Increase per-syscall count */ - mov ecx, [edi+SERVICE_DESCRIPTOR_COUNT] - jecxz NoCountTable - inc dword ptr [ecx+eax*4] -#endif - - /* Users's current stack frame pointer is source */ -NoCountTable: - mov esi, edx - - /* Allocate room for argument list from kernel stack */ - mov ebx, [edi+SERVICE_DESCRIPTOR_NUMBER] - xor ecx, ecx - mov cl, [eax+ebx] - - /* Get pointer to function */ - mov edi, [edi+SERVICE_DESCRIPTOR_BASE] - mov ebx, [edi+eax*4] - - /* Allocate space on our stack */ - sub esp, ecx - - /* - * Copy the arguments from the user stack to our stack - * FIXME: This needs to be probed with MmSystemRangeStart - */ - shr ecx, 2 - mov edi, esp - rep movsd - -#ifdef DBG - - /* Make sure this isn't a user-mode call at elevated IRQL */ - test byte ptr [ebp+KTRAP_FRAME_CS], MODE_MASK - jz SkipCheck - call _KeGetCurrentIrql@0 - or al, al - jnz InvalidIrql - - /* - * The following lines are for the benefit of GDB. It will see the return - * address of the "call ebx" below, find the last label before it and - * thinks that that's the start of the function. It will then check to see - * if it starts with a standard function prolog (push ebp, mov ebp,esp). - * When that standard function prolog is not found, it will stop the - * stack backtrace. Since we do want to backtrace into usermode, let's - * make GDB happy and create a standard prolog. - */ -SkipCheck: -KiSystemService: - push ebp - mov ebp,esp - pop ebp -#endif - - /* Do the System Call */ - call ebx - -#ifdef DBG - /* Make sure the user-mode call didn't return at elevated IRQL */ - test byte ptr [ebp+KTRAP_FRAME_CS], MODE_MASK - jz SkipCheck2 - mov esi, eax /* We need to save the syscall's return val */ - call _KeGetCurrentIrql@0 - or al, al - jnz InvalidIrql - mov eax, esi /* Restore it */ - - /* Get our temporary current thread pointer for sanity check */ - mov ecx, fs:[KPCR_CURRENT_THREAD] - - /* Make sure that we are not attached and that APCs are not disabled */ - mov dl, [ecx+KTHREAD_APC_STATE_INDEX] - or dl, dl - jnz InvalidIndex - mov edx, [ecx+KTHREAD_COMBINED_APC_DISABLE] - or edx, edx - jnz InvalidIndex -#endif - -SkipCheck2: - - /* Deallocate the kernel stack frame */ - mov esp, ebp - -KeReturnFromSystemCall: - - /* Get the Current Thread */ - mov ecx, [fs:KPCR_CURRENT_THREAD] - - /* Restore the old trap frame pointer */ - mov edx, [ebp+KTRAP_FRAME_EDX] - mov [ecx+KTHREAD_TRAP_FRAME], edx -.endfunc - -.func KiServiceExit -_KiServiceExit: - /* Disable interrupts */ - cli - - /* Check for, and deliver, User-Mode APCs if needed */ - CHECK_FOR_APC_DELIVER 1 - - /* Hack for VMWare: Sometimes ES/DS seem to be invalid when returning to user-mode. Investigate! */ - mov es, [ebp+KTRAP_FRAME_ES] - mov ds, [ebp+KTRAP_FRAME_DS] - - /* Exit and cleanup */ - TRAP_EPILOG FromSystemCall, DoRestorePreviousMode, DoNotRestoreSegments, DoNotRestoreVolatiles, DoRestoreEverything -.endfunc - -KiBBTUnexpectedRange: - - /* If this isn't a Win32K call, fail */ - cmp ecx, 0x10 - jne InvalidCall - - /* Set up Win32K Table */ - push edx - push ebx - call _PsConvertToGuiThread@0 - - /* FIXME: Handle failure */ - pop eax - pop edx - - /* Reset trap frame address */ - mov ebp, esp - mov [esi+KTHREAD_TRAP_FRAME], ebp - - /* Try the Call again */ - jmp SharedCode - -InvalidCall: - - /* Invalid System Call */ - mov eax, STATUS_INVALID_SYSTEM_SERVICE - jmp KeReturnFromSystemCall - -#ifdef DBG -InvalidIrql: - /* Save current IRQL */ - push fs:[KPCR_IRQL] - - /* Set us at passive */ - mov dword ptr fs:[KPCR_IRQL], 0 - cli - - /* Bugcheck */ - push 0 - push 0 - push eax - push ebx - push IRQL_GT_ZERO_AT_SYSTEM_SERVICE - call _KeBugCheckEx@20 - -InvalidIndex: - - /* Get the index and APC state */ - movzx eax, byte ptr [ecx+KTHREAD_APC_STATE_INDEX] - mov edx, [ecx+KTHREAD_COMBINED_APC_DISABLE] - - /* Bugcheck */ - push 0 - push edx - push eax - push ebx - push APC_INDEX_MISMATCH - call _KeBugCheckEx@20 - ret -#endif - -.func KiServiceExit2 -_KiServiceExit2: - - /* Disable interrupts */ - cli - - /* Check for, and deliver, User-Mode APCs if needed */ - CHECK_FOR_APC_DELIVER 0 - - /* Exit and cleanup */ - TRAP_EPILOG NotFromSystemCall, DoRestorePreviousMode, DoRestoreSegments, DoRestoreVolatiles, DoNotRestoreEverything -.endfunc - -.func Kei386EoiHelper@0 -_Kei386EoiHelper@0: - - /* Disable interrupts */ - cli - - /* Check for, and deliver, User-Mode APCs if needed */ - CHECK_FOR_APC_DELIVER 0 - - /* Exit and cleanup */ - TRAP_EPILOG NotFromSystemCall, DoNotRestorePreviousMode, DoRestoreSegments, DoRestoreVolatiles, DoNotRestoreEverything -.endfunc - -V86_Exit: - /* Move to EDX position */ - add esp, KTRAP_FRAME_EDX - - /* Restore volatiles */ - pop edx - pop ecx - pop eax - - /* Move to non-volatiles */ - lea esp, [ebp+KTRAP_FRAME_EDI] - pop edi - pop esi - pop ebx - pop ebp - - /* Skip error code and return */ - add esp, 4 - iret - -AbiosExit: - /* Not yet supported */ - int 3 - -_KiDebugService: - - /* Push error code */ - push 0 - - /* Enter trap */ - TRAP_PROLOG(kids) - - /* Increase EIP so we skip the INT3 */ - //inc dword ptr [ebp+KTRAP_FRAME_EIP] - - /* Call debug service dispatcher */ - mov eax, [ebp+KTRAP_FRAME_EAX] - mov ecx, [ebp+KTRAP_FRAME_ECX] - mov edx, [ebp+KTRAP_FRAME_EAX] - - /* Check for V86 mode */ - test dword ptr [ebp+KTRAP_FRAME_EFLAGS], EFLAGS_V86_MASK - jnz NotUserMode - - /* Check if this is kernel or user-mode */ - test byte ptr [ebp+KTRAP_FRAME_CS], 1 - jz CallDispatch - cmp word ptr [ebp+KTRAP_FRAME_CS], KGDT_R3_CODE + RPL_MASK - jnz NotUserMode - - /* Re-enable interrupts */ -VdmProc: - sti - - /* Call the debug routine */ -CallDispatch: - mov esi, ecx - mov edi, edx - mov edx, eax - mov ecx, 3 - push edi - push esi - push edx - call _KdpServiceDispatcher@12 - -NotUserMode: - - /* Get the current process */ - mov ebx, [fs:KPCR_CURRENT_THREAD] - mov ebx, [ebx+KTHREAD_APCSTATE_PROCESS] - - /* Check if this is a VDM Process */ - //cmp dword ptr [ebx+KPROCESS_VDM_OBJECTS], 0 - //jz VdmProc - - /* Exit through common routine */ - jmp _Kei386EoiHelper@0 - -_NtRaiseException@12: - - /* NOTE: We -must- be called by Zw* to have the right frame! */ - /* Push the stack frame */ - push ebp - - /* Get the current thread and restore its trap frame */ - mov ebx, [fs:KPCR_CURRENT_THREAD] - mov edx, [ebp+KTRAP_FRAME_EDX] - mov [ebx+KTHREAD_TRAP_FRAME], edx - - /* Set up stack frame */ - mov ebp, esp - - /* Get the Trap Frame in EBX */ - mov ebx, [ebp+0] - - /* Get the exception list and restore */ - mov eax, [ebx+KTRAP_FRAME_EXCEPTION_LIST] - mov [fs:KPCR_EXCEPTION_LIST], eax - - /* Get the parameters */ - mov edx, [ebp+16] /* Search frames */ - mov ecx, [ebp+12] /* Context */ - mov eax, [ebp+8] /* Exception Record */ - - /* Raise the exception */ - push edx - push ebx - push 0 - push ecx - push eax - call _KiRaiseException@20 - - /* Restore trap frame in EBP */ - pop ebp - mov esp, ebp - - /* Check the result */ - or eax, eax - jz _KiServiceExit2 - - /* Restore debug registers too */ - jmp _KiServiceExit - -_NtContinue@8: - - /* NOTE: We -must- be called by Zw* to have the right frame! */ - /* Push the stack frame */ - push ebp - - /* Get the current thread and restore its trap frame */ - mov ebx, [fs:KPCR_CURRENT_THREAD] - mov edx, [ebp+KTRAP_FRAME_EDX] - mov [ebx+KTHREAD_TRAP_FRAME], edx - - /* Set up stack frame */ - mov ebp, esp - - /* Save the parameters */ - mov eax, [ebp+0] - mov ecx, [ebp+8] - - /* Call KiContinue */ - push eax - push 0 - push ecx - call _KiContinue@12 - - /* Check if we failed (bad context record) */ - or eax, eax - jnz Error - - /* Check if test alert was requested */ - cmp dword ptr [ebp+12], 0 - je DontTest - - /* Test alert for the thread */ - mov al, [ebx+KTHREAD_PREVIOUS_MODE] - push eax - call _KeTestAlertThread@4 - -DontTest: - /* Return to previous context */ - pop ebp - mov esp, ebp - jmp _KiServiceExit2 - -Error: - pop ebp - mov esp, ebp - jmp _KiServiceExit - _____ Modified: trunk/reactos/ntoskrnl/ke/i386/trap.s --- trunk/reactos/ntoskrnl/ke/i386/trap.s 2006-01-17 05:54:35 UTC (rev 20935) +++ trunk/reactos/ntoskrnl/ke/i386/trap.s 2006-01-17 06:36:35 UTC (rev 20936) @@ -1,31 +1,625 @@ /* - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/ke/i386/trap.s - * PURPOSE: Exception handlers - * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) + * FILE: ntoskrnl/ke/i386/trap.S + * COPYRIGHT: See COPYING in the top level directory + * PURPOSE: System Traps, Entrypoints and Exitpoints + * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) + * NOTE: See asmmacro.S for the shared entry/exit code. */ /* INCLUDES ******************************************************************/ #include <asm.h> #include <internal/i386/asmmacro.S> +.intel_syntax noprefix -/* NOTES: - * Why not share the epilogue? - * 1) An extra jmp is expensive (jmps are very costly) - * 2) Eventually V86 exit should be handled through ABIOS, and we - * handle ABIOS exit in the shared trap exit code already. - * Why not share the KiTrapHandler call? - * 1) Would make using the trap-prolog macro much harder. - * 2) Eventually some of these traps might be re-implemented in assembly - * to improve speed and depend less on the compiler and/or use features - * not present as C keywords. When that happens, less traps will use the - * shared C handler, so the shared-code would need to be un-shared. - */ +/* + * FIXMEs: + * - Figure out why ES/DS gets messed up in VMWare, when doing KiServiceExit only, + * and only when called from user-mode, and returning to user-mode. + * - Use MmProbe when copying arguments to syscall. + * - Handle failure after PsConvertToGuiThread. + * - Figure out what the DEBUGEIP hack is for and how it can be moved away. + * - Add DR macro/save and VM macro/save. + * - Add .func .endfunc to everything that doesn't have it yet. + * - Implement KiCallbackReturn, KiGetTickCount, KiRaiseAssertion. + */ -/* FUNCTIONS *****************************************************************/ +/* GLOBALS ******************************************************************/ -.globl _KiTrap0 +/* This is the Software Interrupt Table that we handle in this file: */ +.globl _KiTrap0 /* INT 0: Divide Error (#DE) */ +.globl _KiTrap1 /* INT 1: Debug Exception (#DB) */ +.globl _KiTrap2 /* INT 2: NMI Interrupt */ +.globl _KiTrap3 /* INT 3: Breakpoint Exception (#BP) */ +.globl _KiTrap4 /* INT 4: Overflow Exception (#OF) */ +.globl _KiTrap5 /* INT 5: BOUND Range Exceeded (#BR) */ +.globl _KiTrap6 /* INT 6: Invalid Opcode Code (#UD) */ +.globl _KiTrap7 /* INT 7: Device Not Available (#NM) */ +.globl _KiTrap8 /* INT 8: Double Fault Exception (#DF) */ +.globl _KiTrap9 /* INT 9: RESERVED */ +.globl _KiTrap10 /* INT 10: Invalid TSS Exception (#TS) */ +.globl _KiTrap11 /* INT 11: Segment Not Present (#NP) */ +.globl _KiTrap12 /* INT 12: Stack Fault Exception (#SS) */ +.globl _KiTrap13 /* INT 13: General Protection (#GP) */ +.globl _KiTrap14 /* INT 14: Page-Fault Exception (#PF) */ +.globl _KiTrap15 /* INT 15: RESERVED */ +.globl _KiTrap16 /* INT 16: x87 FPU Error (#MF) */ +.globl _KiTrap17 /* INT 17: Align Check Exception (#AC) */ +.globl _KiTrap18 /* INT 18: Machine Check Exception (#MC)*/ +.globl _KiTrap19 /* INT 19: SIMD FPU Exception (#XF) */ +.globl _KiTrapUnknown /* INT 20-30: UNDEFINED INTERRUPTS */ +.globl _KiDebugService /* INT 31: Get Tick Count Handler */ +.globl _KiCallbackReturn /* INT 32: User-Mode Callback Return */ +.globl _KiRaiseAssertion /* INT 33: Debug Assertion Handler */ +.globl _KiDebugService /* INT 34: Debug Service Handler */ +.globl _KiSystemService /* INT 35: System Call Service Handler */ + +/* We also handle LSTAR Entry */ +.globl _KiFastCallEntry + +/* And special system-defined software traps */ +.globl _NtRaiseException@12 +.globl _NtContinue@8 + +/* We implement the following trap exit points: */ +.globl _KiServiceExit /* Exit from syscall */ +.globl _KiServiceExit2 /* Exit from syscall with complete frame*/ +.globl _Kei386EoiHelper@0 /* Exit from interrupt or H/W trap */ + +/* FUNCTIONS ****************************************************************/ + +.func KiSystemService +_KiSystemService: + + /* Enter the shared system call prolog */ + SYSCALL_PROLOG + + /* Jump to the actual handler */ + jmp SharedCode +.endfunc + +.func KiFastCallEntry +_KiFastCallEntry: + + /* Set FS to PCR */ + mov ecx, KGDT_R0_PCR + mov fs, cx + + /* Set DS/ES to Kernel Selector */ + mov ecx, KGDT_R0_DATA + mov ds, cx + mov es, cx + + /* Set the current stack to Kernel Stack */ + mov ecx, [fs:KPCR_TSS] + mov esp, ss:[ecx+KTSS_ESP0] + + /* Set up a fake INT Stack. */ + push KGDT_R3_DATA + RPL_MASK + push edx /* Ring 3 SS:ESP */ + pushf /* Ring 3 EFLAGS */ + push 2 /* Ring 0 EFLAGS */ + add edx, 8 /* Skip user parameter list */ + popf /* Set our EFLAGS */ + or dword ptr [esp], EFLAGS_INTERRUPT_MASK /* Re-enable IRQs in EFLAGS, to fake INT */ + push KGDT_R3_CODE + RPL_MASK + push KUSER_SHARED_SYSCALL_RET + + /* Setup the Trap Frame stack */ + push 0 + push ebp + push ebx + push esi + push edi + push KGDT_R3_TEB + RPL_MASK + + /* Save pointer to our PCR */ + mov ebx, [fs:KPCR_SELF] + + /* Get a pointer to the current thread */ + mov esi, [ebx+KPCR_CURRENT_THREAD] + + /* Set the exception handler chain terminator */ + push [ebx+KPCR_EXCEPTION_LIST] + mov dword ptr [ebx+KPCR_EXCEPTION_LIST], -1 + + /* Use the thread's stack */ + mov ebp, [esi+KTHREAD_INITIAL_STACK] + + /* Push previous mode */ + push UserMode + + /* Skip the other registers */ + sub esp, 0x48 + + /* Hack: it seems that on VMWare someone damages ES/DS on exit. Investigate! */ + mov dword ptr [esp+KTRAP_FRAME_DS], KGDT_R3_DATA + RPL_MASK + mov dword ptr [esp+KTRAP_FRAME_ES], KGDT_R3_DATA + RPL_MASK + + /* Make space for us on the stack */ + sub ebp, 0x29C + + /* Write the previous mode */ + mov byte ptr [esi+KTHREAD_PREVIOUS_MODE], UserMode + + /* Sanity check */ + cmp ebp, esp + jnz BadStack + + /* 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 */ + mov [esi+KTHREAD_TRAP_FRAME], ebp + + /* Save DR registers if needed */ + //jnz Dr_FastCallDrSave + + /* 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 PrevWasKernelMode + mov edi, [edi+4] +PrevWasKernelMode: + mov [ebp+KTRAP_FRAME_DEBUGEIP], edi +#endif + + /* Enable interrupts */ + sti + +SharedCode: + + /* + * Find out which table offset to use. Converts 0x1124 into 0x10. + * The offset is related to the Table Index as such: Offset = TableIndex x 10 + */ + mov edi, eax + shr edi, SERVICE_TABLE_SHIFT + and edi, SERVICE_TABLE_MASK + mov ecx, edi + + /* Now add the thread's base system table to the offset */ + add edi, [esi+KTHREAD_SERVICE_TABLE] + + /* Get the true syscall ID and check it */ + mov ebx, eax + and eax, SERVICE_NUMBER_MASK + cmp eax, [edi+SERVICE_DESCRIPTOR_LIMIT] + + /* Invalid ID, try to load Win32K Table */ + jnb KiBBTUnexpectedRange + +#if 0 // <== Disabled for two reasons: We don't save TEB in 0x18, but KPCR. + // <== We don't have a KeGdiFlushUserBatch callback yet (needs to be + // sent through the PsInitializeWin32Callouts structure) + /* Check if this was Win32K */ + cmp ecx, SERVICE_TABLE_TEST + jnz NotWin32K + + /* Get the TEB */ + mov ecx, [fs:KPCR_TEB] + + /* Check if we should flush the User Batch */ + xor ebx, ebx + or ebx, [ecx+TEB_GDI_BATCH_COUNT] + jz NoWin32K + + /* Flush it */ + push edx + push eax + call [_KeGdiFlushUserBatch] + pop eax + pop edx +#endif + +NotWin32K: + /* Increase total syscall count */ + inc dword ptr fs:[KPCR_SYSTEM_CALLS] + +#ifdef DBG + /* Increase per-syscall count */ + mov ecx, [edi+SERVICE_DESCRIPTOR_COUNT] + jecxz NoCountTable + inc dword ptr [ecx+eax*4] +#endif + + /* Users's current stack frame pointer is source */ +NoCountTable: + mov esi, edx + + /* Allocate room for argument list from kernel stack */ + mov ebx, [edi+SERVICE_DESCRIPTOR_NUMBER] + xor ecx, ecx + mov cl, [eax+ebx] + + /* Get pointer to function */ + mov edi, [edi+SERVICE_DESCRIPTOR_BASE] + mov ebx, [edi+eax*4] + + /* Allocate space on our stack */ + sub esp, ecx + + /* + * Copy the arguments from the user stack to our stack + * FIXME: This needs to be probed with MmSystemRangeStart + */ + shr ecx, 2 + mov edi, esp + rep movsd + +#ifdef DBG + + /* Make sure this isn't a user-mode call at elevated IRQL */ + test byte ptr [ebp+KTRAP_FRAME_CS], MODE_MASK + jz SkipCheck + call _KeGetCurrentIrql@0 + or al, al + jnz InvalidIrql + + /* + * The following lines are for the benefit of GDB. It will see the return + * address of the "call ebx" below, find the last label before it and + * thinks that that's the start of the function. It will then check to see + * if it starts with a standard function prolog (push ebp, mov ebp,esp). + * When that standard function prolog is not found, it will stop the + * stack backtrace. Since we do want to backtrace into usermode, let's + * make GDB happy and create a standard prolog. + */ +SkipCheck: +KiSystemService: + push ebp + mov ebp,esp + pop ebp +#endif + + /* Do the System Call */ + call ebx + +#ifdef DBG + /* Make sure the user-mode call didn't return at elevated IRQL */ + test byte ptr [ebp+KTRAP_FRAME_CS], MODE_MASK + jz SkipCheck2 + mov esi, eax /* We need to save the syscall's return val */ + call _KeGetCurrentIrql@0 + or al, al + jnz InvalidIrql + mov eax, esi /* Restore it */ + + /* Get our temporary current thread pointer for sanity check */ + mov ecx, fs:[KPCR_CURRENT_THREAD] + + /* Make sure that we are not attached and that APCs are not disabled */ + mov dl, [ecx+KTHREAD_APC_STATE_INDEX] + or dl, dl + jnz InvalidIndex + mov edx, [ecx+KTHREAD_COMBINED_APC_DISABLE] + or edx, edx + jnz InvalidIndex +#endif + +SkipCheck2: + [truncated at 1000 lines; 538 more skipped]

1 0

[ion] 20935: - Implement SYSCALL_PROLOG for the main handler and the three fast-system calls (ints 2b, 2c, 2d) which are not yet implemented.
by ion＠svn.reactos.org 17 Jan '06

17 Jan '06

- Implement SYSCALL_PROLOG for the main handler and the three fast-system calls (ints 2b, 2c, 2d) which are not yet implemented. - Document the macros. Modified: trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S Modified: trunk/reactos/ntoskrnl/ke/i386/syscall.S _____ Modified: trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S --- trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S 2006-01-17 05:22:00 UTC (rev 20934) +++ trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S 2006-01-17 05:54:35 UTC (rev 20935) @@ -234,16 +234,124 @@ SET_TF_DEBUG_HEADER // -// @name TRAP_EPILOG +// @name SYSCALL_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. +// 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 -// Identifying name of the caller function; will be used to append -// to the name V86 and DR helper functions, which must already exist. +// 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 _____ Modified: trunk/reactos/ntoskrnl/ke/i386/syscall.S --- trunk/reactos/ntoskrnl/ke/i386/syscall.S 2006-01-17 05:22:00 UTC (rev 20934) +++ trunk/reactos/ntoskrnl/ke/i386/syscall.S 2006-01-17 05:54:35 UTC (rev 20935) @@ -13,22 +13,33 @@ .globl _KiFastCallEntry .globl _KiSystemService .globl _KiDebugService +.globl _Kei386EoiHelper@0 +.globl _NtRaiseException@12 +.globl _NtContinue@8 .intel_syntax noprefix /* * FIXMEs: * - Figure out why ES/DS gets messed up in VMWare, when doing KiServiceExit only, * and only when called from user-mode, and returning to user-mode. - * - Implement SYSCALL_PROLOG macro. + * - Merge with trap.S and document all traps. + * - Use MmProbe when copying arguments to syscall. + * - Add DR macro/save and VM macro/save. + * - Implement KiCallbackReturn, KiGetTickCount, KiRaiseAssertion */ - /*** This file is a mess; it is being worked on. Please contact Alex: - *** alex(a)relsoft.net if you want to make any changes to it before this - *** message goes away - */ - /* FUNCTIONS ***************************************************************/ +.func KiSystemService +_KiSystemService: + + /* Enter the shared system call prolog */ + SYSCALL_PROLOG + + /* Jump to the actual handler */ + jmp SharedCode +.endfunc + BadStack: /* Restore ESP0 stack */ @@ -123,68 +134,12 @@ /* Check if the thread was being debugged */ test byte ptr [esi+KTHREAD_DEBUG_ACTIVE], 0xFF - /* Jump to shared code or DR Save */ - //jnz Dr_FastCallDrSave - jmp SharedCode -.endfunc - -.func KiSystemService -_KiSystemService: - -// ==================== COMMON SYSTEM CALL CODE ============// - /* 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 - //jnz Dr_kss_a - -SharedCode: + /* Set the thread's trap frame */ mov [esi+KTHREAD_TRAP_FRAME], ebp + /* Save DR registers if needed */ + //jnz Dr_FastCallDrSave + /* Set the trap frame debug header */ SET_TF_DEBUG_HEADER @@ -208,7 +163,7 @@ /* Enable interrupts */ sti -CheckValidCall: +SharedCode: /* * Find out which table offset to use. Converts 0x1124 into 0x10. @@ -389,14 +344,14 @@ mov [esi+KTHREAD_TRAP_FRAME], ebp /* Try the Call again */ - jmp CheckValidCall + jmp SharedCode InvalidCall: /* Invalid System Call */ mov eax, STATUS_INVALID_SYSTEM_SERVICE jmp KeReturnFromSystemCall - + #ifdef DBG InvalidIrql: /* Save current IRQL */ @@ -443,7 +398,6 @@ TRAP_EPILOG NotFromSystemCall, DoRestorePreviousMode, DoRestoreSegments, DoRestoreVolatiles, DoNotRestoreEverything .endfunc -.globl _Kei386EoiHelper@0 .func Kei386EoiHelper@0 _Kei386EoiHelper@0: @@ -535,7 +489,6 @@ /* Exit through common routine */ jmp _Kei386EoiHelper@0 -.globl _NtRaiseException@12 _NtRaiseException@12: /* NOTE: We -must- be called by Zw* to have the right frame! */ @@ -581,7 +534,6 @@ /* Restore debug registers too */ jmp _KiServiceExit -.globl _NtContinue@8 _NtContinue@8: /* NOTE: We -must- be called by Zw* to have the right frame! */

1 0

[ion] 20934: - Implement first version of trap exit macro. Currently missing documentation, and the parameters could probably be simplified.
by ion＠svn.reactos.org 17 Jan '06

17 Jan '06

- Implement first version of trap exit macro. Currently missing documentation, and the parameters could probably be simplified. Modified: trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S Modified: trunk/reactos/ntoskrnl/ke/i386/syscall.S _____ Modified: trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S --- trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S 2006-01-17 05:05:35 UTC (rev 20933) +++ trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S 2006-01-17 05:22:00 UTC (rev 20934) @@ -1,13 +1,27 @@ /* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnlinclude/i386/asmmacro.S - * PURPOSE: Assembly Macros for Spinlocks and common Trap Code (TODO) + * 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 + .intel_syntax noprefix // @@ -219,5 +233,228 @@ /* Set the Trap Frame Debug Header */ \ SET_TF_DEBUG_HEADER +// +// @name TRAP_EPILOG +// +// 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 +// +.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 + _____ Modified: trunk/reactos/ntoskrnl/ke/i386/syscall.S --- trunk/reactos/ntoskrnl/ke/i386/syscall.S 2006-01-17 05:05:35 UTC (rev 20933) +++ trunk/reactos/ntoskrnl/ke/i386/syscall.S 2006-01-17 05:22:00 UTC (rev 20934) @@ -16,59 +16,10 @@ .intel_syntax noprefix /* - * There are 3 main types of Trap Entries: <= Move this to asmmacro.S - * - * - System Calls - * - TODO - * - * - Exceptions - * - TODO - * - * - Interrupts - * - TODO - */ - -/* - * There are 3 main types of Trap Exits: <= Correct some things and move to asmmacro.S - * - * - KiServiceExit - * - Clear interrupt flag - * - Common User APC Dispatching - * - Common exit code; segments and volatiles are not restored - * You use this for System Call return, when volatiles are irrelevant. - * (NtContinue, NtRaiseException, KiCallUserMode and all System Call returns) - * - * - KiServiceExit2 - * - Clear interrupt flag - * - Common User APC Dispatching - * - Common exit code; the entire frame is restored. - * You use this when volatiles and other registers need to be restored. - * For example, if debugging is active (NtContinue, NtRaiseException). - * - * - Kei386EoiHelper - * - Clear interrupt flag - * - Common User APC Dispatching - * - Common exit code; the entire frame is restored but *NOT* the Previous Mode - * You use this in the same context as KiServiceExit2, but when the Previous Mode - * should be tampered with. Clearly, as its name suggests, this routine is mostly - * useful for End Of Interrupts. - * Note that this routine is EXPORTED. - * Note that this routine must called by a JMP, not a CALL. - */ - -/* - * The common exit code has 3 modes of operation: - * - Whether or not to restore segments - * - Whether or not to restore volatiles - * - Whether or not to restore the previous mode - * All these are exemplified by the 3 trap exits shown above - */ - - /* * FIXMEs: * - Figure out why ES/DS gets messed up in VMWare, when doing KiServiceExit only, * and only when called from user-mode, and returning to user-mode. - * - Use macros and merge with trap.s nicely + * - Implement SYSCALL_PROLOG macro. */ /*** This file is a mess; it is being worked on. Please contact Alex: @@ -101,7 +52,6 @@ .func KiFastCallEntry _KiFastCallEntry: -// ==================== UNIQUE SYSENTER STUB. DO NOT DUPLICATE ============// /* Set FS to PCR */ mov ecx, KGDT_R0_PCR mov fs, cx @@ -181,7 +131,7 @@ .func KiSystemService _KiSystemService: -// ==================== UNIQUE SYSCALL TRAP ENTRY DO NOT DUPLICATE ============// +// ==================== COMMON SYSTEM CALL CODE ============// /* Create a trap frame */ push 0 push ebp @@ -205,7 +155,7 @@ /* Save the old previous mode */ push ss:[esi+KTHREAD_PREVIOUS_MODE] - + /* Skip the other registers */ sub esp, 0x48 @@ -415,162 +365,38 @@ mov es, [ebp+KTRAP_FRAME_ES] mov ds, [ebp+KTRAP_FRAME_DS] -// ========================= COMMON TRAP EXIT CODE ===================// -#ifdef DBG - /* Assert the flags */ - pushfd - pop edx - test edx, EFLAGS_INTERRUPT_MASK - jnz InvalidExitState + /* Exit and cleanup */ + TRAP_EPILOG FromSystemCall, DoRestorePreviousMode, DoNotRestoreSegments, DoNotRestoreVolatiles, DoRestoreEverything +.endfunc - /* Assert the stack */ - cmp esp, ebp - jnz InvalidExitState +KiBBTUnexpectedRange: - /* Assert the trap frame */ -StateCheckDone: - sub dword ptr [esp+KTRAP_FRAME_DEBUGARGMARK], 0xBADB0D00 - jnz InvalidTrapFrame + /* If this isn't a Win32K call, fail */ + cmp ecx, 0x10 + jne InvalidCall - /* Assert FS */ - mov bx, fs - cmp bx, KGDT_R0_PCR - jnz InvalidFs + /* Set up Win32K Table */ + push edx + push ebx + call _PsConvertToGuiThread@0 - /* Assert exception list */ - cmp dword ptr fs:[KPCR_EXCEPTION_LIST], 0 - jnz ExceptionListOK - -InvalidFs: - push -1 - call _KeBugCheck@4 - -InvalidTrapFrame: - add dword ptr [esp+KTRAP_FRAME_DEBUGARGMARK], 0xBADB0D00 - -InvalidExitState: - int 3 - jmp StateCheckDone - -ExceptionListOK: -#endif - - /* Get exception list */ - mov edx, [esp+KTRAP_FRAME_EXCEPTION_LIST] - -#ifdef DBG - /* Assert the saved exception list */ - or edx, edx - jnz ListOk - int 3 - -ListOk: -#endif - - /* Restore it */ - mov [fs:KPCR_EXCEPTION_LIST], edx - -// ==================== ONLY IF PREVIOUS MODE NEEDED ==================// - /* Get previous mode */ - mov ecx, [esp+KTRAP_FRAME_PREVIOUS_MODE] - -#ifdef DBG - /* Assert the saved previous mode */ - cmp ecx, -1 - jnz ModeOk - int 3 - -ModeOk: -#endif - - /* Restore the previous mode */ - mov esi, [fs:KPCR_CURRENT_THREAD] - mov byte ptr [esi+KTHREAD_PREVIOUS_MODE], cl -// ==================== END IF PREVIOUS MODE NEEDED ===================// - - /* 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 EditedFrame - -// ==================== ONLY IF FULL RESTORE NEEDED ===================// - /* 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 RestoreAll - cmp dword ptr [ebp+KTRAP_FRAME_CS], KGDT_R0_CODE - jz CommonStackClean -// ==================== END IF FULL RESTORE NEEDED ====================// - - /* Restore FS */ -RestoreFs: - lea esp, [ebp+KTRAP_FRAME_FS] - pop fs - -CommonStackClean: - /* 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 - -AbiosReturn: - /* Pop error code */ - add esp, 4 - - /* Check if previous CS is from user-mode */ - test dword ptr [esp+4], 1 - - /* It is, so use Fast Exit */ - jnz FastRet - - /* Jump back to stub */ + /* FIXME: Handle failure */ + pop eax pop edx - pop ecx - popf - jmp edx -IntRet: + /* Reset trap frame address */ + mov ebp, esp + mov [esi+KTHREAD_TRAP_FRAME], ebp - iret + /* Try the Call again */ + jmp CheckValidCall -FastRet: - /* Is SYSEXIT Supported/Wanted? */ - cmp dword ptr ss:[_KiFastSystemCallDisable], 0 - jnz IntRet - test dword ptr [esp+8], EFLAGS_TF - jnz IntRet +InvalidCall: - /* Restore FS to TIB */ - mov ecx, KGDT_R3_TEB + RPL_MASK - mov fs, ecx + /* Invalid System Call */ + mov eax, STATUS_INVALID_SYSTEM_SERVICE + jmp KeReturnFromSystemCall - /* 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], ~EFLAGS_INTERRUPT_MASK Line below is equivalent to this, - but older binutils versions don't understand ~ */ - and dword ptr [esp], 0xfffffdff /* Remove IRQ hack 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 - #ifdef DBG InvalidIrql: /* Save current IRQL */ @@ -604,106 +430,6 @@ ret #endif -V86_Exit: - /* Move to EDX position */ - add esp, KTRAP_FRAME_EDX - - /* Restore volatiles */ - pop edx - pop ecx - pop eax - - /* Move to non-volatiles */ - lea esp, [ebp+KTRAP_FRAME_EDI] - pop edi - pop esi - pop ebx - pop ebp - - /* Skip error code and return */ - add esp, 4 - iret - -AbiosExit: - /* Not yet supported */ - int 3 - -RestoreAll: - /* 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 RestoreFs - -EditedFrame: - /* 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 - -KiBBTUnexpectedRange: - - /* If this isn't a Win32K call, fail */ - cmp ecx, 0x10 - jne InvalidCall - - /* Set up Win32K Table */ - push edx - push ebx - call _PsConvertToGuiThread@0 - - /* FIXME: Handle failure */ - pop eax - pop edx - - /* Reset trap frame address */ - mov ebp, esp - mov [esi+KTHREAD_TRAP_FRAME], ebp - - /* Try the Call again */ - jmp CheckValidCall - -InvalidCall: - - /* Invalid System Call */ - mov eax, STATUS_INVALID_SYSTEM_SERVICE - jmp KeReturnFromSystemCall -.endfunc - .func KiServiceExit2 _KiServiceExit2: @@ -713,155 +439,48 @@ /* Check for, and deliver, User-Mode APCs if needed */ CHECK_FOR_APC_DELIVER 0 -#ifdef DBG - /* Assert the flags */ - pushfd - pop edx - test edx, EFLAGS_INTERRUPT_MASK - jnz InvalidExitState2 + /* Exit and cleanup */ + TRAP_EPILOG NotFromSystemCall, DoRestorePreviousMode, DoRestoreSegments, DoRestoreVolatiles, DoNotRestoreEverything +.endfunc - /* Assert the stack */ - cmp esp, ebp - jnz InvalidExitState2 +.globl _Kei386EoiHelper@0 +.func Kei386EoiHelper@0 +_Kei386EoiHelper@0: - /* Assert the trap frame */ -StateCheckDone2: - sub dword ptr [esp+KTRAP_FRAME_DEBUGARGMARK], 0xBADB0D00 - jnz InvalidTrapFrame2 + /* Disable interrupts */ + cli - /* Assert FS */ - mov bx, fs - cmp bx, KGDT_R0_PCR - jnz InvalidFs2 + /* Check for, and deliver, User-Mode APCs if needed */ + CHECK_FOR_APC_DELIVER 0 - /* Assert exception list */ - cmp dword ptr fs:[KPCR_EXCEPTION_LIST], 0 - jnz ExceptionListOK2 + /* Exit and cleanup */ + TRAP_EPILOG NotFromSystemCall, DoNotRestorePreviousMode, DoRestoreSegments, DoRestoreVolatiles, DoNotRestoreEverything +.endfunc -InvalidFs2: - push -1 - call _KeBugCheck@4 +V86_Exit: + /* Move to EDX position */ + add esp, KTRAP_FRAME_EDX -InvalidTrapFrame2: - add dword ptr [esp+KTRAP_FRAME_DEBUGARGMARK], 0xBADB0D00 - -InvalidExitState2: - int 3 - jmp StateCheckDone2 - -ExceptionListOK2: -#endif - - /* Get exception list */ - mov edx, [esp+KTRAP_FRAME_EXCEPTION_LIST] - -#ifdef DBG - /* Assert the saved exception list */ - or edx, edx - jnz ListOk2 - int 3 - -ListOk2: -#endif - - /* Restore it */ - mov [fs:KPCR_EXCEPTION_LIST], edx - -// ==================== ONLY IF PREVIOUS MODE NEEDED ==================// - /* Get previous mode */ - mov ecx, [esp+KTRAP_FRAME_PREVIOUS_MODE] - -#ifdef DBG - /* Assert the saved previous mode */ - cmp ecx, -1 - jnz ModeOk2 - int 3 - -ModeOk2: -#endif - - /* Restore previous mode */ - mov esi, [fs:KPCR_CURRENT_THREAD] - mov byte ptr [esi+KTHREAD_PREVIOUS_MODE], cl - - /* 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 EditedFrame2 - /* Restore volatiles */ - mov edx, [esp+KTRAP_FRAME_EDX] - mov ecx, [esp+KTRAP_FRAME_ECX] - mov eax, [esp+KTRAP_FRAME_EAX] + pop edx + pop ecx + pop eax - /* Check if it was kernel */ - cmp word ptr [ebp+KTRAP_FRAME_CS], KGDT_R0_CODE - jz CommonStackClean2 - - /* Skip registers */ - lea esp, [ebp+KTRAP_FRAME_GS] - - /* Restore segments and volatiles */ - pop gs - pop es - pop ds - lea esp, [ebp+KTRAP_FRAME_FS] - pop fs - -CommonStackClean2: - /* Skip debug information and unsaved registers */ + /* Move to non-volatiles */ 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 and return */ + /* Skip error code and return */ add esp, 4 iret -EditedFrame2: - /* Restore real CS value */ - mov ebx, [esp+KTRAP_FRAME_TEMPCS] - mov [esp+KTRAP_FRAME_CS], ebx +AbiosExit: + /* Not yet supported */ + int 3 - /* - * 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 - - /* Restore volatiles */ - mov eax, [esp+KTRAP_FRAME_EAX] - mov edx, [esp+KTRAP_FRAME_EDX] - mov ecx, [esp+KTRAP_FRAME_ECX] - - /* Return */ - add esp, KTRAP_FRAME_EDI - pop edi - pop esi - pop ebx - pop ebp - mov esp, [esp] - iret - _KiDebugService: /* Push error code */ @@ -915,151 +534,7 @@ /* Exit through common routine */ jmp _Kei386EoiHelper@0 -.endfunc -.globl _Kei386EoiHelper@0 -.func Kei386EoiHelper@0 -_Kei386EoiHelper@0: - - /* Disable interrupts */ - cli - - /* Check for, and deliver, User-Mode APCs if needed */ - CHECK_FOR_APC_DELIVER 0 - -#ifdef DBG - /* Assert the flags */ - pushfd - pop edx - test edx, EFLAGS_INTERRUPT_MASK - jnz InvalidExitState3 - - /* Assert the stack */ - cmp esp, ebp - jnz InvalidExitState3 - - /* Assert the trap frame */ -StateCheckDone3: - //sub dword ptr [esp+KTRAP_FRAME_DEBUGARGMARK], 0xBADB0D00 - //jnz InvalidTrapFrame3 - - /* Assert FS */ - mov bx, fs - cmp bx, KGDT_R0_PCR - jnz InvalidFs3 - - /* Assert exception list */ - cmp dword ptr fs:[KPCR_EXCEPTION_LIST], 0 - jnz ExceptionListOK3 - -InvalidFs3: - push -1 - call _KeBugCheck@4 - -InvalidTrapFrame3: - add dword ptr [esp+KTRAP_FRAME_DEBUGARGMARK], 0xBADB0D00 - -InvalidExitState3: - int 3 - jmp StateCheckDone3 - -ExceptionListOK3: -#endif - - /* Get exception list */ - mov edx, [esp+KTRAP_FRAME_EXCEPTION_LIST] - -#ifdef DBG - /* Assert the saved exception list */ - or edx, edx - jnz ListOk3 - int 3 - -ListOk3: -#endif - - /* Restore exception list */ - mov [fs:KPCR_EXCEPTION_LIST], edx - - /* 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 EditedFrame3 - - /* Restore volatiles */ - mov edx, [esp+KTRAP_FRAME_EDX] - mov ecx, [esp+KTRAP_FRAME_ECX] - mov eax, [esp+KTRAP_FRAME_EAX] - - /* Check if it was kernel */ - cmp word ptr [ebp+KTRAP_FRAME_CS], KGDT_R0_CODE - jz CommonStackClean3 - - /* Skip registers */ - lea esp, [ebp+KTRAP_FRAME_GS] - - /* Restore segments and volatiles */ - pop gs - pop es - pop ds - lea esp, [ebp+KTRAP_FRAME_FS] - pop fs - -CommonStackClean3: - /* 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 and return */ - add esp, 4 - iret - -EditedFrame3: - /* 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 - - /* Restore volatiles */ - mov eax, [esp+KTRAP_FRAME_EAX] - mov edx, [esp+KTRAP_FRAME_EDX] - mov ecx, [esp+KTRAP_FRAME_ECX] - - /* Return */ - add esp, KTRAP_FRAME_EDI - pop edi - pop esi - pop ebx - pop ebp - mov esp, [esp] - iret -.endfunc - .globl _NtRaiseException@12 _NtRaiseException@12:

1 0

[ion] 20933: * Add more documented flags from ks386.inc to asm.h
by ion＠svn.reactos.org 17 Jan '06

17 Jan '06

* Add more documented flags from ks386.inc to asm.h * Isolate and clean-up the VMWare hack; the shared trap exit macro can now be implemented. Modified: trunk/reactos/include/ndk/asm.h Modified: trunk/reactos/ntoskrnl/ke/i386/syscall.S Modified: trunk/reactos/ntoskrnl/ke/i386/usercall_asm.S _____ Modified: trunk/reactos/include/ndk/asm.h --- trunk/reactos/include/ndk/asm.h 2006-01-17 03:28:33 UTC (rev 20932) +++ trunk/reactos/include/ndk/asm.h 2006-01-17 05:05:35 UTC (rev 20933) @@ -354,10 +354,13 @@ #define CBSTACK_RESULT_LENGTH 0x24 // -// NTSTATUS Codes +// NTSTATUS and Bugcheck Codes // #ifdef __ASM__ #define STATUS_INVALID_SYSTEM_SERVICE 0xC000001C +#define STATUS_NO_CALLBACK_ACTIVE 0xC0000258 +#define APC_INDEX_MISMATCH 1 +#define IRQL_GT_ZERO_AT_SYSTEM_SERVICE 0x4A #endif // _____ Modified: trunk/reactos/ntoskrnl/ke/i386/syscall.S --- trunk/reactos/ntoskrnl/ke/i386/syscall.S 2006-01-17 03:28:33 UTC (rev 20932) +++ trunk/reactos/ntoskrnl/ke/i386/syscall.S 2006-01-17 05:05:35 UTC (rev 20933) @@ -7,8 +7,6 @@ #include <asm.h> #include <internal/i386/asmmacro.S> -#define APC_INDEX_MISMATCH 1 -#define IRQL_GT_ZERO_AT_SYSTEM_SERVICE 0x4A .globl _KiServiceExit .globl _KiServiceExit2 @@ -18,7 +16,7 @@ .intel_syntax noprefix /* - * There are 3 main types of Trap Entries: + * There are 3 main types of Trap Entries: <= Move this to asmmacro.S * * - System Calls * - TODO @@ -31,7 +29,7 @@ */ /* - * There are 3 main types of Trap Exits: + * There are 3 main types of Trap Exits: <= Correct some things and move to asmmacro.S * * - KiServiceExit * - Clear interrupt flag @@ -66,17 +64,10 @@ * All these are exemplified by the 3 trap exits shown above */ -/* - * There is also common Debug Code present in the common exit code, which - * in turn calls common code to save the debug registers - */ - /* * FIXMEs: - * - Dig in trap code and see why we need to push/pop the segments, - * which -shouldn't- be needed on syscalls; one of the things - * missing for this to work is lazy loading in the GPF handler, - * but there are other things to consider. + * - Figure out why ES/DS gets messed up in VMWare, when doing KiServiceExit only, + * and only when called from user-mode, and returning to user-mode. * - Use macros and merge with trap.s nicely */ @@ -159,15 +150,13 @@ /* Push previous mode */ push UserMode -.att_syntax - /* Save other registers */ - sub $0xC, %esp // + 0x70 - pushl $KGDT_R3_DATA + RPL_MASK // + 0x40 - pushl $KGDT_R3_DATA + RPL_MASK // + 0x44 - pushl $0 // + 0x48 - sub $0x30, %esp // + 0x70 -.intel_syntax noprefix + /* Skip the other registers */ + sub esp, 0x48 + /* Hack: it seems that on VMWare someone damages ES/DS on exit. Investigate! */ + mov dword ptr [esp+KTRAP_FRAME_DS], KGDT_R3_DATA + RPL_MASK + mov dword ptr [esp+KTRAP_FRAME_ES], KGDT_R3_DATA + RPL_MASK + /* Make space for us on the stack */ sub ebp, 0x29C @@ -216,16 +205,14 @@ /* Save the old previous mode */ push ss:[esi+KTHREAD_PREVIOUS_MODE] - -.att_syntax - /* Save other registers */ - sub $0xC, %esp // + 0x70 - pushl %ds // + 0x40 - pushl %es // + 0x44 - pushl %gs // + 0x48 - sub $0x30, %esp // + 0x70 -.intel_syntax noprefix + /* 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 @@ -424,6 +411,10 @@ /* Check for, and deliver, User-Mode APCs if needed */ CHECK_FOR_APC_DELIVER 1 + /* Hack for VMWare: Sometimes ES/DS seem to be invalid when returning to user-mode. Investigate! */ + mov es, [ebp+KTRAP_FRAME_ES] + mov ds, [ebp+KTRAP_FRAME_DS] + // ========================= COMMON TRAP EXIT CODE ===================// #ifdef DBG /* Assert the flags */ @@ -515,14 +506,6 @@ jz CommonStackClean // ==================== END IF FULL RESTORE NEEDED ====================// -//badbadbad - add esp, 0x30 - pop gs - pop es - pop ds - add esp, 0x14 -//badbadbad - /* Restore FS */ RestoreFs: lea esp, [ebp+KTRAP_FRAME_FS] _____ Modified: trunk/reactos/ntoskrnl/ke/i386/usercall_asm.S --- trunk/reactos/ntoskrnl/ke/i386/usercall_asm.S 2006-01-17 03:28:33 UTC (rev 20932) +++ trunk/reactos/ntoskrnl/ke/i386/usercall_asm.S 2006-01-17 05:05:35 UTC (rev 20933) @@ -9,17 +9,9 @@ /* INCLUDES ******************************************************************/ #include <asm.h> -//#include <bugcodes.h> -#define APC_INDEX_MISMATCH 1 -#define IRQL_GT_ZERO_AT_SYSTEM_SERVICE 0x4A -#define STATUS_NO_CALLBACK_ACTIVE 0xC0000258 +#include <internal/i386/asmmacro.S> .intel_syntax noprefix -// This file is a work in progress. Most of the code is currently disabled. - -/* GLOBALS ****************************************************************/ -.extern PVOID _KeUserCallbackDispatcher - /* FUNCTIONS ****************************************************************/ .globl _KiGetUserModeStackAddress@0 @@ -186,8 +178,7 @@ lea esi, [edx+KTRAP_FRAME_FS] rep movsd - /* TODO: Ugly hack because of some missing logic in syscall.s */ - mov dword ptr [esp+KTRAP_FRAME_GS], 0 + /* VMWARE Hack because ES/DS sometimes gets smashed when returning to User-Mode. Investigate! */ mov dword ptr [esp+KTRAP_FRAME_DS], KGDT_R3_DATA + RPL_MASK mov dword ptr [esp+KTRAP_FRAME_ES], KGDT_R3_DATA + RPL_MASK @@ -209,12 +200,7 @@ sti /* Write the debug data */ - mov edi, [ebp+KTRAP_FRAME_EBP] - mov edx, [ebp+KTRAP_FRAME_EIP] - 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 + SET_TF_DEBUG_HEADER /* Exit to user-mode */ jmp _KiServiceExit

1 0

[weiden] 20932: don't release the pipe list lock twice in case of a canceled read operation
by weiden＠svn.reactos.org 17 Jan '06

17 Jan '06

don't release the pipe list lock twice in case of a canceled read operation Modified: trunk/reactos/drivers/fs/np/rw.c _____ Modified: trunk/reactos/drivers/fs/np/rw.c --- trunk/reactos/drivers/fs/np/rw.c 2006-01-17 03:25:55 UTC (rev 20931) +++ trunk/reactos/drivers/fs/np/rw.c 2006-01-17 03:28:33 UTC (rev 20932) @@ -182,7 +182,6 @@ ThreadContext->Count++; ThreadContext->DeviceExt->EmptyWaiterCount--; } - KeUnlockMutex(&ThreadContext->DeviceExt->PipeListLock); break; default: KEBUGCHECK(0);

1 0

[weiden] 20931: some fixes in NtReadFile and NtWrite file for (a)synchronous pipe handling and parameter checks
by weiden＠svn.reactos.org 17 Jan '06

17 Jan '06

some fixes in NtReadFile and NtWrite file for (a)synchronous pipe handling and parameter checks Modified: trunk/reactos/ntoskrnl/io/file.c _____ Modified: trunk/reactos/ntoskrnl/io/file.c --- trunk/reactos/ntoskrnl/io/file.c 2006-01-17 03:00:21 UTC (rev 20930) +++ trunk/reactos/ntoskrnl/io/file.c 2006-01-17 03:25:55 UTC (rev 20931) @@ -531,6 +531,8 @@ PIO_STACK_LOCATION StackPtr; PKEVENT EventObject = NULL; BOOLEAN LocalEvent = FALSE; + ULONG AccessType; + OBJECT_HANDLE_INFORMATION HandleInformation; KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); DPRINT("IopDeviceFsIoControl(DeviceHandle 0x%p Event 0x%p UserApcRoutine 0x%p " @@ -541,17 +543,84 @@ IoControlCode,InputBuffer,InputBufferLength,OutputBuffer, OutputBufferLength); - if (IoStatusBlock == NULL) return STATUS_ACCESS_VIOLATION; + AccessType = IO_METHOD_FROM_CTL_CODE(IoControlCode); - /* Check granted access against the access rights from IoContolCode */ + if (PreviousMode != KernelMode) + { + _SEH_TRY + { + ProbeForWrite(IoStatusBlock, + sizeof(IO_STATUS_BLOCK), + sizeof(ULONG)); + + /* probe the input and output buffers if needed */ + if (AccessType == METHOD_BUFFERED) + { + if (OutputBuffer != NULL) + { + ProbeForWrite(OutputBuffer, + OutputBufferLength, + 1); + } + else + { + /* make sure the caller can't fake this as we depend on this */ + OutputBufferLength = 0; + } + } + + if (AccessType != METHOD_NEITHER) + { + if (InputBuffer != NULL) + { + ProbeForRead(InputBuffer, + InputBufferLength, + 1); + } + else + { + /* make sure the caller can't fake this as we depend on this */ + InputBufferLength = 0; + } + } + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if (!NT_SUCCESS(Status)) + { + DPRINT("Probing the buffers failed!\n"); + return Status; + } + } + + /* Don't check for access rights right now, KernelMode can do anything */ Status = ObReferenceObjectByHandle(DeviceHandle, - (IoControlCode >> 14) & 0x3, + 0, IoFileObjectType, PreviousMode, (PVOID *) &FileObject, - NULL); + &HandleInformation); if (!NT_SUCCESS(Status)) return Status; + /* Check for sufficient access rights */ + if (PreviousMode != KernelMode) + { + ACCESS_MASK DesiredAccess = (ACCESS_MASK)((IoControlCode >> 14) & 3); + if (DesiredAccess != FILE_ANY_ACCESS && + !RtlAreAllAccessesGranted(HandleInformation.GrantedAccess, + (ACCESS_MASK)((IoControlCode >> 14) & 3))) + { + DPRINT1("Insufficient access rights! Granted: 0x%x Desired: 0x%x\n", + HandleInformation.GrantedAccess, (ACCESS_MASK)((IoControlCode >> 14) & 3)); + ObDereferenceObject (FileObject); + return STATUS_ACCESS_DENIED; + } + } + /* Check for an event */ if (Event) { @@ -605,6 +674,19 @@ EventObject, IoStatusBlock); + if (Irp == NULL) + { + DPRINT1("IoBuildDeviceIoControlRequest failed!\n"); + + if (EventObject != NULL) + { + ObDereferenceObject (EventObject); + } + + ObDereferenceObject (FileObject); + return STATUS_INSUFFICIENT_RESOURCES; + } + /* Set some extra settings */ Irp->Tail.Overlay.OriginalFileObject = FileObject; Irp->RequestorMode = PreviousMode; @@ -2917,9 +2999,10 @@ PDEVICE_OBJECT DeviceObject; PIO_STACK_LOCATION StackPtr; KPROCESSOR_MODE PreviousMode; - BOOLEAN LocalEvent = FALSE; PKEVENT EventObject = NULL; LARGE_INTEGER CapturedByteOffset; + ULONG CapturedKey = 0; + BOOLEAN Synchronous = FALSE; DPRINT("NtReadFile(FileHandle 0x%p Buffer 0x%p Length %x ByteOffset 0x%p, " "IoStatusBlock 0x%p)\n", FileHandle, Buffer, Length, ByteOffset, @@ -2945,6 +3028,10 @@ { CapturedByteOffset = ProbeForReadLargeInteger(ByteOffset); } + if (Key != NULL) + { + CapturedKey = ProbeForReadUlong(Key); + } /* FIXME - probe other pointers and capture information */ } _SEH_HANDLE @@ -2961,6 +3048,10 @@ { CapturedByteOffset = *ByteOffset; } + if (Key != NULL) + { + CapturedKey = *Key; + } } /* Get File Object */ @@ -2972,23 +3063,29 @@ NULL); if (!NT_SUCCESS(Status)) return Status; - /* Check the Byte Offset */ - if (ByteOffset == NULL || - (CapturedByteOffset.u.LowPart == FILE_USE_FILE_POINTER_POSITION && - CapturedByteOffset.u.HighPart == -1)) + /* Check if we should use Sync IO or not */ + if (FileObject->Flags & FO_SYNCHRONOUS_IO) { - /* a valid ByteOffset is required if asynch. op. */ - if (!(FileObject->Flags & FO_SYNCHRONOUS_IO)) + if (ByteOffset == NULL || + (CapturedByteOffset.u.LowPart == FILE_USE_FILE_POINTER_POSITION && + CapturedByteOffset.u.HighPart == -1)) { - DPRINT1("NtReadFile: missing ByteOffset for asynch. op\n"); - ObDereferenceObject(FileObject); - return STATUS_INVALID_PARAMETER; + /* Use the Current Byte OFfset */ + CapturedByteOffset = FileObject->CurrentByteOffset; } - /* Use the Current Byte OFfset */ - CapturedByteOffset = FileObject->CurrentByteOffset; + Synchronous = TRUE; } + else if (ByteOffset == NULL && !(FileObject->Flags & FO_NAMED_PIPE)) + { + /* a valid ByteOffset is required if asynch. op. */ + DPRINT1("NtReadFile: missing ByteOffset for asynch. op (0x%p)\n", + ByteOffset); + ObDereferenceObject(FileObject); + return STATUS_INVALID_PARAMETER; + } + /* Check for event */ if (Event) { @@ -3017,16 +3114,7 @@ DeviceObject = IoGetRelatedDeviceObject(FileObject); } - /* Check if we should use Sync IO or not */ - if (FileObject->Flags & FO_SYNCHRONOUS_IO) - { - /* Use File Object event */ - KeClearEvent(&FileObject->Event); - } - else - { - LocalEvent = TRUE; - } + KeClearEvent(&FileObject->Event); /* Create the IRP */ _SEH_TRY @@ -3038,6 +3126,7 @@ &CapturedByteOffset, EventObject, IoStatusBlock); + if (Irp == NULL) { Status = STATUS_INSUFFICIENT_RESOURCES; @@ -3073,13 +3162,13 @@ /* Setup Stack Data */ StackPtr = IoGetNextIrpStackLocation(Irp); StackPtr->FileObject = FileObject; - StackPtr->Parameters.Read.Key = Key ? *Key : 0; + StackPtr->Parameters.Read.Key = CapturedKey; /* Call the Driver */ Status = IoCallDriver(DeviceObject, Irp); if (Status == STATUS_PENDING) { - if (!LocalEvent) + if (Synchronous) { KeWaitForSingleObject(&FileObject->Event, Executive, @@ -3679,7 +3768,7 @@ PDEVICE_OBJECT DeviceObject; PIO_STACK_LOCATION StackPtr; KPROCESSOR_MODE PreviousMode; - BOOLEAN LocalEvent = FALSE; + BOOLEAN Synchronous = FALSE; PKEVENT EventObject = NULL; LARGE_INTEGER CapturedByteOffset; ULONG CapturedKey = 0; @@ -3694,9 +3783,32 @@ PreviousMode = KeGetPreviousMode(); CapturedByteOffset.QuadPart = 0; + /* Get File Object */ + Status = ObReferenceObjectByHandle(FileHandle, + 0, + IoFileObjectType, + PreviousMode, + (PVOID*)&FileObject, + &ObjectHandleInfo); + if (!NT_SUCCESS(Status)) return Status; + + /* If this is a named pipe, make sure we don't ask for FILE_APPEND_DATA as it + overlaps with the FILE_CREATE_PIPE_INSTANCE access right! */ + if (!(FileObject->Flags & FO_NAMED_PIPE)) + DesiredAccess |= FILE_APPEND_DATA; + /* Validate User-Mode Buffers */ if(PreviousMode != KernelMode) { + /* check if the handle has either FILE_WRITE_DATA or FILE_APPEND_DATA was + granted. */ + if (!RtlAreAnyAccessesGranted(ObjectHandleInfo.GrantedAccess, + DesiredAccess)) + { + ObDereferenceObject(FileObject); + return STATUS_ACCESS_DENIED; + } + _SEH_TRY { ProbeForWrite(IoStatusBlock, @@ -3736,62 +3848,35 @@ } } - /* Get File Object */ - Status = ObReferenceObjectByHandle(FileHandle, - 0, - IoFileObjectType, - PreviousMode, - (PVOID*)&FileObject, - &ObjectHandleInfo); - if (!NT_SUCCESS(Status)) return Status; - - /* check if the handle has either FILE_WRITE_DATA or FILE_APPEND_DATA was - granted. However, if this is a named pipe, make sure we don't ask for - FILE_APPEND_DATA as it interferes with the FILE_CREATE_PIPE_INSTANCE - access right! */ - if (!(FileObject->Flags & FO_NAMED_PIPE)) - DesiredAccess |= FILE_APPEND_DATA; - if (!RtlAreAnyAccessesGranted(ObjectHandleInfo.GrantedAccess, - DesiredAccess)) + /* check if this is an append operation */ + if ((ObjectHandleInfo.GrantedAccess & DesiredAccess) == FILE_APPEND_DATA) { - ObDereferenceObject(FileObject); - return STATUS_ACCESS_DENIED; + /* Give the drivers something to understand */ + CapturedByteOffset.u.LowPart = FILE_WRITE_TO_END_OF_FILE; + CapturedByteOffset.u.HighPart = -1; } - /* Check if we got write Access */ - if (ObjectHandleInfo.GrantedAccess & FILE_WRITE_DATA) + /* Check if we should use Sync IO or not */ + if (FileObject->Flags & FO_SYNCHRONOUS_IO) { - /* Check the Byte Offset */ if (ByteOffset == NULL || (CapturedByteOffset.u.LowPart == FILE_USE_FILE_POINTER_POSITION && CapturedByteOffset.u.HighPart == -1)) { - /* a valid ByteOffset is required if asynch. op. */ - if (!(FileObject->Flags & FO_SYNCHRONOUS_IO)) - { - DPRINT1("NtReadFile: missing ByteOffset for asynch. op\n"); - ObDereferenceObject(FileObject); - return STATUS_INVALID_PARAMETER; - } - /* Use the Current Byte OFfset */ CapturedByteOffset = FileObject->CurrentByteOffset; } + + Synchronous = TRUE; } - else if ((ObjectHandleInfo.GrantedAccess & FILE_APPEND_DATA) && - !(FileObject->Flags & FO_NAMED_PIPE)) + else if (ByteOffset == NULL && !(FileObject->Flags & FO_NAMED_PIPE)) { /* a valid ByteOffset is required if asynch. op. */ - if (!(FileObject->Flags & FO_SYNCHRONOUS_IO)) - { - DPRINT1("NtWriteFile: missing ByteOffset for asynch. op\n"); - ObDereferenceObject(FileObject); - return STATUS_INVALID_PARAMETER; - } + DPRINT1("NtReadFile: missing ByteOffset for asynch. op (0x%p)\n", + ByteOffset); - /* Give the drivers somethign to understand */ - CapturedByteOffset.u.LowPart = FILE_WRITE_TO_END_OF_FILE; - CapturedByteOffset.u.HighPart = 0xffffffff; + ObDereferenceObject(FileObject); + return STATUS_INVALID_PARAMETER; } /* Check if we got an event */ @@ -3822,16 +3907,7 @@ DeviceObject = IoGetRelatedDeviceObject(FileObject); } - /* Check if we should use Sync IO or not */ - if (FileObject->Flags & FO_SYNCHRONOUS_IO) - { - /* Use File Object event */ - KeClearEvent(&FileObject->Event); - } - else - { - LocalEvent = TRUE; - } + KeClearEvent(&FileObject->Event); /* Build the IRP */ _SEH_TRY @@ -3888,7 +3964,7 @@ Status = IoCallDriver(DeviceObject, Irp); if (Status == STATUS_PENDING) { - if (!LocalEvent) + if (Synchronous) { KeWaitForSingleObject(&FileObject->Event, Executive,

1 0

[ion] 20930: * Add more PSDK defintions to asm.h
by ion＠svn.reactos.org 17 Jan '06

17 Jan '06

* Add more PSDK defintions to asm.h * Use these new definitions instead of constants in syscall.S * Document the macros using doxygen-compatible format, and convert SET_TF_DEBUG_HEADER to as macro instead of CPP macro. * Use SET_TF_DEBUG_HEADER in system call handlers instead of duplicating the code. Modified: trunk/reactos/include/ndk/asm.h Modified: trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S Modified: trunk/reactos/ntoskrnl/ke/i386/syscall.S _____ Modified: trunk/reactos/include/ndk/asm.h --- trunk/reactos/include/ndk/asm.h 2006-01-17 01:22:21 UTC (rev 20929) +++ trunk/reactos/include/ndk/asm.h 2006-01-17 03:00:21 UTC (rev 20930) @@ -361,6 +361,20 @@ #endif // +// System Call Table definitions +// +#define NUMBER_SERVICE_TABLES 0x0002 +#define SERVICE_NUMBER_MASK 0x0FFF +#define SERVICE_TABLE_SHIFT 0x0008 +#define SERVICE_TABLE_MASK 0x0010 +#define SERVICE_TABLE_TEST 0x0010 +#define SERVICE_DESCRIPTOR_BASE 0x0000 +#define SERVICE_DESCRIPTOR_COUNT 0x0004 +#define SERVICE_DESCRIPTOR_LIMIT 0x0008 +#define SERVICE_DESCRIPTOR_NUMBER 0x000C +#define SERVICE_DESCRIPTOR_LENGTH 0x0010 + +// // Generic Definitions // #define MAXIMUM_IDTVECTOR 0xFF _____ Modified: trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S --- trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S 2006-01-17 01:22:21 UTC (rev 20929) +++ trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S 2006-01-17 03:00:21 UTC (rev 20930) @@ -46,30 +46,40 @@ #endif // -// SET_TF_DEBUG_HEADER +// @name SET_TF_DEBUG_HEADER +// // This macro sets up the debug header in the trap frame. -// Assumptions: -// ebp = PKTRAP_FRAME -// edi/ebx = Have been saved and can be used // -#define 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; +// @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 + // -// These macros help with USer-Mode APC delivery after exiting a trap. -// -// CHECK_FOR_APC_DELIVER +// @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 @@ -129,26 +139,28 @@ 2: .endm - // -// These macros control common execution paths for Traps and System Call Code -// -// TRAP_PROLOG +// @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. // -// Use as follows: -// _KiTrap00: -// /* Push fake error code */ -// push 0 +// @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. // -// /* Enter common prologue */ -// TRAP_PROLOG(0) +// @remark Use as follows: +// _KiTrap00: +// /* Push fake error code */ +// push 0 // -// /* Handle trap */ -// <Your Trap Code Here> +// /* 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; \ _____ Modified: trunk/reactos/ntoskrnl/ke/i386/syscall.S --- trunk/reactos/ntoskrnl/ke/i386/syscall.S 2006-01-17 01:22:21 UTC (rev 20929) +++ trunk/reactos/ntoskrnl/ke/i386/syscall.S 2006-01-17 03:00:21 UTC (rev 20930) @@ -238,24 +238,20 @@ mov ebx, [esi+KTHREAD_TRAP_FRAME] mov [ebp+KTRAP_FRAME_EDX], ebx -// ==================== COMMON DR SAVE CHECK.AND DEBUG FRAME SETUP ============// /* 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 - cld //jnz Dr_kss_a - /* Save a pointer to the trap frame in the TCB */ SharedCode: mov [esi+KTHREAD_TRAP_FRAME], ebp - /* Get the Debug Trap Frame EBP/EIP */ - mov ebx, [ebp+KTRAP_FRAME_EBP] - mov edi, [ebp+KTRAP_FRAME_EIP] + /* Set the trap frame debug header */ + SET_TF_DEBUG_HEADER -#ifdef DBG +#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) @@ -269,15 +265,9 @@ jz PrevWasKernelMode mov edi, [edi+4] PrevWasKernelMode: + mov [ebp+KTRAP_FRAME_DEBUGEIP], edi #endif - /* 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 - -// ============= END OF COMMON DR SAVE CHECK.AND DEBUG FRAME SETUP ============// /* Enable interrupts */ sti @@ -288,8 +278,8 @@ * The offset is related to the Table Index as such: Offset = TableIndex x 10 */ mov edi, eax - shr edi, 8 - and edi, 0x10 + shr edi, SERVICE_TABLE_SHIFT + and edi, SERVICE_TABLE_MASK mov ecx, edi /* Now add the thread's base system table to the offset */ @@ -297,8 +287,8 @@ /* Get the true syscall ID and check it */ mov ebx, eax - and eax, 0xFFF - cmp eax, [edi+8] + and eax, SERVICE_NUMBER_MASK + cmp eax, [edi+SERVICE_DESCRIPTOR_LIMIT] /* Invalid ID, try to load Win32K Table */ jnb KiBBTUnexpectedRange @@ -307,7 +297,7 @@ // <== We don't have a KeGdiFlushUserBatch callback yet (needs to be // sent through the PsInitializeWin32Callouts structure) /* Check if this was Win32K */ - cmp ecx, 0x10 + cmp ecx, SERVICE_TABLE_TEST jnz NotWin32K /* Get the TEB */ @@ -332,7 +322,7 @@ #ifdef DBG /* Increase per-syscall count */ - mov ecx, [edi+4] + mov ecx, [edi+SERVICE_DESCRIPTOR_COUNT] jecxz NoCountTable inc dword ptr [ecx+eax*4] #endif @@ -342,12 +332,12 @@ mov esi, edx /* Allocate room for argument list from kernel stack */ - mov ebx, [edi+12] + mov ebx, [edi+SERVICE_DESCRIPTOR_NUMBER] xor ecx, ecx mov cl, [eax+ebx] /* Get pointer to function */ - mov edi, [edi] + mov edi, [edi+SERVICE_DESCRIPTOR_BASE] mov ebx, [edi+eax*4] /* Allocate space on our stack */

1 0

[ion] 20929: * Use macro for APC-delivery.
by ion＠svn.reactos.org 17 Jan '06

17 Jan '06

* Use macro for APC-delivery. * Mark function start/endings for the compiler. Modified: trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S Modified: trunk/reactos/ntoskrnl/ke/i386/syscall.S Modified: trunk/reactos/ntoskrnl/ke/i386/trap.s _____ Modified: trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S --- trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S 2006-01-17 00:13:11 UTC (rev 20928) +++ trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S 2006-01-17 01:22:21 UTC (rev 20929) @@ -64,6 +64,73 @@ mov [ebp+KTRAP_FRAME_DEBUGEIP], edi; // +// These macros help with USer-Mode APC delivery after exiting a trap. +// +// 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. +// +.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 + + +// // These macros control common execution paths for Traps and System Call Code // // TRAP_PROLOG _____ Modified: trunk/reactos/ntoskrnl/ke/i386/syscall.S --- trunk/reactos/ntoskrnl/ke/i386/syscall.S 2006-01-17 00:13:11 UTC (rev 20928) +++ trunk/reactos/ntoskrnl/ke/i386/syscall.S 2006-01-17 01:22:21 UTC (rev 20929) @@ -107,6 +107,7 @@ push 0 jmp _KiTrap6 +.func KiFastCallEntry _KiFastCallEntry: // ==================== UNIQUE SYSENTER STUB. DO NOT DUPLICATE ============// @@ -186,7 +187,9 @@ /* Jump to shared code or DR Save */ //jnz Dr_FastCallDrSave jmp SharedCode +.endfunc +.func KiSystemService _KiSystemService: // ==================== UNIQUE SYSCALL TRAP ENTRY DO NOT DUPLICATE ============// @@ -421,68 +424,16 @@ /* Restore the old trap frame pointer */ mov edx, [ebp+KTRAP_FRAME_EDX] mov [ecx+KTHREAD_TRAP_FRAME], edx +.endfunc +.func KiServiceExit _KiServiceExit: /* Disable interrupts */ cli -// ================= COMMON USER-MODE APC DELIVERY CHECK ============// - /* Check for V86 mode */ - test dword ptr [ebp+KTRAP_FRAME_EFLAGS], EFLAGS_V86_MASK - jnz ApcLoop + /* Check for, and deliver, User-Mode APCs if needed */ + CHECK_FOR_APC_DELIVER 1 - /* Deliver APCs only if we were called from user mode */ - test byte ptr [ebp+KTRAP_FRAME_CS], 1 - je KiRosTrapReturn - - /* Get the current thread */ -ApcLoop: - 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 KiRosTrapReturn - - /* Save pointer to Trap Frame */ - mov ebx, ebp - -// ================= PRESENT ONLY IF VOLATILES NEEDED ============// - /* 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 -// ============= END PRESENT ONLY IF VOLATILES NEEDED ============// - - /* 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) */ - mov eax, [ebx+KTRAP_FRAME_EAX] - cli - jmp ApcLoop -// ============== END COMMON USER-MODE APC DELIVERY CHECK ============// - -KiRosTrapReturn: // ========================= COMMON TRAP EXIT CODE ===================// #ifdef DBG /* Assert the flags */ @@ -778,55 +729,17 @@ /* Invalid System Call */ mov eax, STATUS_INVALID_SYSTEM_SERVICE jmp KeReturnFromSystemCall +.endfunc +.func KiServiceExit2 _KiServiceExit2: /* Disable interrupts */ cli - /* Check for V86 mode */ - test dword ptr [ebp+KTRAP_FRAME_EFLAGS], EFLAGS_V86_MASK - jnz ApcLoop2 + /* Check for, and deliver, User-Mode APCs if needed */ + CHECK_FOR_APC_DELIVER 0 - /* Deliver APCs only if we were called from user mode */ - test byte ptr [ebp+KTRAP_FRAME_CS], 1 - je KiRosTrapReturn2 - - /* Get the current thread */ -ApcLoop2: - 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 KiRosTrapReturn2 - - /* Save pointer to Trap Frame */ - mov ebx, ebp - - /* 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 - cli - jmp ApcLoop2 - -KiRosTrapReturn2: #ifdef DBG /* Assert the flags */ pushfd @@ -1028,57 +941,19 @@ //jz VdmProc /* Exit through common routine */ - jmp Kei386EoiHelper@0 + jmp _Kei386EoiHelper@0 +.endfunc -.globl Kei386EoiHelper@0 -Kei386EoiHelper@0: +.globl _Kei386EoiHelper@0 +.func Kei386EoiHelper@0 +_Kei386EoiHelper@0: /* Disable interrupts */ cli - /* Check for V86 mode */ - test dword ptr [ebp+KTRAP_FRAME_EFLAGS], EFLAGS_V86_MASK - jnz ApcLoop3 + /* Check for, and deliver, User-Mode APCs if needed */ + CHECK_FOR_APC_DELIVER 0 - /* Deliver APCs only if we were called from user mode */ - test byte ptr [ebp+KTRAP_FRAME_CS], 1 - je KiRosTrapReturn3 - - /* Get the current thread */ -ApcLoop3: - 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 KiRosTrapReturn3 - - /* Save pointer to Trap Frame */ - mov ebx, ebp - - /* 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 - cli - jmp ApcLoop3 - -KiRosTrapReturn3: #ifdef DBG /* Assert the flags */ pushfd @@ -1210,6 +1085,7 @@ pop ebp mov esp, [esp] iret +.endfunc .globl _NtRaiseException@12 _NtRaiseException@12: _____ Modified: trunk/reactos/ntoskrnl/ke/i386/trap.s --- trunk/reactos/ntoskrnl/ke/i386/trap.s 2006-01-17 00:13:11 UTC (rev 20928) +++ trunk/reactos/ntoskrnl/ke/i386/trap.s 2006-01-17 01:22:21 UTC (rev 20929) @@ -43,7 +43,7 @@ cmp eax, 1 /* Return to caller */ - jne Kei386EoiHelper@0 + jne _Kei386EoiHelper@0 jmp _KiV86Complete .globl _KiTrap1 @@ -64,7 +64,7 @@ cmp eax, 1 /* Return to caller */ - jne Kei386EoiHelper@0 + jne _Kei386EoiHelper@0 jmp _KiV86Complete .globl _KiTrap2 @@ -85,7 +85,7 @@ cmp eax, 1 /* Return to caller */ - jne Kei386EoiHelper@0 + jne _Kei386EoiHelper@0 jmp _KiV86Complete .globl _KiTrap3 @@ -106,7 +106,7 @@ cmp eax, 1 /* Return to caller */ - jne Kei386EoiHelper@0 + jne _Kei386EoiHelper@0 jmp _KiV86Complete .globl _KiTrap4 @@ -127,7 +127,7 @@ cmp eax, 1 /* Return to caller */ - jne Kei386EoiHelper@0 + jne _Kei386EoiHelper@0 jmp _KiV86Complete .globl _KiTrap5 @@ -148,7 +148,7 @@ cmp eax, 1 /* Return to caller */ - jne Kei386EoiHelper@0 + jne _Kei386EoiHelper@0 jmp _KiV86Complete .globl _KiTrap6 @@ -169,7 +169,7 @@ cmp eax, 1 /* Return to caller */ - jne Kei386EoiHelper@0 + jne _Kei386EoiHelper@0 jmp _KiV86Complete .globl _KiTrap7 @@ -190,7 +190,7 @@ cmp eax, 1 /* Return to caller */ - jne Kei386EoiHelper@0 + jne _Kei386EoiHelper@0 jmp _KiV86Complete .globl _KiTrap8 @@ -216,7 +216,7 @@ cmp eax, 1 /* Return to caller */ - jne Kei386EoiHelper@0 + jne _Kei386EoiHelper@0 jmp _KiV86Complete .globl _KiTrap10 @@ -234,7 +234,7 @@ cmp eax, 1 /* Return to caller */ - jne Kei386EoiHelper@0 + jne _Kei386EoiHelper@0 jmp _KiV86Complete .globl _KiTrap11 @@ -252,7 +252,7 @@ cmp eax, 1 /* Return to caller */ - jne Kei386EoiHelper@0 + jne _Kei386EoiHelper@0 jmp _KiV86Complete .globl _KiTrap12 @@ -270,7 +270,7 @@ cmp eax, 1 /* Return to caller */ - jne Kei386EoiHelper@0 + jne _Kei386EoiHelper@0 jmp _KiV86Complete .globl _KiTrap13 @@ -288,7 +288,7 @@ cmp eax, 1 /* Return to caller */ - jne Kei386EoiHelper@0 + jne _Kei386EoiHelper@0 jmp _KiV86Complete .globl _KiTrap14 @@ -306,7 +306,7 @@ cmp eax, 1 /* Return to caller */ - jne Kei386EoiHelper@0 + jne _Kei386EoiHelper@0 jmp _KiV86Complete .globl _KiTrap15 @@ -327,7 +327,7 @@ cmp eax, 1 /* Return to caller */ - jne Kei386EoiHelper@0 + jne _Kei386EoiHelper@0 jmp _KiV86Complete .globl _KiTrap16 @@ -348,7 +348,7 @@ cmp eax, 1 /* Return to caller */ - jne Kei386EoiHelper@0 + jne _Kei386EoiHelper@0 jmp _KiV86Complete .globl _KiTrap17 @@ -369,7 +369,7 @@ cmp eax, 1 /* Return to caller */ - jne Kei386EoiHelper@0 + jne _Kei386EoiHelper@0 jmp _KiV86Complete .globl _KiTrap18 @@ -390,7 +390,7 @@ cmp eax, 1 /* Return to caller */ - jne Kei386EoiHelper@0 + jne _Kei386EoiHelper@0 jmp _KiV86Complete .globl _KiTrap19 @@ -411,7 +411,7 @@ cmp eax, 1 /* Return to caller */ - jne Kei386EoiHelper@0 + jne _Kei386EoiHelper@0 jmp _KiV86Complete .globl _KiTrapUnknown @@ -426,7 +426,7 @@ cmp eax, 1 /* Return to caller */ - jne Kei386EoiHelper@0 + jne _Kei386EoiHelper@0 jmp _KiV86Complete .globl _KiCoprocessorError@0

1 0

[gedmurphy] 20928: make arrow available in 24x24
by gedmurphy＠svn.reactos.org 17 Jan '06

17 Jan '06

make arrow available in 24x24 Modified: trunk/reactos/subsys/system/explorer/res/arrow.ico _____ Modified: trunk/reactos/subsys/system/explorer/res/arrow.ico (Binary files differ)

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