Changeset 43b1e86 in mainline for kernel/arch

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/arch

Files:

• amd64/src/debugger.c (modified) (1 diff)
• ia32/src/mm/frame.c (modified) (2 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;