Changeset 7e752b2 in mainline for kernel/generic/src/debug

Timestamp:

2010-11-26T01:33:20Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

bf61d3a

Parents:

202f57b

Message:

• correct printf() formatting strings and corresponding arguments
• minor cstyle changes and other small fixes

Location:

kernel/generic/src/debug

Files:

• debug.c (modified) (2 diffs)
• panic.c (modified) (3 diffs)
• stacktrace.c (modified) (2 diffs)
• symtab.c (modified) (1 diff)

kernel/generic/src/debug/debug.c

@@ -52 +52 @@
         if (symtab_name_lookup((uintptr_t) call_site, &call_site_sym,
             &call_site_off) == EOK)
-                printf("%s+%" PRIp "->%s\n", call_site_sym, call_site_off,
-                    fn_sym);
+                printf("%s()+%p->%s()\n", call_site_sym,
+                    (void *) call_site_off, fn_sym);
         else
-                printf("->%s\n", fn_sym);
+                printf("->%s()\n", fn_sym);
 }
 
@@ -67 +67 @@
         if (symtab_name_lookup((uintptr_t) call_site, &call_site_sym,
             &call_site_off) == EOK)
-                printf("%s+%" PRIp "<-%s\n", call_site_sym, call_site_off,
-                    fn_sym);
+                printf("%s()+%p<-%s()\n", call_site_sym,
+                    (void *) call_site_off, fn_sym);
         else
-                printf("<-%s\n", fn_sym);
+                printf("<-%s()\n", fn_sym);
 }
 

kernel/generic/src/debug/panic.c

@@ -42 +42 @@
 #include <interrupt.h>
 
+#define BANNER_LEFT   "######>"
+#define BANNER_RIGHT  "<######"
+
 void panic_common(panic_category_t cat, istate_t *istate, int access,
     uintptr_t address, const char *fmt, ...)
 {
         va_list args;
-
+        
         silent = false;
-
-        printf("\nKERNEL PANIC ");
+        
+        printf("\n%s Kernel panic ", BANNER_LEFT);
         if (CPU)
-                printf("ON cpu%d ", CPU->id);
-        printf("DUE TO ");
-
+                printf("on cpu%u ", CPU->id);
+        printf("due to ");
+        
         va_start(args, fmt);
         if (cat == PANIC_ASSERT) {
-                printf("A FAILED ASSERTION:\n");
+                printf("a failed assertion: %s\n", BANNER_RIGHT);
                 vprintf(fmt, args);
                 printf("\n");
         } else if (cat == PANIC_BADTRAP) {
-                printf("BAD TRAP %ld.\n", address);
+                printf("bad trap %" PRIun ". %s\n", address,
+                    BANNER_RIGHT);
                 if (fmt) {
                         vprintf(fmt, args);
@@ -66 +70 @@
                 }
         } else if (cat == PANIC_MEMTRAP) {
-                printf("A BAD MEMORY ACCESS WHILE ");
+                printf("a bad memory access while ");
                 if (access == PF_ACCESS_READ)
-                        printf("LOADING FROM");
+                        printf("loading from");
                 else if (access == PF_ACCESS_WRITE)
-                        printf("STORING TO");
+                        printf("storing to");
                 else if (access == PF_ACCESS_EXEC)
-                        printf("BRANCHING TO");
+                        printf("branching to");
                 else
-                        printf("REFERENCING");
-                printf(" ADDRESS %p.\n", address); 
+                        printf("referencing");
+                printf(" address %p. %s\n", (void *) address,
+                    BANNER_RIGHT);
                 if (fmt) {
                         vprintf(fmt, args);
@@ -81 +86 @@
                 }
         } else {
-                printf("THE FOLLOWING REASON:\n");
+                printf("the following reason: %s\n",
+                    BANNER_RIGHT);
                 vprintf(fmt, args);
                 printf("\n");
         }
         va_end(args);
-
+        
         printf("\n");
-
+        
         if (istate) {
                 istate_decode(istate);
                 printf("\n");
         }
-
+        
         stack_trace();
         halt();

kernel/generic/src/debug/stacktrace.c

@@ -41 +41 @@
 #define STACK_FRAMES_MAX        20
 
-void
-stack_trace_ctx(stack_trace_ops_t *ops, stack_trace_context_t *ctx)
+void stack_trace_ctx(stack_trace_ops_t *ops, stack_trace_context_t *ctx)
 {
         int cnt = 0;
@@ -54 +53 @@
                 if (ops->symbol_resolve &&
                     ops->symbol_resolve(ctx->pc, &symbol, &offset)) {
-                        if (offset)
-                                printf("%p: %s+%" PRIp "()\n",
-                                    ctx->fp, symbol, offset);
+                        if (offset)
+                                printf("%p: %s()+%p\n", (void *) ctx->fp,
+                                    symbol, (void *) offset);
                         else
-                                printf("%p: %s()\n",
-                                    ctx->fp, symbol);
-                } else {
-                        printf("%p: %p()\n", ctx->fp, ctx->pc);
-                }
+                                printf("%p: %s()\n", (void *) ctx->fp, symbol);
+                } else
+                        printf("%p: %p()\n", (void *) ctx->fp, (void *) ctx->pc);
+                
                 if (!ops->return_address_get(ctx, &pc))
                         break;
+                
                 if (!ops->frame_pointer_prev(ctx, &fp))
                         break;
+                
                 ctx->fp = fp;
                 ctx->pc = pc;

kernel/generic/src/debug/symtab.c

@@ -192 +192 @@
                 uintptr_t addr = uint64_t_le2host(symbol_table[pos].address_le);
                 char *realname = symbol_table[pos].symbol_name;
-                printf("%p: %s\n", addr, realname);
+                printf("%p: %s\n", (void *) addr, realname);
                 pos++;
         }