Changeset 4b0206c in mainline

Timestamp:

2016-05-04T22:35:03Z (9 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

0f17bff

Parents:

650cd22

Message:

Use macros instead of magic numbers

Location:

kernel/arch

Files:

• amd64/include/arch/interrupt.h (modified) (2 diffs)
• amd64/src/interrupt.c (modified) (1 diff)
• amd64/src/mm/page.c (modified) (1 diff)
• ia32/include/arch/interrupt.h (modified) (2 diffs)
• ia32/src/interrupt.c (modified) (1 diff)
• ia32/src/mm/page.c (modified) (1 diff)

kernel/arch/amd64/include/arch/interrupt.h

@@ -50 +50 @@
 #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 +71 @@
 #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)

kernel/arch/amd64/src/interrupt.c

@@ -222 +222 @@
         }
         
-        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

kernel/arch/amd64/src/mm/page.c

@@ -72 +72 @@
         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);
 }

kernel/arch/ia32/include/arch/interrupt.h

@@ -50 +50 @@
 #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 +72 @@
 #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)

kernel/arch/ia32/src/interrupt.c

@@ -229 +229 @@
         }
         
-        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

kernel/arch/ia32/src/mm/page.c

@@ -76 +76 @@
         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);