Changeset b2fa1204 in mainline for kernel/arch/mips32/src

Timestamp:

2014-01-05T21:12:26Z (12 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

ca05e9b

Parents:

bd6ff94

Message:

Cherrypick usage of kernel logger

Location:

kernel/arch/mips32/src

Files:

• debugger.c (modified) (2 diffs)
• exception.c (modified) (3 diffs)
• mm/tlb.c (modified) (2 diffs)

kernel/arch/mips32/src/debugger.c

@@ -39 +39 @@
 #include <console/cmd.h>
 #include <print.h>
+#include <log.h>
 #include <panic.h>
 #include <arch.h>
@@ -294 +295 @@
         cmd_initialize(&bkpts_info);
         if (!cmd_register(&bkpts_info))
-                printf("Cannot register command %s\n", bkpts_info.name);
+                log(LF_OTHER, LVL_WARN, "Cannot register command %s",
+                    bkpts_info.name);
         
         cmd_initialize(&delbkpt_info);
         if (!cmd_register(&delbkpt_info))
-                printf("Cannot register command %s\n", delbkpt_info.name);
+                log(LF_OTHER, LVL_WARN, "Cannot register command %s",
+                    delbkpt_info.name);
         
         cmd_initialize(&addbkpt_info);
         if (!cmd_register(&addbkpt_info))
-                printf("Cannot register command %s\n", addbkpt_info.name);
+                log(LF_OTHER, LVL_WARN, "Cannot register command %s",
+                    addbkpt_info.name);
         
         cmd_initialize(&addbkpte_info);
         if (!cmd_register(&addbkpte_info))
-                printf("Cannot register command %s\n", addbkpte_info.name);
+                log(LF_OTHER, LVL_WARN, "Cannot register command %s",
+                    addbkpte_info.name);
 #endif /* CONFIG_KCONSOLE */
 }

kernel/arch/mips32/src/exception.c

@@ -48 +48 @@
 #include <arch/debugger.h>
 #include <symtab.h>
+#include <log.h>
 
 static const char *exctable[] = {
@@ -74 +75 @@
 void istate_decode(istate_t *istate)
 {
-        printf("epc=%#010" PRIx32 "\tsta=%#010" PRIx32 "\t"
+        log_printf("epc=%#010" PRIx32 "\tsta=%#010" PRIx32 "\t"
             "lo =%#010" PRIx32 "\thi =%#010" PRIx32 "\n",
             istate->epc, istate->status, istate->lo, istate->hi);
         
-        printf("a0 =%#010" PRIx32 "\ta1 =%#010" PRIx32 "\t"
+        log_printf("a0 =%#010" PRIx32 "\ta1 =%#010" PRIx32 "\t"
             "a2 =%#010" PRIx32 "\ta3 =%#010" PRIx32 "\n",
             istate->a0, istate->a1, istate->a2, istate->a3);
         
-        printf("t0 =%#010" PRIx32 "\tt1 =%#010" PRIx32 "\t"
+        log_printf("t0 =%#010" PRIx32 "\tt1 =%#010" PRIx32 "\t"
             "t2 =%#010" PRIx32 "\tt3 =%#010" PRIx32 "\n",
             istate->t0, istate->t1, istate->t2, istate->t3);
         
-        printf("t4 =%#010" PRIx32 "\tt5 =%#010" PRIx32 "\t"
+        log_printf("t4 =%#010" PRIx32 "\tt5 =%#010" PRIx32 "\t"
             "t6 =%#010" PRIx32 "\tt7 =%#010" PRIx32 "\n",
             istate->t4, istate->t5, istate->t6, istate->t7);
         
-        printf("t8 =%#010" PRIx32 "\tt9 =%#010" PRIx32 "\t"
+        log_printf("t8 =%#010" PRIx32 "\tt9 =%#010" PRIx32 "\t"
             "v0 =%#010" PRIx32 "\tv1 =%#010" PRIx32 "\n",
             istate->t8, istate->t9, istate->v0, istate->v1);
         
-        printf("s0 =%#010" PRIx32 "\ts1 =%#010" PRIx32 "\t"
+        log_printf("s0 =%#010" PRIx32 "\ts1 =%#010" PRIx32 "\t"
             "s2 =%#010" PRIx32 "\ts3 =%#010" PRIx32 "\n",
             istate->s0, istate->s1, istate->s2, istate->s3);
         
-        printf("s4 =%#010" PRIx32 "\ts5 =%#010" PRIx32 "\t"
+        log_printf("s4 =%#010" PRIx32 "\ts5 =%#010" PRIx32 "\t"
             "s6 =%#010" PRIx32 "\ts7 =%#010" PRIx32 "\n",
             istate->s4, istate->s5, istate->s6, istate->s7);
         
-        printf("s8 =%#010" PRIx32 "\tat =%#010" PRIx32 "\t"
+        log_printf("s8 =%#010" PRIx32 "\tat =%#010" PRIx32 "\t"
             "kt0=%#010" PRIx32 "\tkt1=%#010" PRIx32 "\n",
             istate->s8, istate->at, istate->kt0, istate->kt1);
         
-        printf("sp =%#010" PRIx32 "\tra =%#010" PRIx32 "\t"
+        log_printf("sp =%#010" PRIx32 "\tra =%#010" PRIx32 "\t"
             "gp =%#010" PRIx32 "\n",
             istate->sp, istate->ra, istate->gp);
@@ -194 +195 @@
                                  */
 #ifdef CONFIG_DEBUG
-                                printf("cpu%u: spurious interrupt (inum=%u)\n",
+                                log(LF_ARCH, LVL_DEBUG,
+                                    "cpu%u: spurious interrupt (inum=%u)",
                                     CPU->id, i);
 #endif

kernel/arch/mips32/src/mm/tlb.c

@@ -43 +43 @@
 #include <synch/mutex.h>
 #include <print.h>
+#include <log.h>
 #include <debug.h>
 #include <align.h>
@@ -217 +218 @@
          */
         if (index.p) {
-                printf("%s: TLBP failed in exception handler (badvaddr=%#"
+                log(LF_ARCH, LVL_WARN, "%s: TLBP failed in exception handler (badvaddr=%#"
                     PRIxn ", ASID=%d).\n", __func__, badvaddr,
                     AS ? AS->asid : -1);