Index: kernel/arch/amd64/include/arch/interrupt.h
===================================================================
--- kernel/arch/amd64/include/arch/interrupt.h	(revision 650cd225f985cd496777b353cb40a0d0a52641f8)
+++ kernel/arch/amd64/include/arch/interrupt.h	(revision 4b0206c7b08dfc91e29744cd62ce245f29ac2b62)
@@ -50,4 +50,10 @@
 #define IVT_FREEBASE  (IVT_IRQBASE + IRQ_COUNT)
 
+#define EXC_DE 0
+#define EXC_NM 7
+#define EXC_SS 12
+#define EXC_GP 13
+#define EXC_PF 14
+
 #define IRQ_CLK       0
 #define IRQ_KBD       1
@@ -65,5 +71,9 @@
 #endif
 
-#define VECTOR_DEBUG              1
+#define VECTOR_DE                 (IVT_EXCBASE + EXC_DE)
+#define VECTOR_NM                 (IVT_EXCBASE + EXC_NM)
+#define VECTOR_SS                 (IVT_EXCBASE + EXC_SS)
+#define VECTOR_GP                 (IVT_EXCBASE + EXC_GP)
+#define VECTOR_PF                 (IVT_EXCBASE + EXC_PF)
 #define VECTOR_CLK                (IVT_IRQBASE + IRQ_CLK)
 #define VECTOR_PIC_SPUR           (IVT_IRQBASE + IRQ_PIC_SPUR)
Index: kernel/arch/amd64/src/interrupt.c
===================================================================
--- kernel/arch/amd64/src/interrupt.c	(revision 650cd225f985cd496777b353cb40a0d0a52641f8)
+++ kernel/arch/amd64/src/interrupt.c	(revision 4b0206c7b08dfc91e29744cd62ce245f29ac2b62)
@@ -222,8 +222,8 @@
 	}
 	
-	exc_register(0, "de_fault", true, (iroutine_t) de_fault);
-	exc_register(7, "nm_fault", true, (iroutine_t) nm_fault);
-	exc_register(12, "ss_fault", true, (iroutine_t) ss_fault);
-	exc_register(13, "gp_fault", true, (iroutine_t) gp_fault);
+	exc_register(VECTOR_DE, "de_fault", true, (iroutine_t) de_fault);
+	exc_register(VECTOR_NM, "nm_fault", true, (iroutine_t) nm_fault);
+	exc_register(VECTOR_SS, "ss_fault", true, (iroutine_t) ss_fault);
+	exc_register(VECTOR_GP, "gp_fault", true, (iroutine_t) gp_fault);
 	
 #ifdef CONFIG_SMP
Index: kernel/arch/amd64/src/mm/page.c
===================================================================
--- kernel/arch/amd64/src/mm/page.c	(revision 650cd225f985cd496777b353cb40a0d0a52641f8)
+++ kernel/arch/amd64/src/mm/page.c	(revision 4b0206c7b08dfc91e29744cd62ce245f29ac2b62)
@@ -72,5 +72,5 @@
 	page_table_unlock(AS_KERNEL, true);
 		
-	exc_register(14, "page_fault", true, (iroutine_t) page_fault);
+	exc_register(VECTOR_PF, "page_fault", true, (iroutine_t) page_fault);
 	write_cr3((uintptr_t) AS_KERNEL->genarch.page_table);
 }
Index: kernel/arch/ia32/include/arch/interrupt.h
===================================================================
--- kernel/arch/ia32/include/arch/interrupt.h	(revision 650cd225f985cd496777b353cb40a0d0a52641f8)
+++ kernel/arch/ia32/include/arch/interrupt.h	(revision 4b0206c7b08dfc91e29744cd62ce245f29ac2b62)
@@ -50,4 +50,11 @@
 #define IVT_FREEBASE  (IVT_IRQBASE + IRQ_COUNT)
 
+#define EXC_DE 0
+#define EXC_NM 7
+#define EXC_SS 12
+#define EXC_GP 13
+#define EXC_PF 14
+#define EXC_XM 19
+
 #define IRQ_CLK       0
 #define IRQ_KBD       1
@@ -65,5 +72,10 @@
 #endif
 
-#define VECTOR_DEBUG              1
+#define VECTOR_DE                 (IVT_EXCBASE + EXC_DE)
+#define VECTOR_NM                 (IVT_EXCBASE + EXC_NM)
+#define VECTOR_SS                 (IVT_EXCBASE + EXC_SS)
+#define VECTOR_GP                 (IVT_EXCBASE + EXC_GP)
+#define VECTOR_PF                 (IVT_EXCBASE + EXC_PF)
+#define VECTOR_XM                 (IVT_EXCBASE + EXC_XM)
 #define VECTOR_CLK                (IVT_IRQBASE + IRQ_CLK)
 #define VECTOR_PIC_SPUR           (IVT_IRQBASE + IRQ_PIC_SPUR)
Index: kernel/arch/ia32/src/interrupt.c
===================================================================
--- kernel/arch/ia32/src/interrupt.c	(revision 650cd225f985cd496777b353cb40a0d0a52641f8)
+++ kernel/arch/ia32/src/interrupt.c	(revision 4b0206c7b08dfc91e29744cd62ce245f29ac2b62)
@@ -229,9 +229,9 @@
 	}
 	
-	exc_register(0, "de_fault", true, (iroutine_t) de_fault);
-	exc_register(7, "nm_fault", true, (iroutine_t) nm_fault);
-	exc_register(12, "ss_fault", true, (iroutine_t) ss_fault);
-	exc_register(13, "gp_fault", true, (iroutine_t) gp_fault);
-	exc_register(19, "simd_fp", true, (iroutine_t) simd_fp_exception);
+	exc_register(VECTOR_DE, "de_fault", true, (iroutine_t) de_fault);
+	exc_register(VECTOR_NM, "nm_fault", true, (iroutine_t) nm_fault);
+	exc_register(VECTOR_SS, "ss_fault", true, (iroutine_t) ss_fault);
+	exc_register(VECTOR_GP, "gp_fault", true, (iroutine_t) gp_fault);
+	exc_register(VECTOR_XM, "simd_fp", true, (iroutine_t) simd_fp_exception);
 	
 #ifdef CONFIG_SMP
Index: kernel/arch/ia32/src/mm/page.c
===================================================================
--- kernel/arch/ia32/src/mm/page.c	(revision 650cd225f985cd496777b353cb40a0d0a52641f8)
+++ kernel/arch/ia32/src/mm/page.c	(revision 4b0206c7b08dfc91e29744cd62ce245f29ac2b62)
@@ -76,5 +76,5 @@
 	page_table_unlock(AS_KERNEL, true);
 		
-	exc_register(14, "page_fault", true, (iroutine_t) page_fault);
+	exc_register(VECTOR_PF, "page_fault", true, (iroutine_t) page_fault);
 	write_cr3((uintptr_t) AS_KERNEL->genarch.page_table);