xnu-3789.60.24.tar.gz

[apple/xnu.git] / osfmk / x86_64 / idt_table.h

diff --git a/osfmk/x86_64/idt_table.h b/osfmk/x86_64/idt_table.h
index f2f26ce132d28d743070d19015f63137fddf0f41..10d5902789640788823a1dfdce31ea0b6de9a1b8 100644 (file)
--- a/osfmk/x86_64/idt_table.h
+++ b/osfmk/x86_64/idt_table.h
@@ -28,31 +28,23 @@
 
 TRAP(0x00,idt64_zero_div)
 TRAP_SPC(0x01,idt64_debug)
-INTERRUPT(0x02)                        /* NMI */
+TRAP_IST2(0x02,idt64_nmi)
 USER_TRAP(0x03,idt64_int3)
 USER_TRAP(0x04,idt64_into)
 USER_TRAP(0x05,idt64_bounds)
 TRAP(0x06,idt64_invop)
 TRAP(0x07,idt64_nofpu)
-#if    MACH_KDB
-TRAP_IST(0x08,idt64_db_task_dbl_fault)
-#else
-TRAP_IST(0x08,idt64_double_fault)
-#endif
+TRAP_IST1(0x08,idt64_double_fault)
 TRAP(0x09,idt64_fpu_over)
-TRAP(0x0a,idt64_inv_tss)
-TRAP_SPC(0x0b,idt64_segnp)
-#if    MACH_KDB
-TRAP_IST(0x0c,idt64_db_task_stk_fault)
-#else
-TRAP_SPC(0x0c,idt64_stack_fault)
-#endif
-TRAP_SPC(0x0d,idt64_gen_prot)
+TRAP_ERR(0x0a,idt64_inv_tss)
+TRAP_IST1(0x0b,idt64_segnp)
+TRAP_IST1(0x0c,idt64_stack_fault)
+TRAP_IST1(0x0d,idt64_gen_prot)
 TRAP_SPC(0x0e,idt64_page_fault)
 TRAP(0x0f,idt64_trap_0f)
 TRAP(0x10,idt64_fpu_err)
-TRAP(0x11,idt64_trap_11)
-TRAP_IST(0x12,idt64_mc)
+TRAP_ERR(0x11,idt64_alignment_check)
+TRAP_IST1(0x12,idt64_mc)
 TRAP(0x13,idt64_sse_err)
 TRAP(0x14,idt64_trap_14)
 TRAP(0x15,idt64_trap_15)
@@ -172,8 +164,8 @@ USER_TRAP(0x7f, idt64_dtrace_ret) /* Required by dtrace "fasttrap" */
 USER_TRAP_SPC(0x80,idt64_unix_scall)
 USER_TRAP_SPC(0x81,idt64_mach_scall)
 USER_TRAP_SPC(0x82,idt64_mdep_scall)
-USER_TRAP_SPC(0x83,idt64_diag_scall)
 
+INTERRUPT(0x83)
 INTERRUPT(0x84)
 INTERRUPT(0x85)
 INTERRUPT(0x86)
@@ -255,6 +247,7 @@ INTERRUPT(0xcd)
 INTERRUPT(0xce)
 INTERRUPT(0xcf)
 
+/* Local APIC interrupt vectors */
 INTERRUPT(0xd0)
 INTERRUPT(0xd1)
 INTERRUPT(0xd2)