Changeset bee2d4c in mainline for kernel/arch/ia32/src/asm.S

Timestamp:

2010-07-08T21:09:53Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

144185b, 5f83634, bd48f4c

Parents:

62b20f1 (diff), b808660 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge from lp:~jakub/helenos/upa

File:

• kernel/arch/ia32/src/asm.S (modified) (4 diffs)

kernel/arch/ia32/src/asm.S

@@ -44 +44 @@
 .global paging_on
 .global enable_l_apic_in_msr
-.global interrupt_handlers
 .global memsetb
 .global memsetw
@@ -272 +271 @@
  * vectors starting at vector i.
  *
- * The handlers setup data segment registers
- * and call exc_dispatch().
- *
- */
-#define INTERRUPT_ALIGN  256
-
-.macro handler i n
+ */
+
+.macro handler i
+.global int_\i
+int_\i:
         .ifeq \i - 0x30
                 /* Syscall handler */
@@ -475 +472 @@
                 
         .endif
-        
-        .align INTERRUPT_ALIGN
-        .if (\n - \i) - 1
-                handler "(\i + 1)", \n
-        .endif
 .endm
 
-/* Keep in sync with pm.h! */
-#define IDT_ITEMS  64
-
-.align INTERRUPT_ALIGN
+#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
+
 interrupt_handlers:
-        h_start:
-                handler 0 IDT_ITEMS
-        h_end:
+.irp cnt, LIST_0_63 
+        handler \cnt
+.endr
 
 /** Print Unicode character to EGA display.
@@ -638 +631 @@
         ret
 
-.data
-.global interrupt_handler_size
-
-interrupt_handler_size: .long (h_end - h_start) / IDT_ITEMS