[ros-diffs] [sir_richard] 45150: [NTOS]: Try backing out a change to see if thix fixes BuildBot.

Author: sir_richard
Date: Tue Jan 19 16:26:16 2010
New Revision: 45150

URL: http://svn.reactos.org/svn/reactos?rev=45150&view=rev
Log:
[NTOS]: Try backing out a change to see if thix fixes BuildBot.

Modified:
    trunk/reactos/ntoskrnl/ke/i386/trap.s

Modified: trunk/reactos/ntoskrnl/ke/i386/trap.s
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/trap.s?re…
==============================================================================
--- trunk/reactos/ntoskrnl/ke/i386/trap.s [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/ke/i386/trap.s [iso-8859-1] Tue Jan 19 16:26:16 2010
@@ -156,10 +156,41 @@
 
 .func Kei386EoiHelper@0
 _Kei386EoiHelper@0:
-    /* Call the C EOI Helper */
-    mov ecx, esp
-    jmp @KiEoiHelper@4
-.endfunc
+
+    /* Disable interrupts */
+    cli
+
+    /* 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
+
+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
 
 GENERATE_TRAP_HANDLER KiGetTickCount, 1
 GENERATE_TRAP_HANDLER KiCallbackReturn, 1