Changeset fcfac420 in mainline for arch/ia32/src/interrupt.c

Timestamp:

2005-12-10T01:02:31Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

6095342

Parents:

973be64e

Message:

Changed ia32 & amd64 to use exc_register instead of trap_register.

Fixed dependency list building. I hope you all have 'makedepend' installed,
if you don't it's time to install it, as CC -M builds the dependency
list without directory names..and it just does not work.

File:

• arch/ia32/src/interrupt.c (modified) (9 diffs)

arch/ia32/src/interrupt.c

@@ -44 +44 @@
  */
 
-static iroutine ivt[IVT_ITEMS];
-
 void (* disable_irqs_function)(__u16 irqmask) = NULL;
 void (* enable_irqs_function)(__u16 irqmask) = NULL;
 void (* eoi_function)(void) = NULL;
 
-#define PRINT_INFO_ERRCODE(x) { \
-        char *symbol = get_symtab_entry(stack[1]); \
+#define PRINT_INFO_ERRCODE(st) { \
+        __native *x = (__native *) st; \
+        char *symbol = get_symtab_entry(x[1]); \
         if (!symbol) \
                 symbol = ""; \
@@ -66 +65 @@
         }
 
-iroutine trap_register(__u8 n, iroutine f)
+void null_interrupt(int n, void *st)
 {
-        ASSERT(n < IVT_ITEMS);
-        
-        iroutine old;
-        
-        old = ivt[n];
-        ivt[n] = f;
-        
-        return old;
-}
+        __native *stack = (__native *) st;
 
-/*
- * Called directly from the assembler code.
- * CPU is interrupts_disable()'d.
- */
-void trap_dispatcher(__u8 n, __native stack[])
-{
-        ASSERT(n < IVT_ITEMS);
-        
-        ivt[n](n, stack);
-}
-
-void null_interrupt(__u8 n, __native stack[])
-{
         printf("int %d: null_interrupt\n", n);
         printf("stack: %L, %L, %L, %L\n", stack[0], stack[1], stack[2], stack[3]);
@@ -96 +74 @@
 }
 
-void gp_fault(__u8 n, __native stack[])
+void gp_fault(int n, void *stack)
 {
         PRINT_INFO_ERRCODE(stack);
@@ -102 +80 @@
 }
 
-void ss_fault(__u8 n, __native stack[])
+void ss_fault(int n, void *stack)
 {
         PRINT_INFO_ERRCODE(stack);
@@ -109 +87 @@
 
 
-void nm_fault(__u8 n, __native stack[])
+void nm_fault(int n, void *stack)
 {
 #ifdef CONFIG_FPU_LAZY     
@@ -120 +98 @@
 
 
-void page_fault(__u8 n, __native stack[])
+void page_fault(int n, void *stack)
 {
         PRINT_INFO_ERRCODE(stack);
@@ -127 +105 @@
 }
 
-void syscall(__u8 n, __native stack[])
+void syscall(int n, void *stack)
 {
         printf("cpu%d: syscall\n", CPU->id);
@@ -133 +111 @@
 }
 
-void tlb_shootdown_ipi(__u8 n, __native stack[])
+void tlb_shootdown_ipi(int n, void *stack)
 {
         trap_virtual_eoi();
@@ -139 +117 @@
 }
 
-void wakeup_ipi(__u8 n, __native stack[])
+void wakeup_ipi(int n, void *stack)
 {
         trap_virtual_eoi();