Changes in kernel/arch/amd64/src/interrupt.c [4b0206c:9d58539] in mainline

File:

• kernel/arch/amd64/src/interrupt.c (modified) (8 diffs)

kernel/arch/amd64/src/interrupt.c

@@ -35 +35 @@
 #include <arch/interrupt.h>
 #include <print.h>
-#include <log.h>
 #include <debug.h>
 #include <panic.h>
@@ -45 +44 @@
 #include <mm/as.h>
 #include <arch.h>
+#include <arch/asm.h>
 #include <proc/scheduler.h>
 #include <proc/thread.h>
@@ -54 +54 @@
 #include <symtab.h>
 #include <stacktrace.h>
-#include <smp/smp_call.h>
 
 /*
@@ -67 +66 @@
 void istate_decode(istate_t *istate)
 {
-        log_printf("cs =%0#18" PRIx64 "\trip=%0#18" PRIx64 "\t"
+        printf("cs =%0#18" PRIx64 "\trip=%0#18" PRIx64 "\t"
             "rfl=%0#18" PRIx64 "\terr=%0#18" PRIx64 "\n",
             istate->cs, istate->rip, istate->rflags, istate->error_word);
         
         if (istate_from_uspace(istate))
-                log_printf("ss =%0#18" PRIx64 "\n", istate->ss);
-        
-        log_printf("rax=%0#18" PRIx64 "\trbx=%0#18" PRIx64 "\t"
+                printf("ss =%0#18" PRIx64 "\n", istate->ss);
+        
+        printf("rax=%0#18" PRIx64 "\trbx=%0#18" PRIx64 "\t"
             "rcx=%0#18" PRIx64 "\trdx=%0#18" PRIx64 "\n",
             istate->rax, istate->rbx, istate->rcx, istate->rdx);
         
-        log_printf("rsi=%0#18" PRIx64 "\trdi=%0#18" PRIx64 "\t"
+        printf("rsi=%0#18" PRIx64 "\trdi=%0#18" PRIx64 "\t"
             "rbp=%0#18" PRIx64 "\trsp=%0#18" PRIx64 "\n",
             istate->rsi, istate->rdi, istate->rbp,
@@ -84 +83 @@
             (uintptr_t) &istate->rsp);
         
-        log_printf("r8 =%0#18" PRIx64 "\tr9 =%0#18" PRIx64 "\t"
+        printf("r8 =%0#18" PRIx64 "\tr9 =%0#18" PRIx64 "\t"
             "r10=%0#18" PRIx64 "\tr11=%0#18" PRIx64 "\n",
             istate->r8, istate->r9, istate->r10, istate->r11);
         
-        log_printf("r12=%0#18" PRIx64 "\tr13=%0#18" PRIx64 "\t"
+        printf("r12=%0#18" PRIx64 "\tr13=%0#18" PRIx64 "\t"
             "r14=%0#18" PRIx64 "\tr15=%0#18" PRIx64 "\n",
             istate->r12, istate->r13, istate->r14, istate->r15);
@@ -162 +161 @@
         tlb_shootdown_ipi_recv();
 }
-
-static void arch_smp_call_ipi_recv(unsigned int n, istate_t *istate)
-{
-        trap_virtual_eoi();
-        smp_call_ipi_recv();
-}
 #endif
 
@@ -200 +193 @@
                  */
 #ifdef CONFIG_DEBUG
-                log(LF_ARCH, LVL_DEBUG, "cpu%u: spurious interrupt (inum=%u)",
-                    CPU->id, inum);
+                printf("cpu%u: spurious interrupt (inum=%u)\n", CPU->id, inum);
 #endif
         }
@@ -222 +214 @@
         }
         
-        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(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);
         
 #ifdef CONFIG_SMP
         exc_register(VECTOR_TLB_SHOOTDOWN_IPI, "tlb_shootdown", true,
             (iroutine_t) tlb_shootdown_ipi);
-        exc_register(VECTOR_SMP_CALL_IPI, "smp_call", true, 
-                (iroutine_t) arch_smp_call_ipi_recv);
 #endif
 }