Changeset fcfac420 in mainline for arch/amd64/src

Timestamp:

2005-12-10T01:02:31Z (20 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.

Location:

arch/amd64/src

Files:

• amd64.c (modified) (2 diffs)
• asm_utils.S (modified) (2 diffs)
• interrupt.c (modified) (9 diffs)
• mm/page.c (modified) (2 diffs)
• pm.c (modified) (2 diffs)

arch/amd64/src/amd64.c

@@ -45 +45 @@
 #include <genarch/acpi/acpi.h>
 #include <panic.h>
+#include <interrupt.h>
 
 void arch_pre_mm_init(void)
@@ -73 +74 @@
                 i8254_init();   /* hard clock */
 
-                trap_register(VECTOR_SYSCALL, syscall);
+                exc_register(VECTOR_SYSCALL, "syscall", syscall);
                 
                 #ifdef CONFIG_SMP
-                trap_register(VECTOR_TLB_SHOOTDOWN_IPI, tlb_shootdown_ipi);
-                trap_register(VECTOR_WAKEUP_IPI, wakeup_ipi);
+                exc_register(VECTOR_TLB_SHOOTDOWN_IPI, "tlb_shootdown",
+                             tlb_shootdown_ipi);
+                exc_register(VECTOR_WAKEUP_IPI, "wakeup_ipi", wakeup_ipi);
                 #endif /* CONFIG_SMP */
         }

arch/amd64/src/asm_utils.S

@@ -160 +160 @@
 #
 # The handlers setup data segment registers
-# and call trap_dispatcher().
+# and call exc_dispatch().
 #
 .macro handler i n
@@ -171 +171 @@
         movq %rbp, %rsi
         addq $8, %rsi     # %rsi - second parameter - original stack
-        call trap_dispatcher    # trap_dispatcher(i, stack)
+        call exc_dispatch       # exc_dispatch(i, stack)
 
 # Test if this is interrupt with error word or not

arch/amd64/src/interrupt.c

@@ -58 +58 @@
 }
 
-static void print_info_errcode(__u8 n, __native x[])
+static void print_info_errcode(int n, void *st)
 {
         char *symbol;
+        __native *x = (__native *) st;
 
         if (!(symbol=get_symtab_entry(x[1])))
@@ -89 +90 @@
  */
 
-static iroutine ivt[IVT_ITEMS];
-
 void (* disable_irqs_function)(__u16 irqmask) = NULL;
 void (* enable_irqs_function)(__u16 irqmask) = NULL;
 void (* eoi_function)(void) = NULL;
 
-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("-----EXCEPTION(%d) OCCURED----- ( %s )\n",n,__FUNCTION__); \
         printf("stack: %L, %L, %L, %L\n", stack[0], stack[1], stack[2], stack[3]);
@@ -125 +103 @@
 }
 
-void gp_fault(__u8 n, __native stack[])
+void gp_fault(int n, void *stack)
 {
         print_info_errcode(n,stack);
@@ -131 +109 @@
 }
 
-void ss_fault(__u8 n, __native stack[])
+void ss_fault(int n, void *stack)
 {
         print_info_errcode(n,stack);
@@ -138 +116 @@
 
 
-void nm_fault(__u8 n, __native stack[])
+void nm_fault(int n, void *stack)
 {
 #ifdef CONFIG_FPU_LAZY     
@@ -149 +127 @@
 
 
-void page_fault(__u8 n, __native stack[])
+void page_fault(int n, void *stack)
 {
         print_info_errcode(n,stack);
@@ -156 +134 @@
 }
 
-void syscall(__u8 n, __native stack[])
+void syscall(int n, void *stack)
 {
         printf("cpu%d: syscall\n", CPU->id);
@@ -162 +140 @@
 }
 
-void tlb_shootdown_ipi(__u8 n, __native stack[])
+void tlb_shootdown_ipi(int n, void *stack)
 {
         trap_virtual_eoi();
@@ -168 +146 @@
 }
 
-void wakeup_ipi(__u8 n, __native stack[])
+void wakeup_ipi(int n, void *stack)
 {
         trap_virtual_eoi();

arch/amd64/src/mm/page.c

@@ -35 +35 @@
 #include <config.h>
 #include <memstr.h>
+#include <interrupt.h>
 
 static __address bootstrap_dba; 
@@ -56 +57 @@
                 }
 
-                trap_register(14, page_fault);
+                exc_register(14, "page_fault", page_fault);
                 write_cr3(KA2PA(dba));
         }

arch/amd64/src/pm.c

@@ -32 +32 @@
 #include <arch/interrupt.h>
 #include <arch/asm.h>
+#include <interrupt.h>
 
 #include <config.h>
@@ -175 +176 @@
                 
                 idt_setoffset(d, ((__address) interrupt_handlers) + i*interrupt_handler_size);
-                trap_register(i, null_interrupt);
+                exc_register(i, "undef", null_interrupt);
         }
-        trap_register(13, gp_fault);
-        trap_register( 7, nm_fault);
-        trap_register(12, ss_fault);    
+        exc_register(13, "gp_fault", gp_fault);
+        exc_register( 7, "nm_fault", nm_fault);
+        exc_register(12, "ss_fault", ss_fault);
 }