Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-25 01:39:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

[NTOS]: Kei386EoiHelper now jumps into the C KiEoiHelper. All interrupt exit is now done through the C trap exit code.

Browse source 
[NTOS]: The ASM KiServiceExit/KiServiceExit2 are no more. All system call exit is now done through the C trap exit code.

svn path=/trunk/; revision=45144
This commit is contained in:
Sir Richard 2010-01-19 08:35:37 +00:00
parent b6fb14da50
commit 94d748c642
2 changed files with 11 additions and 91 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

97
reactos/ntoskrnl/ke/i386/trap.s
View file

@ -83,8 +83,6 @@ GENERATE_IDT_STUBS /* INT 30-FF: UNEXPECTED INTERRUPTS */
#endif #endif
/* We implement the following trap exit points: */ /* 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 */ .globl _Kei386EoiHelper@0 /* Exit from interrupt or H/W trap */
.globl _Kei386EoiHelper2ndEntry /* Exit from unexpected interrupt */ .globl _Kei386EoiHelper2ndEntry /* Exit from unexpected interrupt */
@ -113,37 +111,9 @@ _IsrTimeoutMsg:
_IsrOverflowMsg: _IsrOverflowMsg:
.asciz "\n*** ISR at %lx appears to have an interrupt storm\n" .asciz "\n*** ISR at %lx appears to have an interrupt storm\n"
_KiTrapPrefixTable:
.byte 0xF2 /* REP */
.byte 0xF3 /* REP INS/OUTS */
.byte 0x67 /* ADDR */
.byte 0xF0 /* LOCK */
.byte 0x66 /* OP */
.byte 0x2E /* SEG */
.byte 0x3E /* DS */
.byte 0x26 /* ES */
.byte 0x64 /* FS */
.byte 0x65 /* GS */
.byte 0x36 /* SS */
_KiTrapIoTable:
.byte 0xE4 /* IN */
.byte 0xE5 /* IN */
.byte 0xEC /* IN */
.byte 0xED /* IN */
.byte 0x6C /* INS */
.byte 0x6D /* INS */
.byte 0xE6 /* OUT */
.byte 0xE7 /* OUT */
.byte 0xEE /* OUT */
.byte 0xEF /* OUT */
.byte 0x6E /* OUTS */
.byte 0x6F /* OUTS */
/* SOFTWARE INTERRUPT SERVICES ***********************************************/ /* SOFTWARE INTERRUPT SERVICES ***********************************************/
.text .text
.func KiSystemService .func KiSystemService
TRAP_FIXUPS kss_a, kss_t, DoNotFixupV86, DoNotFixupAbios TRAP_FIXUPS kss_a, kss_t, DoNotFixupV86, DoNotFixupAbios
_KiSystemService: _KiSystemService:
@ -282,18 +252,11 @@ KeReturnFromSystemCall:
/* Restore the old trap frame pointer */ /* Restore the old trap frame pointer */
mov edx, [ebp+KTRAP_FRAME_EDX] mov edx, [ebp+KTRAP_FRAME_EDX]
mov [ecx+KTHREAD_TRAP_FRAME], edx mov [ecx+KTHREAD_TRAP_FRAME], edx
.endfunc
.func KiServiceExit /* Exit the system call */
_KiServiceExit: mov ecx, ebp
/* Disable interrupts */ mov edx, eax
cli jmp @KiServiceExit@8
/* Check for, and deliver, User-Mode APCs if needed */
CHECK_FOR_APC_DELIVER 1
/* Exit and cleanup */
TRAP_EPILOG FromSystemCall, DoRestorePreviousMode, DoNotRestoreSegments, DoNotRestoreVolatiles, DoRestoreEverything
.endfunc .endfunc
KiBBTUnexpectedRange: KiBBTUnexpectedRange:
@ -418,57 +381,13 @@ InvalidIndex:
ret ret
#endif #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 .func Kei386EoiHelper@0
_Kei386EoiHelper@0: _Kei386EoiHelper@0:
/* Call the C EOI Helper */
/* Disable interrupts */ mov ecx, esp
cli jmp @KiEoiHelper@4
/* Check for, and deliver, User-Mode APCs if needed */
CHECK_FOR_APC_DELIVER 0
/* Exit and cleanup */
_Kei386EoiHelper2ndEntry:
TRAP_EPILOG NotFromSystemCall, DoNotRestorePreviousMode, DoRestoreSegments, DoRestoreVolatiles, DoNotRestoreEverything
.endfunc .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:
/* FIXME: TODO */
UNHANDLED_PATH "ABIOS Exit"
GENERATE_TRAP_HANDLER KiGetTickCount, 1 GENERATE_TRAP_HANDLER KiGetTickCount, 1
GENERATE_TRAP_HANDLER KiCallbackReturn, 1 GENERATE_TRAP_HANDLER KiCallbackReturn, 1
GENERATE_TRAP_HANDLER KiRaiseAssertion, 1 GENERATE_TRAP_HANDLER KiRaiseAssertion, 1
@ -549,7 +468,7 @@ _KiUnexpectedInterruptTail:
/* Spurious, ignore it */ /* Spurious, ignore it */
add esp, 8 add esp, 8
jmp _Kei386EoiHelper2ndEntry jmp _Kei386EoiHelper@0
Handled: Handled:
/* Unexpected interrupt, print a message on debug builds */ /* Unexpected interrupt, print a message on debug builds */

3
reactos/ntoskrnl/ke/i386/usercall_asm.S
View file

@ -204,7 +204,8 @@ SetEip:
SET_TF_DEBUG_HEADER SET_TF_DEBUG_HEADER
/* Exit to user-mode */ /* Exit to user-mode */
jmp _KiServiceExit mov ecx, esp
jmp @KiServiceExit@8
SaveDebug: SaveDebug: