Changes in kernel/generic/src/debug/panic.c [7e752b2:d5a1c73] in mainline

File:

• kernel/generic/src/debug/panic.c (modified) (3 diffs)

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("\n%s Kernel panic ", BANNER_LEFT);
+
+        printf("\nKERNEL PANIC ");
         if (CPU)
-                printf("on cpu%u ", CPU->id);
-        printf("due to ");
-        
+                printf("ON cpu%d ", CPU->id);
+        printf("DUE TO ");
+
         va_start(args, fmt);
         if (cat == PANIC_ASSERT) {
-                printf("a failed assertion: %s\n", BANNER_RIGHT);
+                printf("A FAILED ASSERTION:\n");
                 vprintf(fmt, args);
                 printf("\n");
         } else if (cat == PANIC_BADTRAP) {
-                printf("bad trap %" PRIun ". %s\n", address,
-                    BANNER_RIGHT);
+                printf("BAD TRAP %ld.\n", address);
                 if (fmt) {
                         vprintf(fmt, args);
@@ -70 +66 @@
                 }
         } 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. %s\n", (void *) address,
-                    BANNER_RIGHT);
+                        printf("REFERENCING");
+                printf(" ADDRESS %p.\n", address); 
                 if (fmt) {
                         vprintf(fmt, args);
@@ -86 +81 @@
                 }
         } else {
-                printf("the following reason: %s\n",
-                    BANNER_RIGHT);
+                printf("THE FOLLOWING REASON:\n");
                 vprintf(fmt, args);
                 printf("\n");
         }
         va_end(args);
-        
+
         printf("\n");
-        
+
         if (istate) {
                 istate_decode(istate);
                 printf("\n");
         }
-        
+
         stack_trace();
         halt();