Changes in / [bee2d4c:62b20f1] in mainline

Location:

kernel/arch/ia32

Files:

• include/asm.h (modified) (2 diffs)
• include/interrupt.h (modified) (1 diff)
• src/asm.S (modified) (4 diffs)
• src/pm.c (modified) (1 diff)

kernel/arch/ia32/include/asm.h

@@ -425 +425 @@
 
 extern void paging_on(void);
+extern void interrupt_handlers(void);
 extern void enable_l_apic_in_msr(void);
 
@@ -430 +431 @@
 extern void asm_fake_loop(uint32_t);
 
-extern uintptr_t int_0;
-extern uintptr_t int_1;
-extern uintptr_t int_2;
-extern uintptr_t int_3;
-extern uintptr_t int_4;
-extern uintptr_t int_5;
-extern uintptr_t int_6;
-extern uintptr_t int_7;
-extern uintptr_t int_8;
-extern uintptr_t int_9;
-extern uintptr_t int_10;
-extern uintptr_t int_11;
-extern uintptr_t int_12;
-extern uintptr_t int_13;
-extern uintptr_t int_14;
-extern uintptr_t int_15;
-extern uintptr_t int_16;
-extern uintptr_t int_17;
-extern uintptr_t int_18;
-extern uintptr_t int_19;
-extern uintptr_t int_20;
-extern uintptr_t int_21;
-extern uintptr_t int_22;
-extern uintptr_t int_23;
-extern uintptr_t int_24;
-extern uintptr_t int_25;
-extern uintptr_t int_26;
-extern uintptr_t int_27;
-extern uintptr_t int_28;
-extern uintptr_t int_29;
-extern uintptr_t int_30;
-extern uintptr_t int_31;
-extern uintptr_t int_32;
-extern uintptr_t int_33;
-extern uintptr_t int_34;
-extern uintptr_t int_35;
-extern uintptr_t int_36;
-extern uintptr_t int_37;
-extern uintptr_t int_38;
-extern uintptr_t int_39;
-extern uintptr_t int_40;
-extern uintptr_t int_41;
-extern uintptr_t int_42;
-extern uintptr_t int_43;
-extern uintptr_t int_44;
-extern uintptr_t int_45;
-extern uintptr_t int_46;
-extern uintptr_t int_47;
-extern uintptr_t int_48;
-extern uintptr_t int_49;
-extern uintptr_t int_50;
-extern uintptr_t int_51;
-extern uintptr_t int_52;
-extern uintptr_t int_53;
-extern uintptr_t int_54;
-extern uintptr_t int_55;
-extern uintptr_t int_56;
-extern uintptr_t int_57;
-extern uintptr_t int_58;
-extern uintptr_t int_59;
-extern uintptr_t int_60;
-extern uintptr_t int_61;
-extern uintptr_t int_62;
-extern uintptr_t int_63;
-
 #endif
 

kernel/arch/ia32/include/interrupt.h

@@ -75 +75 @@
          * The strange order of the GPRs is given by the requirement to use the
          * istate structure for both regular interrupts and exceptions as well
-         * as for syscall handlers which use this order as an optimization.
+         * as for syscall handler which use this order as an optimization.
          */
         uint32_t edx;

kernel/arch/ia32/src/asm.S

@@ -44 +44 @@
 .global paging_on
 .global enable_l_apic_in_msr
+.global interrupt_handlers
 .global memsetb
 .global memsetw
@@ -271 +272 @@
  * vectors starting at vector i.
  *
- */
-
-.macro handler i
-.global int_\i
-int_\i:
+ * The handlers setup data segment registers
+ * and call exc_dispatch().
+ *
+ */
+#define INTERRUPT_ALIGN  256
+
+.macro handler i n
         .ifeq \i - 0x30
                 /* Syscall handler */
@@ -472 +475 @@
                 
         .endif
+        
+        .align INTERRUPT_ALIGN
+        .if (\n - \i) - 1
+                handler "(\i + 1)", \n
+        .endif
 .endm
 
-#define LIST_0_63 \
-        0, 1, 2, 3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,\
-        28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,\
-        53,54,55,56,57,58,59,60,61,62,63
-
+/* Keep in sync with pm.h! */
+#define IDT_ITEMS  64
+
+.align INTERRUPT_ALIGN
 interrupt_handlers:
-.irp cnt, LIST_0_63 
-        handler \cnt
-.endr
+        h_start:
+                handler 0 IDT_ITEMS
+        h_end:
 
 /** Print Unicode character to EGA display.
@@ -631 +638 @@
         ret
 
+.data
+.global interrupt_handler_size
+
+interrupt_handler_size: .long (h_end - h_start) / IDT_ITEMS

kernel/arch/ia32/src/pm.c

@@ -139 +139 @@
                         d->access |= DPL_USER;
                 }
+                
+                idt_setoffset(d, ((uintptr_t) interrupt_handlers) +
+                    i * interrupt_handler_size);
         }
-
-        d = &idt[0];
-        idt_setoffset(d++, (uintptr_t) &int_0);
-        idt_setoffset(d++, (uintptr_t) &int_1);
-        idt_setoffset(d++, (uintptr_t) &int_2);
-        idt_setoffset(d++, (uintptr_t) &int_3);
-        idt_setoffset(d++, (uintptr_t) &int_4);
-        idt_setoffset(d++, (uintptr_t) &int_5);
-        idt_setoffset(d++, (uintptr_t) &int_6);
-        idt_setoffset(d++, (uintptr_t) &int_7);
-        idt_setoffset(d++, (uintptr_t) &int_8);
-        idt_setoffset(d++, (uintptr_t) &int_9);
-        idt_setoffset(d++, (uintptr_t) &int_10);
-        idt_setoffset(d++, (uintptr_t) &int_11);
-        idt_setoffset(d++, (uintptr_t) &int_12);
-        idt_setoffset(d++, (uintptr_t) &int_13);
-        idt_setoffset(d++, (uintptr_t) &int_14);
-        idt_setoffset(d++, (uintptr_t) &int_15);
-        idt_setoffset(d++, (uintptr_t) &int_16);
-        idt_setoffset(d++, (uintptr_t) &int_17);
-        idt_setoffset(d++, (uintptr_t) &int_18);
-        idt_setoffset(d++, (uintptr_t) &int_19);
-        idt_setoffset(d++, (uintptr_t) &int_20);
-        idt_setoffset(d++, (uintptr_t) &int_21);
-        idt_setoffset(d++, (uintptr_t) &int_22);
-        idt_setoffset(d++, (uintptr_t) &int_23);
-        idt_setoffset(d++, (uintptr_t) &int_24);
-        idt_setoffset(d++, (uintptr_t) &int_25);
-        idt_setoffset(d++, (uintptr_t) &int_26);
-        idt_setoffset(d++, (uintptr_t) &int_27);
-        idt_setoffset(d++, (uintptr_t) &int_28);
-        idt_setoffset(d++, (uintptr_t) &int_29);
-        idt_setoffset(d++, (uintptr_t) &int_30);
-        idt_setoffset(d++, (uintptr_t) &int_31);
-        idt_setoffset(d++, (uintptr_t) &int_32);
-        idt_setoffset(d++, (uintptr_t) &int_33);
-        idt_setoffset(d++, (uintptr_t) &int_34);
-        idt_setoffset(d++, (uintptr_t) &int_35);
-        idt_setoffset(d++, (uintptr_t) &int_36);
-        idt_setoffset(d++, (uintptr_t) &int_37);
-        idt_setoffset(d++, (uintptr_t) &int_38);
-        idt_setoffset(d++, (uintptr_t) &int_39);
-        idt_setoffset(d++, (uintptr_t) &int_40);
-        idt_setoffset(d++, (uintptr_t) &int_41);
-        idt_setoffset(d++, (uintptr_t) &int_42);
-        idt_setoffset(d++, (uintptr_t) &int_43);
-        idt_setoffset(d++, (uintptr_t) &int_44);
-        idt_setoffset(d++, (uintptr_t) &int_45);
-        idt_setoffset(d++, (uintptr_t) &int_46);
-        idt_setoffset(d++, (uintptr_t) &int_47);
-        idt_setoffset(d++, (uintptr_t) &int_48);
-        idt_setoffset(d++, (uintptr_t) &int_49);
-        idt_setoffset(d++, (uintptr_t) &int_50);
-        idt_setoffset(d++, (uintptr_t) &int_51);
-        idt_setoffset(d++, (uintptr_t) &int_52);
-        idt_setoffset(d++, (uintptr_t) &int_53);
-        idt_setoffset(d++, (uintptr_t) &int_54);
-        idt_setoffset(d++, (uintptr_t) &int_55);
-        idt_setoffset(d++, (uintptr_t) &int_56);
-        idt_setoffset(d++, (uintptr_t) &int_57);
-        idt_setoffset(d++, (uintptr_t) &int_58);
-        idt_setoffset(d++, (uintptr_t) &int_59);
-        idt_setoffset(d++, (uintptr_t) &int_60);
-        idt_setoffset(d++, (uintptr_t) &int_61);
-        idt_setoffset(d++, (uintptr_t) &int_62);
-        idt_setoffset(d++, (uintptr_t) &int_63);
-}
+}
+
 
 /* Clean IOPL(12,13) and NT(14) flags in EFLAGS register */