Ros-diffs January 2006

ros-diffs@reactos.org

23 participants
586 discussions

[ion] 20923: - Fix a build issue.

by ion＠svn.reactos.org

- Fix a build issue. - Added more DBG checks for trap exits: * Detect if exiting with incorrect IF state. * Detect if exiting with broken stack. * Detect if exiting with a broken trap frame (note: Disabled in Kei386EoiHelper beause this raises the assertion. The trap frame is valid, it's just that some old code is using DbgArgMark for other purposes. Will fix.) * Detect if exiting with invalid FS. * Detect if exiting with invalid Exception List. * Detect if exiting with incorrect exception list and/or incorrect previmous mode on the stack (to detect macro/calling type mismatch). The trap exit code is now complete and shareable across all 3 trap exit types, except for one broken assertion left to fix. Modified: trunk/reactos/include/ndk/asm.h Modified: trunk/reactos/ntoskrnl/ke/i386/exp.c Modified: trunk/reactos/ntoskrnl/ke/i386/syscall.S _____ Modified: trunk/reactos/include/ndk/asm.h --- trunk/reactos/include/ndk/asm.h 2006-01-16 21:41:19 UTC (rev 20922) +++ trunk/reactos/include/ndk/asm.h 2006-01-16 22:07:38 UTC (rev 20923) @@ -356,7 +356,9 @@ // // NTSTATUS Codes // +#ifdef __ASM__ #define STATUS_INVALID_SYSTEM_SERVICE 0xC000001C +#endif // // Generic Definitions _____ Modified: trunk/reactos/ntoskrnl/ke/i386/exp.c --- trunk/reactos/ntoskrnl/ke/i386/exp.c 2006-01-16 21:41:19 UTC (rev 20922) +++ trunk/reactos/ntoskrnl/ke/i386/exp.c 2006-01-16 22:07:38 UTC (rev 20923) @@ -495,9 +495,6 @@ ASSERT(ExceptionNr != 14); - /* Store the exception number in an unused field in the trap frame. */ - Tf->DbgArgMark = ExceptionNr; - /* Use the address of the trap frame as approximation to the ring0 esp */ Esp0 = (ULONG)&Tf->Eip; _____ Modified: trunk/reactos/ntoskrnl/ke/i386/syscall.S --- trunk/reactos/ntoskrnl/ke/i386/syscall.S 2006-01-16 21:41:19 UTC (rev 20922) +++ trunk/reactos/ntoskrnl/ke/i386/syscall.S 2006-01-16 22:07:38 UTC (rev 20923) @@ -484,13 +484,74 @@ KiRosTrapReturn: // ========================= COMMON TRAP EXIT CODE ===================// - /* Restore exception list */ +#ifdef DBG + /* Assert the flags */ + pushfd + pop edx + test edx, EFLAGS_INTERRUPT_MASK + jnz InvalidExitState + + /* Assert the stack */ + cmp esp, ebp + jnz InvalidExitState + + /* Assert the trap frame */ +StateCheckDone: + sub dword ptr [esp+KTRAP_FRAME_DEBUGARGMARK], 0xBADB0D00 + jnz InvalidTrapFrame + + /* Assert FS */ + mov bx, fs + cmp bx, KGDT_R0_PCR + jnz InvalidFs + + /* 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 ==================// - /* Restore previous mode */ + /* 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 ===================// @@ -766,13 +827,74 @@ jmp ApcLoop2 KiRosTrapReturn2: +#ifdef DBG + /* Assert the flags */ + pushfd + pop edx + test edx, EFLAGS_INTERRUPT_MASK + jnz InvalidExitState2 - /* Restore exception list */ + /* Assert the stack */ + cmp esp, ebp + jnz InvalidExitState2 + + /* Assert the trap frame */ +StateCheckDone2: + sub dword ptr [esp+KTRAP_FRAME_DEBUGARGMARK], 0xBADB0D00 + jnz InvalidTrapFrame2 + + /* Assert FS */ + mov bx, fs + cmp bx, KGDT_R0_PCR + jnz InvalidFs2 + + /* Assert exception list */ + cmp dword ptr fs:[KPCR_EXCEPTION_LIST], 0 + jnz ExceptionListOK2 + +InvalidFs2: + push -1 + call _KeBugCheck@4 + +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 ecx, [esp+KTRAP_FRAME_PREVIOUS_MODE] mov esi, [fs:KPCR_CURRENT_THREAD] mov byte ptr [esi+KTHREAD_PREVIOUS_MODE], cl @@ -957,9 +1079,58 @@ jmp ApcLoop3 KiRosTrapReturn3: +#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 edx, [esp+KTRAP_FRAME_EXCEPTION_LIST] mov [fs:KPCR_EXCEPTION_LIST], edx /* Check for V86 */

18 years, 8 months

[ion] 20922: * Increase total system call count in KPCR for performance counter.

by ion＠svn.reactos.org

* Increase total system call count in KPCR for performance counter. * Increase per-systemcall call count in the KiServiceTable if it was specified, for performance counters. * Add sanity checks to system call handler to detect: - User-mode system calls at > PASSIVE - User-mode system call return at > PASSIVE - Return to user-mode with Kernel APCs disabled. * These features are on DBG only. Modified: trunk/reactos/ntoskrnl/ke/i386/syscall.S _____ Modified: trunk/reactos/ntoskrnl/ke/i386/syscall.S --- trunk/reactos/ntoskrnl/ke/i386/syscall.S 2006-01-16 21:14:32 UTC (rev 20921) +++ trunk/reactos/ntoskrnl/ke/i386/syscall.S 2006-01-16 21:41:19 UTC (rev 20922) @@ -7,6 +7,8 @@ #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 @@ -322,7 +324,18 @@ #endif NotWin32K: + /* Increase total syscall count */ + inc dword ptr fs:[KPCR_SYSTEM_CALLS] + +#ifdef DBG + /* Increase per-syscall count */ + mov ecx, [edi+4] + 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 */ @@ -346,6 +359,14 @@ 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 @@ -355,6 +376,7 @@ * 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 @@ -364,6 +386,30 @@ /* 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 @@ -540,6 +586,39 @@ sti sysexit +#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 + V86_Exit: /* Move to EDX position */ add esp, KTRAP_FRAME_EDX

18 years, 8 months

[ion] 20921: - Write the first of 3 shared trap prolog macros. Does not fully support V86 entry and DR saving yet. Used by all KiTraps (except double-fault for now) and KiDebugService.

by ion＠svn.reactos.org

- Write the first of 3 shared trap prolog macros. Does not fully support V86 entry and DR saving yet. Used by all KiTraps (except double-fault for now) and KiDebugService. - Update asm.h with more stuff from ks386.inc. - Use only documented constants in syscall.S through asm.h. 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/ntoskrnl/ke/i386/trap.s _____ Modified: trunk/reactos/include/ndk/asm.h --- trunk/reactos/include/ndk/asm.h 2006-01-16 21:12:13 UTC (rev 20920) +++ trunk/reactos/include/ndk/asm.h 2006-01-16 21:14:32 UTC (rev 20921) @@ -9,6 +9,7 @@ Abstract: ASM Offsets for dealing with de-referencing structures in registers. + C-compatible version of the file ks386.inc present in the newest WDK. Author: @@ -20,6 +21,12 @@ #define _ASM_H // +// CPU Modes +// +#define KernelMode 0x0 +#define UserMode 0x1 + +// // Selector Names // #define RPL_MASK 0x0003 @@ -200,6 +207,7 @@ #define KTRAP_FRAME_SIZE 0x8C #define KTRAP_FRAME_LENGTH 0x8C #define KTRAP_FRAME_ALIGN 0x04 +#define FRAME_EDITED 0xFFF8 // // KUSER_SHARED_DATA Offsets @@ -346,6 +354,11 @@ #define CBSTACK_RESULT_LENGTH 0x24 // +// NTSTATUS Codes +// +#define STATUS_INVALID_SYSTEM_SERVICE 0xC000001C + +// // 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-16 21:12:13 UTC (rev 20920) +++ trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S 2006-01-16 21:14:32 UTC (rev 20921) @@ -46,7 +46,99 @@ #endif // +// 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; + +// // These macros control common execution paths for Traps and System Call Code -// TODO // +// 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 +// +// /* 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 + + _____ Modified: trunk/reactos/ntoskrnl/ke/i386/syscall.S --- trunk/reactos/ntoskrnl/ke/i386/syscall.S 2006-01-16 21:12:13 UTC (rev 20920) +++ trunk/reactos/ntoskrnl/ke/i386/syscall.S 2006-01-16 21:14:32 UTC (rev 20921) @@ -5,13 +5,9 @@ * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */ -#include <roscfg.h> -#include <internal/i386/ke.h> -#include <ndk/asm.h> +#include <asm.h> +#include <internal/i386/asmmacro.S> -#define UserMode (1) -#define STATUS_INVALID_SYSTEM_SERVICE 0xC000001C - .globl _KiServiceExit .globl _KiServiceExit2 .globl _KiFastCallEntry @@ -20,14 +16,18 @@ .intel_syntax noprefix /* - * NOTE: I will create some macros for trap entry and exit, - * DR* register restoration, modified frame exit, etc, if GAS - * allows it/I find a way how. This would remove a lot of - * duplicated code in this file plus the other irq/trap asm files. - * I think this is similar to what NT does, if you look at teh - * Dr_kit*_a functions which look auto-generated. + * There are 3 main types of Trap Entries: + * + * - System Calls + * - TODO + * + * - Exceptions + * - TODO + * + * - Interrupts + * - TODO */ - + /* * There are 3 main types of Trap Exits: * @@ -78,10 +78,6 @@ * - Use macros and merge with trap.s nicely */ -/* - * Entries will be discussed later. - */ - /*** 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 @@ -132,7 +128,7 @@ push 2 /* Ring 0 EFLAGS */ add edx, 8 /* Skip user parameter list */ popf /* Set our EFLAGS */ - or dword ptr [esp], X86_EFLAGS_IF /* Re-enable IRQs in EFLAGS, to fake INT */ + 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 @@ -386,7 +382,7 @@ // ================= COMMON USER-MODE APC DELIVERY CHECK ============// /* Check for V86 mode */ - test dword ptr [ebp+KTRAP_FRAME_EFLAGS], X86_EFLAGS_VM + test dword ptr [ebp+KTRAP_FRAME_EFLAGS], EFLAGS_V86_MASK jnz ApcLoop /* Deliver APCs only if we were called from user mode */ @@ -454,7 +450,7 @@ // ==================== END IF PREVIOUS MODE NEEDED ===================// /* Check for V86 */ - test dword ptr [esp+KTRAP_FRAME_EFLAGS], X86_EFLAGS_VM + test dword ptr [esp+KTRAP_FRAME_EFLAGS], EFLAGS_V86_MASK jnz V86_Exit /* Check if the frame was edited */ @@ -467,6 +463,8 @@ 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 ====================// //badbadbad @@ -518,7 +516,7 @@ /* Is SYSEXIT Supported/Wanted? */ cmp dword ptr ss:[_KiFastSystemCallDisable], 0 jnz IntRet - test dword ptr [esp+8], X86_EFLAGS_TF + test dword ptr [esp+8], EFLAGS_TF jnz IntRet /* Restore FS to TIB */ @@ -528,7 +526,7 @@ /* 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], ~X86_EFLAGS_IF Line below is equivalent to this, +/* 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 */ @@ -647,7 +645,7 @@ cli /* Check for V86 mode */ - test dword ptr [ebp+KTRAP_FRAME_EFLAGS], X86_EFLAGS_VM + test dword ptr [ebp+KTRAP_FRAME_EFLAGS], EFLAGS_V86_MASK jnz ApcLoop2 /* Deliver APCs only if we were called from user mode */ @@ -700,7 +698,7 @@ mov byte ptr [esi+KTHREAD_PREVIOUS_MODE], cl /* Check for V86 */ - test dword ptr [esp+KTRAP_FRAME_EFLAGS], X86_EFLAGS_VM + test dword ptr [esp+KTRAP_FRAME_EFLAGS], EFLAGS_V86_MASK jnz V86_Exit /* Check if the frame was edited */ @@ -779,66 +777,12 @@ _KiDebugService: - /* Create the Trap Frame */ + /* Push error code */ push 0 - push ebp - push ebx - push esi - push edi - push fs - /* Switch to correct FS */ - mov bx, KGDT_R0_PCR - mov fs, bx + /* Enter trap */ + TRAP_PROLOG(kids) - /* Save Exception List */ - push fs:[KPCR_EXCEPTION_LIST] - - /* Traps don't need the previous mode */ - sub esp, 4 - - /* Continue building the Trap Frame */ - push eax - push ecx - push edx - push ds - push es - push gs - sub esp, 0x30 - - /* Switch Segments to Kernel */ - mov ax, KGDT_R0_DATA - 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], X86_EFLAGS_VM - //jnz V86_kids - - /* 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_kids - - /* 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 - /* Increase EIP so we skip the INT3 */ //inc dword ptr [ebp+KTRAP_FRAME_EIP] @@ -848,7 +792,7 @@ mov edx, [ebp+KTRAP_FRAME_EAX] /* Check for V86 mode */ - test dword ptr [ebp+KTRAP_FRAME_EFLAGS], X86_EFLAGS_VM + test dword ptr [ebp+KTRAP_FRAME_EFLAGS], EFLAGS_V86_MASK jnz NotUserMode /* Check if this is kernel or user-mode */ @@ -892,7 +836,7 @@ cli /* Check for V86 mode */ - test dword ptr [ebp+KTRAP_FRAME_EFLAGS], X86_EFLAGS_VM + test dword ptr [ebp+KTRAP_FRAME_EFLAGS], EFLAGS_V86_MASK jnz ApcLoop3 /* Deliver APCs only if we were called from user mode */ @@ -940,7 +884,7 @@ mov [fs:KPCR_EXCEPTION_LIST], edx /* Check for V86 */ - test dword ptr [esp+KTRAP_FRAME_EFLAGS], X86_EFLAGS_VM + test dword ptr [esp+KTRAP_FRAME_EFLAGS], EFLAGS_V86_MASK jnz V86_Exit /* Check if the frame was edited */ _____ Modified: trunk/reactos/ntoskrnl/ke/i386/trap.s --- trunk/reactos/ntoskrnl/ke/i386/trap.s 2006-01-16 21:12:13 UTC (rev 20920) +++ trunk/reactos/ntoskrnl/ke/i386/trap.s 2006-01-16 21:14:32 UTC (rev 20921) @@ -3,288 +3,432 @@ * FILE: ntoskrnl/ke/i386/trap.s * PURPOSE: Exception handlers * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) - * David Welch <welch(a)cwcom.net> */ /* INCLUDES ******************************************************************/ -#include <ndk/asm.h> +#include <asm.h> +#include <internal/i386/asmmacro.S> /* NOTES: - * The prologue is currently a duplication of the trap enter code in KiDebugService. - * It will be made a macro and shared later. + * 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. */ /* FUNCTIONS *****************************************************************/ -/* - * Epilog for exception handlers - */ -_KiTrapEpilog: - cmpl $1, %eax /* Check for v86 recovery */ - jne Kei386EoiHelper@0 - jmp _KiV86Complete +.globl _KiTrap0 +_KiTrap0: + /* Push error code */ + push 0 -.globl _KiTrapProlog -_KiTrapProlog: - movl $_KiTrapHandler, %ebx - -.global _KiTrapProlog2 -_KiTrapProlog2: - pushl %edi - pushl %fs + /* Enter trap */ + TRAP_PROLOG(0) -.intel_syntax noprefix - /* Load the PCR selector into fs */ - mov edi, KGDT_R0_PCR - mov fs, di + /* Call the C exception handler */ + push 0 + push ebp + call _KiTrapHandler + add esp, 8 - /* Push exception list and previous mode (invalid) */ - push fs:[KPCR_EXCEPTION_LIST] - push -1 + /* Check for v86 recovery */ + cmp eax, 1 - /* Push volatiles and segments */ - push eax - push ecx - push edx - push ds - push es - push gs + /* Return to caller */ + jne Kei386EoiHelper@0 + jmp _KiV86Complete - /* Set the R3 data segment */ - mov ax, KGDT_R3_DATA + RPL_MASK +.globl _KiTrap1 +_KiTrap1: + /* Push error code */ + push 0 - /* Skip debug registers and debug stuff */ - sub esp, 0x30 + /* Enter trap */ + TRAP_PROLOG(1) - /* Load the segment registers */ - mov ds, ax - mov es, ax + /* Call the C exception handler */ + push 1 + push ebp + call _KiTrapHandler + add esp, 8 - /* Set up frame */ - mov ebp, esp + /* Check for v86 recovery */ + cmp eax, 1 - /* Check if this was from V86 Mode */ - test dword ptr [ebp+KTRAP_FRAME_EFLAGS], EFLAGS_V86_MASK - //jnz V86_kids + /* Return to caller */ + jne Kei386EoiHelper@0 + jmp _KiV86Complete - /* Get current thread */ - mov ecx, [fs:KPCR_CURRENT_THREAD] - cld +.globl _KiTrap2 +_KiTrap2: + /* Push error code */ + push 0 - /* Flush DR7 */ - and dword ptr [ebp+KTRAP_FRAME_DR7], 0 + /* Enter trap */ + TRAP_PROLOG(2) - /* Check if the thread was being debugged */ - //test byte ptr [ecx+KTHREAD_DEBUG_ACTIVE], 0xFF - //jnz Dr_kids + /* Call the C exception handler */ + push 2 + push ebp + call _KiTrapHandler + add esp, 8 - /* Get the Debug Trap Frame EBP/EIP */ - mov ecx, [ebp+KTRAP_FRAME_EBP] - mov edi, [ebp+KTRAP_FRAME_EIP] + /* Check for v86 recovery */ + cmp eax, 1 - /* Write the debug data */ - mov [ebp+KTRAP_FRAME_DEBUGPOINTER], edx - mov dword ptr [ebp+KTRAP_FRAME_DEBUGARGMARK], 0xBADB0D00 - mov [ebp+KTRAP_FRAME_DEBUGEBP], ecx - mov [ebp+KTRAP_FRAME_DEBUGEIP], edi -.att_syntax + /* Return to caller */ + jne Kei386EoiHelper@0 + jmp _KiV86Complete -.L6: - - /* Call the C exception handler */ - pushl %esi - pushl %ebp - call *%ebx - addl $8, %esp +.globl _KiTrap3 +_KiTrap3: + /* Push error code */ + push 0 - /* Return to the caller */ - jmp _KiTrapEpilog + /* Enter trap */ + TRAP_PROLOG(3) -.globl _KiTrap0 -_KiTrap0: - /* No error code */ - pushl $0 - pushl %ebp - pushl %ebx - pushl %esi - movl $0, %esi - jmp _KiTrapProlog - -.globl _KiTrap1 -_KiTrap1: - /* No error code */ - pushl $0 - pushl %ebp - pushl %ebx - pushl %esi - movl $1, %esi - jmp _KiTrapProlog - -.globl _KiTrap2 -_KiTrap2: - pushl $0 - pushl %ebp - pushl %ebx - pushl %esi - movl $2, %esi - jmp _KiTrapProlog + /* Call the C exception handler */ + push 3 + push ebp + call _KiTrapHandler + add esp, 8 -.globl _KiTrap3 -_KiTrap3: - pushl $0 - pushl %ebp - pushl %ebx - pushl %esi - movl $3, %esi - jmp _KiTrapProlog + /* Check for v86 recovery */ + cmp eax, 1 + /* Return to caller */ + jne Kei386EoiHelper@0 + jmp _KiV86Complete + .globl _KiTrap4 _KiTrap4: - pushl $0 - pushl %ebp - pushl %ebx - pushl %esi - movl $4, %esi - jmp _KiTrapProlog + /* Push error code */ + push 0 + /* Enter trap */ + TRAP_PROLOG(4) + + /* Call the C exception handler */ + push 4 + push ebp + call _KiTrapHandler + add esp, 8 + + /* Check for v86 recovery */ + cmp eax, 1 + + /* Return to caller */ + jne Kei386EoiHelper@0 + jmp _KiV86Complete + .globl _KiTrap5 _KiTrap5: - pushl $0 - pushl %ebp - pushl %ebx - pushl %esi - movl $5, %esi - jmp _KiTrapProlog + /* Push error code */ + push 0 + /* Enter trap */ + TRAP_PROLOG(5) + + /* Call the C exception handler */ + push 5 + push ebp + call _KiTrapHandler + add esp, 8 + + /* Check for v86 recovery */ + cmp eax, 1 + + /* Return to caller */ + jne Kei386EoiHelper@0 + jmp _KiV86Complete + .globl _KiTrap6 _KiTrap6: - pushl $0 - pushl %ebp - pushl %ebx - pushl %esi - movl $6, %esi - jmp _KiTrapProlog + /* Push error code */ + push 0 + /* Enter trap */ + TRAP_PROLOG(6) + + /* Call the C exception handler */ + push 6 + push ebp + call _KiTrapHandler + add esp, 8 + + /* Check for v86 recovery */ + cmp eax, 1 + + /* Return to caller */ + jne Kei386EoiHelper@0 + jmp _KiV86Complete + .globl _KiTrap7 _KiTrap7: - pushl $0 - pushl %ebp - pushl %ebx - pushl %esi - movl $7, %esi - jmp _KiTrapProlog + /* Push error code */ + push 0 + /* Enter trap */ + TRAP_PROLOG(7) + + /* Call the C exception handler */ + push 7 + push ebp + call _KiTrapHandler + add esp, 8 + + /* Check for v86 recovery */ + cmp eax, 1 + + /* Return to caller */ + jne Kei386EoiHelper@0 + jmp _KiV86Complete + .globl _KiTrap8 _KiTrap8: - call _KiDoubleFaultHandler - iret + call _KiDoubleFaultHandler + iret .globl _KiTrap9 _KiTrap9: - pushl $0 - pushl %ebp - pushl %ebx - pushl %esi - movl $9, %esi - jmp _KiTrapProlog + /* Push error code */ + push 0 + /* Enter trap */ + TRAP_PROLOG(9) + + /* Call the C exception handler */ + push 9 + push ebp + call _KiTrapHandler + add esp, 8 + + /* Check for v86 recovery */ + cmp eax, 1 + + /* Return to caller */ + jne Kei386EoiHelper@0 + jmp _KiV86Complete + .globl _KiTrap10 _KiTrap10: - pushl %ebp - pushl %ebx - pushl %esi - movl $10, %esi - jmp _KiTrapProlog + /* Enter trap */ + TRAP_PROLOG(10) + /* Call the C exception handler */ + push 10 + push ebp + call _KiTrapHandler + add esp, 8 + + /* Check for v86 recovery */ + cmp eax, 1 + + /* Return to caller */ + jne Kei386EoiHelper@0 + jmp _KiV86Complete + .globl _KiTrap11 _KiTrap11: - pushl %ebp - pushl %ebx - pushl %esi - movl $11, %esi - jmp _KiTrapProlog + /* Enter trap */ + TRAP_PROLOG(11) + /* Call the C exception handler */ + push 11 + push ebp + call _KiTrapHandler + add esp, 8 + + /* Check for v86 recovery */ + cmp eax, 1 + + /* Return to caller */ + jne Kei386EoiHelper@0 + jmp _KiV86Complete + .globl _KiTrap12 _KiTrap12: - pushl %ebp - pushl %ebx - pushl %esi - movl $12, %esi - jmp _KiTrapProlog + /* Enter trap */ + TRAP_PROLOG(12) + /* Call the C exception handler */ + push 12 + push ebp + call _KiTrapHandler + add esp, 8 + + /* Check for v86 recovery */ + cmp eax, 1 + + /* Return to caller */ + jne Kei386EoiHelper@0 + jmp _KiV86Complete + .globl _KiTrap13 _KiTrap13: - pushl %ebp - pushl %ebx - pushl %esi - movl $13, %esi - jmp _KiTrapProlog + /* Enter trap */ + TRAP_PROLOG(13) + /* Call the C exception handler */ + push 13 + push ebp + call _KiTrapHandler + add esp, 8 + + /* Check for v86 recovery */ + cmp eax, 1 + + /* Return to caller */ + jne Kei386EoiHelper@0 + jmp _KiV86Complete + .globl _KiTrap14 _KiTrap14: - pushl %ebp - pushl %ebx - pushl %esi - movl $14, %esi - movl $_KiPageFaultHandler, %ebx - jmp _KiTrapProlog2 + /* Enter trap */ + TRAP_PROLOG(14) + /* Call the C exception handler */ + push 14 + push ebp + call _KiPageFaultHandler + add esp, 8 + + /* Check for v86 recovery */ + cmp eax, 1 + + /* Return to caller */ + jne Kei386EoiHelper@0 + jmp _KiV86Complete + .globl _KiTrap15 _KiTrap15: - pushl $0 - pushl %ebp - pushl %ebx - pushl %esi - movl $15, %esi - jmp _KiTrapProlog + /* Push error code */ + push 0 + /* Enter trap */ + TRAP_PROLOG(15) + + /* Call the C exception handler */ + push 15 + push ebp + call _KiTrapHandler + add esp, 8 + + /* Check for v86 recovery */ + cmp eax, 1 + + /* Return to caller */ + jne Kei386EoiHelper@0 + jmp _KiV86Complete + .globl _KiTrap16 _KiTrap16: - pushl $0 - pushl %ebp - pushl %ebx - pushl %esi - movl $16, %esi - jmp _KiTrapProlog - + /* Push error code */ + push 0 + + /* Enter trap */ + TRAP_PROLOG(16) + + /* Call the C exception handler */ + push 16 + push ebp + call _KiTrapHandler + add esp, 8 + + /* Check for v86 recovery */ + cmp eax, 1 + + /* Return to caller */ + jne Kei386EoiHelper@0 + jmp _KiV86Complete + .globl _KiTrap17 _KiTrap17: - pushl $0 - pushl %ebp - pushl %ebx - pushl %esi - movl $17, %esi - jmp _KiTrapProlog + /* Push error code */ + push 0 + /* Enter trap */ + TRAP_PROLOG(17) + + /* Call the C exception handler */ + push 17 + push ebp + call _KiTrapHandler + add esp, 8 + + /* Check for v86 recovery */ + cmp eax, 1 + + /* Return to caller */ + jne Kei386EoiHelper@0 + jmp _KiV86Complete + .globl _KiTrap18 _KiTrap18: - pushl $0 - pushl %ebp - pushl %ebx - pushl %esi - movl $18, %esi - jmp _KiTrapProlog + /* Push error code */ + push 0 + /* Enter trap */ + TRAP_PROLOG(18) + + /* Call the C exception handler */ + push 18 + push ebp + call _KiTrapHandler + add esp, 8 + + /* Check for v86 recovery */ + cmp eax, 1 + + /* Return to caller */ + jne Kei386EoiHelper@0 + jmp _KiV86Complete + .globl _KiTrap19 _KiTrap19: - pushl $0 - pushl %ebp - pushl %ebx - pushl %esi - movl $19, %esi - jmp _KiTrapProlog + /* Push error code */ + push 0 + /* Enter trap */ + TRAP_PROLOG(19) + + /* Call the C exception handler */ + push 19 + push ebp + call _KiTrapHandler + add esp, 8 + + /* Check for v86 recovery */ + cmp eax, 1 + + /* Return to caller */ + jne Kei386EoiHelper@0 + jmp _KiV86Complete + .globl _KiTrapUnknown _KiTrapUnknown: - pushl $0 - pushl %ebp - pushl %ebx - pushl %esi - movl $255, %esi - jmp _KiTrapProlog + /* Push error code */ [truncated at 1000 lines; 16 more skipped]

18 years, 8 months

[gvg] 20920: Fix build for binutils 2.15.90

by gvg＠svn.reactos.org

Fix build for binutils 2.15.90 Modified: trunk/reactos/ntoskrnl/ke/i386/cpu.S Modified: trunk/reactos/ntoskrnl/ke/i386/usercall_asm.S _____ Modified: trunk/reactos/ntoskrnl/ke/i386/cpu.S --- trunk/reactos/ntoskrnl/ke/i386/cpu.S 2006-01-16 19:59:32 UTC (rev 20919) +++ trunk/reactos/ntoskrnl/ke/i386/cpu.S 2006-01-16 21:12:13 UTC (rev 20920) @@ -32,7 +32,9 @@ /* Modifying the PSE, PGE or PAE Flag in CR4 causes the TLB to be flushed */ mov eax, cr4 - and eax, ~CR4_PGE +.att_syntax /* Older binutils versions don't support ~ for .intel_syntax */ + and $~CR4_PGE, %eax +.intel_syntax noprefix mov cr4, eax or eax, CR4_PGE mov cr4, eax _____ Modified: trunk/reactos/ntoskrnl/ke/i386/usercall_asm.S --- trunk/reactos/ntoskrnl/ke/i386/usercall_asm.S 2006-01-16 19:59:32 UTC (rev 20919) +++ trunk/reactos/ntoskrnl/ke/i386/usercall_asm.S 2006-01-16 21:12:13 UTC (rev 20920) @@ -135,7 +135,9 @@ mov [ebx+KTHREAD_CALLBACK_STACK], esp /* Align stack on 16-byte boundary */ - and esp, ~15 +.att_syntax /* Older binutils versions don't support ~ for intel_syntax */ + and $~15,%esp +.intel_syntax noprefix mov edi, esp /* Set destination and origin NPX Areas */

18 years, 8 months

[ion] 20919: - Fix another V86 Mode exit bug which could cause non-volatiles to be incorrectly restored.

by ion＠svn.reactos.org

- Fix another V86 Mode exit bug which could cause non-volatiles to be incorrectly restored. - Make traps use the shared EOI (End Of Interrupt) helper instead of their own custom trap exit code. Modified: trunk/reactos/ntoskrnl/ke/i386/syscall.S Modified: trunk/reactos/ntoskrnl/ke/i386/trap.s _____ Modified: trunk/reactos/ntoskrnl/ke/i386/syscall.S --- trunk/reactos/ntoskrnl/ke/i386/syscall.S 2006-01-16 19:32:55 UTC (rev 20918) +++ trunk/reactos/ntoskrnl/ke/i386/syscall.S 2006-01-16 19:59:32 UTC (rev 20919) @@ -458,7 +458,6 @@ jnz V86_Exit /* Check if the frame was edited */ -V86_Exit_Return: test word ptr [esp+KTRAP_FRAME_CS], FRAME_EDITED jz EditedFrame @@ -480,12 +479,12 @@ /* Restore FS */ RestoreFs: - //lea esp, [ebp+KTRAP_FRAME_FS] + lea esp, [ebp+KTRAP_FRAME_FS] pop fs CommonStackClean: /* Skip debug information and unsaved registers */ - //lea esp, [ebp+KTRAP_FRAME_EDI] + lea esp, [ebp+KTRAP_FRAME_EDI] pop edi pop esi pop ebx @@ -551,8 +550,18 @@ pop edx pop ecx pop eax - jmp V86_Exit_Return + /* 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 @@ -692,10 +701,9 @@ /* Check for V86 */ test dword ptr [esp+KTRAP_FRAME_EFLAGS], X86_EFLAGS_VM - jnz V86_Exit2 + jnz V86_Exit /* Check if the frame was edited */ -V86_Exit_Return2: test word ptr [esp+KTRAP_FRAME_CS], FRAME_EDITED jz EditedFrame2 @@ -734,16 +742,6 @@ add esp, 4 iret -V86_Exit2: - /* Move to EDX position */ - add esp, KTRAP_FRAME_EDX - - /* Restore volatiles */ - pop edx - pop ecx - pop eax - jmp V86_Exit_Return2 - EditedFrame2: /* Restore real CS value */ mov ebx, [esp+KTRAP_FRAME_TEMPCS] @@ -943,10 +941,9 @@ /* Check for V86 */ test dword ptr [esp+KTRAP_FRAME_EFLAGS], X86_EFLAGS_VM - jnz V86_Exit3 + jnz V86_Exit /* Check if the frame was edited */ -V86_Exit_Return3: test word ptr [esp+KTRAP_FRAME_CS], FRAME_EDITED jz EditedFrame3 @@ -985,16 +982,6 @@ add esp, 4 iret -V86_Exit3: - /* Move to EDX position */ - add esp, KTRAP_FRAME_EDX - - /* Restore volatiles */ - pop edx - pop ecx - pop eax - jmp V86_Exit_Return3 - EditedFrame3: /* Restore real CS value */ mov ebx, [esp+KTRAP_FRAME_TEMPCS] _____ Modified: trunk/reactos/ntoskrnl/ke/i386/trap.s --- trunk/reactos/ntoskrnl/ke/i386/trap.s 2006-01-16 19:32:55 UTC (rev 20918) +++ trunk/reactos/ntoskrnl/ke/i386/trap.s 2006-01-16 19:59:32 UTC (rev 20919) @@ -1,22 +1,16 @@ -/* $Id$ - * +/* * PROJECT: ReactOS kernel * FILE: ntoskrnl/ke/i386/trap.s * PURPOSE: Exception handlers - * PROGRAMMER: David Welch <welch(a)cwcom.net> + * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) + * David Welch <welch(a)cwcom.net> */ /* INCLUDES ******************************************************************/ -#include <roscfg.h> #include <ndk/asm.h> -#include <internal/i386/ke.h> -#define KernelMode 0 -#define UserMode 1 - /* NOTES: - * The epilog will be replaced by a call to Ki386EoiHelper when bugs are fixed. * The prologue is currently a duplication of the trap enter code in KiDebugService. * It will be made a macro and shared later. */ @@ -28,44 +22,9 @@ */ _KiTrapEpilog: cmpl $1, %eax /* Check for v86 recovery */ - jne _KiTrapRet + jne Kei386EoiHelper@0 jmp _KiV86Complete -_KiTrapRet: - /* Skip debug information and unsaved registers */ - addl $0x18, %esp - popl %eax /* Dr0 */ - movl %eax, %dr0 - popl %eax /* Dr1 */ - movl %eax, %dr1 - popl %eax /* Dr2 */ - movl %eax, %dr2 - popl %eax /* Dr3 */ - movl %eax, %dr3 - popl %eax /* Dr6 */ - movl %eax, %dr6 - popl %eax /* Dr7 */ - movl %eax, %dr7 - popl %gs - popl %es - popl %ds - popl %edx - popl %ecx - popl %eax - popl %ebx - /* Restore the old exception handler list */ - popl %ebx - movl %ebx, %fs:KPCR_EXCEPTION_LIST - - popl %fs - popl %edi - popl %esi - popl %ebx - popl %ebp - addl $0x4, %esp /* Ignore error code */ - - iret - .globl _KiTrapProlog _KiTrapProlog: movl $_KiTrapHandler, %ebx @@ -106,7 +65,7 @@ mov ebp, esp /* Check if this was from V86 Mode */ - test dword ptr [ebp+KTRAP_FRAME_EFLAGS], X86_EFLAGS_VM + test dword ptr [ebp+KTRAP_FRAME_EFLAGS], EFLAGS_V86_MASK //jnz V86_kids /* Get current thread */ @@ -358,7 +317,7 @@ mov eax, [eax+KTHREAD_INITIAL_STACK] /* Check if V86 */ - test dword ptr [edx+KTRAP_FRAME_EFLAGS], X86_EFLAGS_VM + test dword ptr [edx+KTRAP_FRAME_EFLAGS], EFLAGS_V86_MASK jnz NoAdjust /* Bias the stack */

18 years, 8 months

[ion] 20918: - Fix a bad bug in the system call handler and interrupt/trap exit code which was causing a jump to the incorrect epilogue if V86 mode was detected.

by ion＠svn.reactos.org

- Fix a bad bug in the system call handler and interrupt/trap exit code which was causing a jump to the incorrect epilogue if V86 mode was detected. - Replaced most of the trap prolog code by the KiDebugService entry trap code from syscall.S. Eventually, after remaining bugs are fixed, the code will be shared across all traps and not duplicated anymore. (For documnetation's sake, changing the prolog has the following effects: DR registers are not saved anymore (they will be later), DS/ES are set to RPL3 DATA, not RPL0 DATA, GS is not touched (it shoudl be 0, not RPL0_DATA). PreviousMode is not touched at all, the Debug Trap Frame header is properly setup). Modified: trunk/reactos/ntoskrnl/ke/i386/syscall.S Modified: trunk/reactos/ntoskrnl/ke/i386/trap.s _____ Modified: trunk/reactos/ntoskrnl/ke/i386/syscall.S --- trunk/reactos/ntoskrnl/ke/i386/syscall.S 2006-01-16 17:17:49 UTC (rev 20917) +++ trunk/reactos/ntoskrnl/ke/i386/syscall.S 2006-01-16 19:32:55 UTC (rev 20918) @@ -742,7 +742,7 @@ pop edx pop ecx pop eax - jmp V86_Exit_Return + jmp V86_Exit_Return2 EditedFrame2: /* Restore real CS value */ @@ -887,6 +887,7 @@ /* Exit through common routine */ jmp Kei386EoiHelper@0 +.globl Kei386EoiHelper@0 Kei386EoiHelper@0: /* Disable interrupts */ @@ -992,7 +993,7 @@ pop edx pop ecx pop eax - jmp V86_Exit_Return + jmp V86_Exit_Return3 EditedFrame3: /* Restore real CS value */ _____ Modified: trunk/reactos/ntoskrnl/ke/i386/trap.s --- trunk/reactos/ntoskrnl/ke/i386/trap.s 2006-01-16 17:17:49 UTC (rev 20917) +++ trunk/reactos/ntoskrnl/ke/i386/trap.s 2006-01-16 19:32:55 UTC (rev 20918) @@ -15,6 +15,12 @@ #define KernelMode 0 #define UserMode 1 +/* NOTES: + * The epilog will be replaced by a call to Ki386EoiHelper when bugs are fixed. + * The prologue is currently a duplication of the trap enter code in KiDebugService. + * It will be made a macro and shared later. + */ + /* FUNCTIONS *****************************************************************/ /* @@ -69,79 +75,62 @@ pushl %edi pushl %fs - /* Make room for the previous mode and the exception list */ - subl $8, %esp +.intel_syntax noprefix + /* Load the PCR selector into fs */ + mov edi, KGDT_R0_PCR + mov fs, di - /* Save other registers */ - pushl %eax - pushl %ecx - pushl %edx - pushl %ds - pushl %es - pushl %gs - movl %dr7, %eax - pushl %eax /* Dr7 */ - /* Clear all breakpoint enables in dr7. */ - andl $0xFFFF0000, %eax - movl %eax, %dr7 - movl %dr6, %eax - pushl %eax /* Dr6 */ - movl %dr3, %eax - pushl %eax /* Dr3 */ - movl %dr2, %eax - pushl %eax /* Dr2 */ - movl %dr1, %eax - pushl %eax /* Dr1 */ - movl %dr0, %eax - pushl %eax /* Dr0 */ - leal 0x64(%esp), %eax - pushl %eax /* XXX: TempESP */ - pushl %ss /* XXX: TempSS */ - pushl $0 /* XXX: DebugPointer */ - pushl $0 /* XXX: DebugArgMark */ - movl 0x60(%esp), %eax - pushl %eax /* XXX: DebugEIP */ - pushl %ebp /* XXX: DebugEBP */ - - /* Load the segment registers */ - movl $KGDT_R0_DATA, %eax - movl %eax, %ds - movl %eax, %es - movl %eax, %gs - - /* save the trap frame */ - movl %esp, %ebp - - /* Load the PCR selector into fs */ - movl $KGDT_R0_PCR, %eax - movl %eax, %fs + /* Push exception list and previous mode (invalid) */ + push fs:[KPCR_EXCEPTION_LIST] + push -1 - /* Save the old exception list */ - movl %fs:KPCR_EXCEPTION_LIST, %eax - movl %eax, KTRAP_FRAME_EXCEPTION_LIST(%ebp) - - /* Get a pointer to the current thread */ - movl %fs:KPCR_CURRENT_THREAD, %edi + /* Push volatiles and segments */ + push eax + push ecx + push edx + push ds + push es + push gs - /* The current thread may be NULL early in the boot process */ - cmpl $0, %edi - je .L4 - - /* Save the old previous mode */ - movl $0, %eax - movb KTHREAD_PREVIOUS_MODE(%edi), %al - movl %eax, KTRAP_FRAME_PREVIOUS_MODE(%ebp) - - /* Set the new previous mode based on the saved CS selector */ - movl KTRAP_FRAME_CS(%ebp), %eax - andl $0x0000FFFF, %eax + /* Set the R3 data segment */ + mov ax, KGDT_R3_DATA + RPL_MASK - /* Save the old trap frame. */ - movl KTHREAD_TRAP_FRAME(%edi), %edx - pushl %edx - - /* Save a pointer to the trap frame in the current KTHREAD */ - movl %ebp, KTHREAD_TRAP_FRAME(%edi) + /* 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], X86_EFLAGS_VM + //jnz V86_kids + + /* 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_kids + + /* Get the Debug Trap Frame EBP/EIP */ + mov ecx, [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], ecx + mov [ebp+KTRAP_FRAME_DEBUGEIP], edi +.att_syntax + .L6: /* Call the C exception handler */ @@ -150,25 +139,9 @@ call *%ebx addl $8, %esp - /* Get a pointer to the current thread */ - movl %fs:KPCR_CURRENT_THREAD, %esi - - /* Restore the old trap frame pointer */ - popl %ebx - cmpl $0, %esi - je _KiTrapEpilog - movl %ebx, KTHREAD_TRAP_FRAME(%esi) - /* Return to the caller */ jmp _KiTrapEpilog - /* Handle the no-thread case out of line */ -.L4: - movl $0, %eax /* previous mode */ - movl %eax, KTRAP_FRAME_PREVIOUS_MODE(%ebp) - pushl %eax /* old trap frame */ - jmp .L6 - .globl _KiTrap0 _KiTrap0: /* No error code */

18 years, 8 months

[ion] 20917: - Update asm.h with more definitions.

by ion＠svn.reactos.org

- Update asm.h with more definitions. Modified: trunk/reactos/include/ndk/asm.h _____ Modified: trunk/reactos/include/ndk/asm.h --- trunk/reactos/include/ndk/asm.h 2006-01-16 17:17:16 UTC (rev 20916) +++ trunk/reactos/include/ndk/asm.h 2006-01-16 17:17:49 UTC (rev 20917) @@ -323,6 +323,20 @@ #define CR0_PG 0x80000000 // +// CR4 +// +#define CR4_VME 0x1 +#define CR4_PVI 0x2 +#define CR4_TSD 0x4 +#define CR4_DE 0x8 +#define CR4_PSE 0x10 +#define CR4_PAE 0x20 +#define CR4_MCE 0x40 +#define CR4_PGE 0x80 +#define CR4_FXSR 0x200 +#define CR4_XMMEXCPT 0x400 + +// // Usermode callout frame definitions // #define CBSTACK_STACK 0x0

18 years, 8 months

[ion] 20916: - Merge breakpoint.S and tblfush.S into cpu.S

by ion＠svn.reactos.org

- Merge breakpoint.S and tblfush.S into cpu.S Deleted: trunk/reactos/ntoskrnl/ke/i386/brkpoint.S Added: trunk/reactos/ntoskrnl/ke/i386/cpu.S Deleted: trunk/reactos/ntoskrnl/ke/i386/tlbflush.S Modified: trunk/reactos/ntoskrnl/ntoskrnl.xml _____ Deleted: trunk/reactos/ntoskrnl/ke/i386/brkpoint.S --- trunk/reactos/ntoskrnl/ke/i386/brkpoint.S 2006-01-16 17:07:45 UTC (rev 20915) +++ trunk/reactos/ntoskrnl/ke/i386/brkpoint.S 2006-01-16 17:17:16 UTC (rev 20916) @@ -1,14 +0,0 @@ -/* $Id: brkpoint.c 15164 2005-05-09 01:38:29Z sedwards $ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/ke/i386/brkpoint.c - * PURPOSE: Handles breakpoints - * - * PROGRAMMERS: No programmer listed. - */ - -.global _DbgBreakPointNoBugCheck@0 -_DbgBreakPointNoBugCheck@0: - int $3 - ret _____ Added: trunk/reactos/ntoskrnl/ke/i386/cpu.S --- trunk/reactos/ntoskrnl/ke/i386/cpu.S 2006-01-16 17:07:45 UTC (rev 20915) +++ trunk/reactos/ntoskrnl/ke/i386/cpu.S 2006-01-16 17:17:16 UTC (rev 20916) @@ -0,0 +1,46 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Kernel + * FILE: ntoskrnl/ke/i386/cpu.S + * PURPOSE: Handles CPU-centric operations: TLB Flushes, Breakpoints, FPU + * PROGRAMMERS: Alex Ionescu + */ + +/* INCLUDES ******************************************************************/ + +#include <asm.h> +.intel_syntax noprefix + +/* GLOBALS ****************************************************************/ + + +/* FUNCTIONS ****************************************************************/ + +.global _DbgBreakPointNoBugCheck@0 +.func DbgBreakPointNoBugCheck@0 +_DbgBreakPointNoBugCheck@0: + int 3 + ret +.endfunc + +.globl _KeFlushCurrentTb@0 +.func KeFlushCurrentTb@0 +_KeFlushCurrentTb@0: + /* Check for global page support */ + test byte ptr [_Ke386GlobalPagesEnabled], 0xff + jz .L1 + + /* Modifying the PSE, PGE or PAE Flag in CR4 causes the TLB to be flushed */ + mov eax, cr4 + and eax, ~CR4_PGE + mov cr4, eax + or eax, CR4_PGE + mov cr4, eax + ret + +.L1: + /* the old way ... */ + mov eax, cr3 + mov cr3, eax + ret +.endfunc _____ Deleted: trunk/reactos/ntoskrnl/ke/i386/tlbflush.S --- trunk/reactos/ntoskrnl/ke/i386/tlbflush.S 2006-01-16 17:07:45 UTC (rev 20915) +++ trunk/reactos/ntoskrnl/ke/i386/tlbflush.S 2006-01-16 17:17:16 UTC (rev 20916) @@ -1,29 +0,0 @@ -/* - * i386-specific implemetation of Translation Buffer Flushing - * Written By: Alex Ionescu <alex(a)relsoft.net> - * Reference: IA-32 Intel« Architecture Software Developer's Manual, Volume 3: System Programming Guide, - * Chapter 10 - Memory Cache Control. Section 10.9 - Invalidating the Translation Lookaside Buffers - */ - -#include <internal/i386/ke.h> - - -.globl _KeFlushCurrentTb@0 -_KeFlushCurrentTb@0: - /* Check for global page support */ - testb $0xff, (_Ke386GlobalPagesEnabled) - jz .L1 - - /* Modifying the PSE, PGE or PAE Flag in CR4 causes the TLB to be flushed */ - movl %cr4, %eax - andl $~X86_CR4_PGE, %eax - movl %eax, %cr4 - orl $X86_CR4_PGE, %eax - movl %eax, %cr4 - ret - -.L1: - /* the old way ... */ - movl %cr3, %eax - movl %eax, %cr3 - ret _____ Modified: trunk/reactos/ntoskrnl/ntoskrnl.xml --- trunk/reactos/ntoskrnl/ntoskrnl.xml 2006-01-16 17:07:45 UTC (rev 20915) +++ trunk/reactos/ntoskrnl/ntoskrnl.xml 2006-01-16 17:17:16 UTC (rev 20916) @@ -25,7 +25,7 @@ <directory name="i386"> <file first="true">main_asm.S</file> <file>bios.c</file> - <file>brkpoint.S</file> + <file>cpu.S</file> <file>ctxswitch.S</file> <file>exp.c</file> <file>fpu.c</file> @@ -37,7 +37,6 @@ <file>ldt.c</file> <file>syscall.S</file> <file>thread.c</file> - <file>tlbflush.S</file> <file>trap.s</file> <file>tss.c</file> <file>usercall_asm.S</file>

18 years, 8 months

[ion] 20915: Do set ESP0, but after we save the old value for the V86 hack.

by ion＠svn.reactos.org

Do set ESP0, but after we save the old value for the V86 hack. Modified: trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S _____ Modified: trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S --- trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S 2006-01-16 17:05:50 UTC (rev 20914) +++ trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S 2006-01-16 17:07:45 UTC (rev 20915) @@ -170,12 +170,12 @@ NoAdjust: - /* Set new ESP0 */ - //mov [ebp+KTSS_ESP0], eax - /* Save it */ push [ebp+KTSS_ESP0] + /* Set new ESP0 */ + mov [ebp+KTSS_ESP0], eax + /* Set TEB pointer */ mov eax, [esi+KTHREAD_TEB] mov [ebx+KPCR_TEB], eax

18 years, 8 months

[ion] 20914: Disable correct usage of ESP0 since it seems the V86 code is still not ready to handle that. This should fix the V86 exceptions some people have been having.

by ion＠svn.reactos.org

Disable correct usage of ESP0 since it seems the V86 code is still not ready to handle that. This should fix the V86 exceptions some people have been having. Modified: trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S Modified: trunk/reactos/ntoskrnl/ke/i386/thread.c _____ Modified: trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S --- trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S 2006-01-16 16:45:27 UTC (rev 20913) +++ trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S 2006-01-16 17:05:50 UTC (rev 20914) @@ -171,8 +171,11 @@ NoAdjust: /* Set new ESP0 */ - mov [ebp+KTSS_ESP0], eax + //mov [ebp+KTSS_ESP0], eax + /* Save it */ + push [ebp+KTSS_ESP0] + /* Set TEB pointer */ mov eax, [esi+KTHREAD_TEB] mov [ebx+KPCR_TEB], eax @@ -257,6 +260,9 @@ mov cr0, eax 4: + /* Restore ESP0 */ + pop [ebp+KTSS_ESP0] + /* Restore exception list */ pop [ebx+KPCR_EXCEPTION_LIST] _____ Modified: trunk/reactos/ntoskrnl/ke/i386/thread.c --- trunk/reactos/ntoskrnl/ke/i386/thread.c 2006-01-16 16:45:27 UTC (rev 20913) +++ trunk/reactos/ntoskrnl/ke/i386/thread.c 2006-01-16 17:05:50 UTC (rev 20914) @@ -14,6 +14,7 @@ typedef struct _KSHARED_CTXSWITCH_FRAME { + ULONG Esp0; PVOID ExceptionList; PVOID RetEip; } KSHARED_CTXSWITCH_FRAME, *PKSHARED_CTXSWITCH_FRAME; @@ -231,6 +232,9 @@ /* And set up the Context Switch Frame */ CtxSwitchFrame->RetEip = KiThreadStartup; + CtxSwitchFrame->Esp0 = (ULONG_PTR)Thread->InitialStack - + sizeof(FX_SAVE_AREA) - + 0x10; CtxSwitchFrame->ExceptionList = (PVOID)0xFFFFFFFF; /* Save back the new value of the kernel stack. */

18 years, 8 months

← Newer
1
...
14
15
16
17
18
19
20
...
59
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2006