Changeset 43b1e86 in mainline

Timestamp:

2008-02-01T14:11:18Z (17 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

9652bd59

Parents:

acfdcb0

Message:

prettyprint output

Location:

kernel

Files:

• arch/amd64/src/debugger.c (modified) (1 diff)
• arch/ia32/src/mm/frame.c (modified) (2 diffs)
• generic/include/macros.h (modified) (1 diff)
• generic/src/interrupt/interrupt.c (modified) (2 diffs)
• generic/src/mm/frame.c (modified) (1 diff)
• generic/src/printf/printf_core.c (modified) (1 diff)
• generic/src/proc/task.c (modified) (2 diffs)
• generic/src/proc/thread.c (modified) (3 diffs)

kernel/arch/amd64/src/debugger.c

@@ -105 +105 @@
 int cmd_print_breakpoints(cmd_arg_t *argv __attribute__((unused)))
 {
-        int i;
+        unsigned int i;
         char *symbol;
-
-        printf("Breakpoint table.\n");
-        for (i=0; i < BKPOINTS_MAX; i++)
+        
+        if (sizeof(void *) == 4) {
+                printf("#  Count Address    In symbol\n");
+                printf("-- ----- ---------- ---------\n");
+        } else {
+                printf("#  Count Address            In symbol\n");
+                printf("-- ----- ------------------ ---------\n");
+        }
+        
+        for (i = 0; i < BKPOINTS_MAX; i++)
                 if (breakpoints[i].address) {
                         symbol = get_symtab_entry(breakpoints[i].address);
-                        printf("%d. %lx in %s\n", i,
-                               breakpoints[i].address, symbol);
-                        printf("     Count(%d) ", breakpoints[i].counter);
-                        printf("\n");
+                        
+                        if (sizeof(void *) == 4)
+                                printf("%-2u %-5d %#10zx %s\n", i, breakpoints[i].counter,
+                                        breakpoints[i].address, symbol);
+                        else
+                                printf("%-2u %-5d %#18zx %s\n", i, breakpoints[i].counter,
+                                        breakpoints[i].address, symbol);
                 }
         return 1;

kernel/arch/ia32/src/mm/frame.c

@@ -97 +97 @@
 static int cmd_e820mem(cmd_arg_t *argv)
 {
-        int i;
+        unsigned int i;
         char *name;
-
+        
+        printf("Base               Size               Name\n");
+        printf("------------------ ------------------ ---------\n");
+                
         for (i = 0; i < e820counter; i++) {
                 if (e820table[i].type <= MEMMAP_MEMORY_UNUSABLE)
@@ -105 +108 @@
                 else
                         name = "invalid";
-                printf("%.*p %#.16llXB %s\n", sizeof(unative_t) * 2,
-                    (unative_t) e820table[i].base_address, 
-                    (uint64_t) e820table[i].size, name);
+                
+                printf("%#18llx %#18llx %s\n", e820table[i].base_address,
+                        e820table[i].size, name);
         }                       
         return 0;

kernel/generic/include/macros.h

@@ -63 +63 @@
         return (s1 < e2) && (s2 < e1);
 }
+
 /* Compute overlapping of physical addresses */
 #define PA_overlaps(x, szx, y, szy)     overlaps(KA2PA(x), szx, KA2PA(y), szy)

kernel/generic/src/interrupt/interrupt.c

@@ -104 +104 @@
 static int exc_print_cmd(cmd_arg_t *argv)
 {
-        int i;
+        unsigned int i;
         char *symbol;
 
         spinlock_lock(&exctbl_lock);
-        printf("Exc Description Handler\n");
-        for (i=0; i < IVT_ITEMS; i++) {
-                symbol = get_symtab_entry((unative_t)exc_table[i].f);
+        
+        if (sizeof(void *) == 4) {
+                printf("Exc Description  Handler    Symbol\n");
+                printf("--- ------------ ---------- --------\n");
+        } else {
+                printf("Exc Description  Handler            Symbol\n");
+                printf("--- ------------ ------------------ --------\n");
+        }
+        
+        for (i = 0; i < IVT_ITEMS; i++) {
+                symbol = get_symtab_entry((unative_t) exc_table[i].f);
                 if (!symbol)
                         symbol = "not found";
-                printf("%d %s %.*p(%s)\n", i + IVT_FIRST, exc_table[i].name,
-                       sizeof(uintptr_t) * 2, exc_table[i].f,symbol);           
-                if (!((i+1) % 20)) {
-                        printf("Press any key to continue.");
+                
+                if (sizeof(void *) == 4)
+                        printf("%-3u %-12s %#10zx %s\n", i + IVT_FIRST, exc_table[i].name,
+                                exc_table[i].f, symbol);
+                else
+                        printf("%-3u %-12s %#18zx %s\n", i + IVT_FIRST, exc_table[i].name,
+                                exc_table[i].f, symbol);
+                
+                if (((i + 1) % 20) == 0) {
+                        printf(" -- Press any key to continue -- ");
                         spinlock_unlock(&exctbl_lock);
                         getc(stdin);
@@ -123 +137 @@
                 }
         }
+        
         spinlock_unlock(&exctbl_lock);
         

kernel/generic/src/mm/frame.c

@@ -1121 +1121 @@
         ipl = interrupts_disable();
         spinlock_lock(&zones.lock);
-        printf("#  base address free frames  busy frames\n");
-        printf("-- ------------ ------------ ------------\n");
+        
+        if (sizeof(void *) == 4) {
+                printf("#  base address free frames  busy frames\n");
+                printf("-- ------------ ------------ ------------\n");
+        } else {
+                printf("#  base address         free frames  busy frames\n");
+                printf("-- -------------------- ------------ ------------\n");
+        }
+        
         for (i = 0; i < zones.count; i++) {
                 zone = zones.info[i];
                 spinlock_lock(&zone->lock);
-                printf("%-2d %12p %12zd %12zd\n", i, PFN2ADDR(zone->base),
-                    zone->free_count, zone->busy_count);
+                
+                if (sizeof(void *) == 4)
+                        printf("%-2d   %#10zx %12zd %12zd\n", i, PFN2ADDR(zone->base),
+                            zone->free_count, zone->busy_count);
+                else
+                        printf("%-2d   %#18zx %12zd %12zd\n", i, PFN2ADDR(zone->base),
+                            zone->free_count, zone->busy_count);
+                
                 spinlock_unlock(&zone->lock);
         }
+        
         spinlock_unlock(&zones.lock);
         interrupts_restore(ipl);

kernel/generic/src/printf/printf_core.c

@@ -459 +459 @@
  *      - u     Print unsigned decimal number.
  *
- *      - X, x  Print hexadecimal number with upper- or lower-case. Prefix isi
+ *      - X, x  Print hexadecimal number with upper- or lower-case. Prefix is
  *              not printed by default.
  * 

kernel/generic/src/proc/task.c

@@ -421 +421 @@
         char suffix;
         order(task_get_accounting(t), &cycles, &suffix);
-                        
-        printf("%-6llu %-10s %-3ld %#10zx %#10zx %9llu%c %7zd %6zd",
-            t->taskid, t->name, t->context, t, t->as, cycles, suffix,
-            t->refcount, atomic_get(&t->active_calls));
+        
+        if (sizeof(void *) == 4)
+                printf("%-6llu %-10s %-3ld %#10zx %#10zx %9llu%c %7zd %6zd",
+                t->taskid, t->name, t->context, t, t->as, cycles, suffix,
+                    t->refcount, atomic_get(&t->active_calls));
+        else
+                printf("%-6llu %-10s %-3ld %#18zx %#18zx %9llu%c %7zd %6zd",
+                    t->taskid, t->name, t->context, t, t->as, cycles, suffix,
+                t->refcount, atomic_get(&t->active_calls));
         for (j = 0; j < IPC_MAX_PHONES; j++) {
                 if (t->phones[j].callee)
@@ -444 +449 @@
         spinlock_lock(&tasks_lock);
         
-        printf("taskid name       ctx address    as         cycles     threads "
-            "calls  callee\n");
-        printf("------ ---------- --- ---------- ---------- ---------- ------- "
-            "------ ------>\n");
+        if (sizeof(void *) == 4) {
+                printf("taskid name       ctx address    as         "
+                        "cycles     threads calls  callee\n");
+                printf("------ ---------- --- ---------- ---------- "
+                        "---------- ------- ------ ------>\n");
+        } else {
+                printf("taskid name       ctx address            as                 "
+                        "cycles     threads calls  callee\n");
+                printf("------ ---------- --- ------------------ ------------------ "
+                        "---------- ------- ------ ------>\n");
+        }
 
         avltree_walk(&tasks_tree, task_print_walker, NULL);

kernel/generic/src/proc/thread.c

@@ -587 +587 @@
         char suffix;
         order(t->cycles, &cycles, &suffix);
-                        
-        printf("%-6llu %-10s %#10zx %-8s %#10zx %-3ld %#10zx %#10zx %9llu%c ",
-            t->tid, t->name, t, thread_states[t->state], t->task,
-            t->task->context, t->thread_code, t->kstack, cycles, suffix);
+        
+        if (sizeof(void *) == 4)
+                printf("%-6llu %-10s %#10zx %-8s %#10zx %-3ld %#10zx %#10zx %9llu%c ",
+                    t->tid, t->name, t, thread_states[t->state], t->task,
+                t->task->context, t->thread_code, t->kstack, cycles, suffix);
+        else
+                printf("%-6llu %-10s %#18zx %-8s %#18zx %-3ld %#18zx %#18zx %9llu%c ",
+                    t->tid, t->name, t, thread_states[t->state], t->task,
+                t->task->context, t->thread_code, t->kstack, cycles, suffix);
                         
         if (t->cpu)
@@ -597 +602 @@
                 printf("none");
                         
-        if (t->state == Sleeping)
-                printf(" %#10zx", t->sleep_queue);
+        if (t->state == Sleeping) {
+                if (sizeof(uintptr_t) == 4)
+                        printf(" %#10zx", t->sleep_queue);
+                else
+                        printf(" %#18zx", t->sleep_queue);
+        }
                         
         printf("\n");
@@ -614 +623 @@
         spinlock_lock(&threads_lock);
         
-        printf("tid    name       address    state    task       ctx code    "
-            "   stack      cycles     cpu  waitqueue\n");
-        printf("------ ---------- ---------- -------- ---------- --- --------"
-            "-- ---------- ---------- ---- ---------\n");
+        if (sizeof(uintptr_t) == 4) {
+                printf("tid    name       address    state    task       "
+                        "ctx code       stack      cycles     cpu  "
+                        "waitqueue\n");
+                printf("------ ---------- ---------- -------- ---------- "
+                        "--- ---------- ---------- ---------- ---- "
+                        "----------\n");
+        } else {
+                printf("tid    name       address            state    task               "
+                        "ctx code               stack              cycles     cpu  "
+                        "waitqueue\n");
+                printf("------ ---------- ------------------ -------- ------------------ "
+                        "--- ------------------ ------------------ ---------- ---- "
+                        "------------------\n");
+        }
 
         avltree_walk(&threads_tree, thread_walker, NULL);