Changeset 5828554 in mainline for kernel/arch/amd64/src/interrupt.c

Timestamp:

2014-01-19T14:37:22Z (10 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

cf982ff

Parents:

2f591127 (diff), 476f62c (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 mainline changes

File:

• kernel/arch/amd64/src/interrupt.c (modified) (4 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>
@@ -66 +67 @@
 void istate_decode(istate_t *istate)
 {
-        printf("cs =%0#18" PRIx64 "\trip=%0#18" PRIx64 "\t"
+        log_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))
-                printf("ss =%0#18" PRIx64 "\n", istate->ss);
-        
-        printf("rax=%0#18" PRIx64 "\trbx=%0#18" PRIx64 "\t"
+                log_printf("ss =%0#18" PRIx64 "\n", istate->ss);
+        
+        log_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);
         
-        printf("rsi=%0#18" PRIx64 "\trdi=%0#18" PRIx64 "\t"
+        log_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,
@@ -83 +84 @@
             (uintptr_t) &istate->rsp);
         
-        printf("r8 =%0#18" PRIx64 "\tr9 =%0#18" PRIx64 "\t"
+        log_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);
         
-        printf("r12=%0#18" PRIx64 "\tr13=%0#18" PRIx64 "\t"
+        log_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);
@@ -193 +194 @@
                  */
 #ifdef CONFIG_DEBUG
-                printf("cpu%u: spurious interrupt (inum=%u)\n", CPU->id, inum);
+                log(LF_ARCH, LVL_DEBUG, "cpu%u: spurious interrupt (inum=%u)",
+                    CPU->id, inum);
 #endif
         }