- Revert 49927 "Update to trunk" as it breaks KsStudio (again)

[reactos.git] / ntoskrnl / ke / i386 / trap.s

diff --git a/ntoskrnl/ke/i386/trap.s b/ntoskrnl/ke/i386/trap.s
index f3c99c4..adfcd32 100644 (file)
--- a/ntoskrnl/ke/i386/trap.s
+++ b/ntoskrnl/ke/i386/trap.s
@@ -9,8 +9,8 @@
 
 /* INCLUDES ******************************************************************/
 
-#include <asm.inc>
-#include <ks386.inc>
+#include <reactos/asm.h>
+#include <ndk/i386/asm.h>
 #include <internal/i386/asmmacro.S>
 
 MACRO(GENERATE_IDT_STUB, Number)
@@ -18,19 +18,16 @@ idt _KiUnexpectedInterrupt&Number, INT_32_DPL0
 ENDM
 
 MACRO(GENERATE_INT_HANDLER, Number)
-//.func KiUnexpectedInterrupt&Number
+.func KiUnexpectedInterrupt&Number
 _KiUnexpectedInterrupt&Number:
     push PRIMARY_VECTOR_BASE + Number
     jmp _KiEndUnexpectedRange@0
-//.endfunc
+.endfunc
 ENDM
 
-EXTERN _KiTrap02:PROC
-
 /* GLOBALS *******************************************************************/
 
 .data
-ASSUME nothing
 
 PUBLIC _KiIdt
 _KiIdt:
@@ -55,9 +52,9 @@ idt _KiTrap10,         INT_32_DPL0  /* INT 10: x87 FPU Error (#MF)          */
 idt _KiTrap11,         INT_32_DPL0  /* INT 11: Align Check Exception (#AC)  */
 idt _KiTrap0F,         INT_32_DPL0  /* INT 12: Machine Check Exception (#MC)*/
 idt _KiTrap0F,         INT_32_DPL0  /* INT 13: SIMD FPU Exception (#XF)     */
-REPEAT 22
+.rept 22
 idt _KiTrap0F,         INT_32_DPL0  /* INT 14-29: UNDEFINED INTERRUPTS      */
-ENDR
+.endr
 idt _KiGetTickCount,   INT_32_DPL3  /* INT 2A: Get Tick Count Handler       */
 idt _KiCallbackReturn, INT_32_DPL3  /* INT 2B: User-Mode Callback Return    */
 idt _KiRaiseAssertion, INT_32_DPL3  /* INT 2C: Debug Assertion Handler      */
@@ -65,15 +62,15 @@ idt _KiDebugService,   INT_32_DPL3  /* INT 2D: Debug Service Handler        */
 idt _KiSystemService,  INT_32_DPL3  /* INT 2E: System Call Service Handler  */
 idt _KiTrap0F,         INT_32_DPL0  /* INT 2F: RESERVED                     */
 i = 0
-REPEAT 208
+.rept 208
     GENERATE_IDT_STUB %i
     i = i + 1
-ENDR
+.endr
 
 PUBLIC _KiIdtDescriptor
 _KiIdtDescriptor:
     .short 0
-    .short HEX(7FF)
+    .short 0x7FF
     .long _KiIdt
 
 PUBLIC _KiUnexpectedEntrySize
@@ -81,7 +78,8 @@ _KiUnexpectedEntrySize:
     .long _KiUnexpectedInterrupt1 - _KiUnexpectedInterrupt0
 
 /******************************************************************************/
-.code
+.code32
+.text
 
 TRAP_ENTRY KiTrap00, KI_PUSH_FAKE_ERROR_CODE
 TRAP_ENTRY KiTrap01, KI_PUSH_FAKE_ERROR_CODE
@@ -108,7 +106,7 @@ TRAP_ENTRY KiDebugService, KI_PUSH_FAKE_ERROR_CODE
 TRAP_ENTRY KiUnexpectedInterruptTail, 0
 
 ALIGN 4
-EXTERN @KiInterruptTemplateHandler@8:PROC
+EXTERN @KiInterruptTemplateHandler@8
 PUBLIC _KiInterruptTemplate
 _KiInterruptTemplate:
     KiEnterTrap KI_PUSH_FAKE_ERROR_CODE
@@ -137,10 +135,10 @@ _KiFastCallEntry:
 PUBLIC _KiStartUnexpectedRange@0
 _KiStartUnexpectedRange@0:
 i = 0
-REPEAT 208
+.rept 208
     GENERATE_INT_HANDLER %i
     i = i + 1
-ENDR
+.endr
 PUBLIC _KiEndUnexpectedRange@0
 _KiEndUnexpectedRange@0:
     jmp _KiUnexpectedInterruptTail