Changeset c70d693 in mainline

Timestamp:

2008-06-03T14:44:48Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

0f269c2

Parents:

9fe962d6

Message:

proper printf formatting

File:

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

kernel/generic/src/interrupt/interrupt.c

@@ -109 +109 @@
 
         spinlock_lock(&exctbl_lock);
-        
-        if (sizeof(void *) == 4) {
-                printf("Exc Description          Handler    Symbol\n");
-                printf("--- -------------------- ---------- --------\n");
-        } else {
-                printf("Exc Description          Handler            Symbol\n");
-                printf("--- -------------------- ------------------ --------\n");
-        }
+
+#ifdef __32_BITS__
+        printf("Exc Description          Handler    Symbol\n");
+        printf("--- -------------------- ---------- --------\n");
+#endif
+
+#ifdef __64_BITS__
+        printf("Exc Description          Handler            Symbol\n");
+        printf("--- -------------------- ------------------ --------\n");
+#endif
         
         for (i = 0; i < IVT_ITEMS; i++) {
@@ -122 +124 @@
                 if (!symbol)
                         symbol = "not found";
-                
-                if (sizeof(void *) == 4)
-                        printf("%-3u %-20s %#10zx %s\n", i + IVT_FIRST, exc_table[i].name,
-                                exc_table[i].f, symbol);
-                else
-                        printf("%-3u %-20s %#18zx %s\n", i + IVT_FIRST, exc_table[i].name,
-                                exc_table[i].f, symbol);
+
+#ifdef __32_BITS__
+                printf("%-3u %-20s %10p %s\n", i + IVT_FIRST, exc_table[i].name,
+                        exc_table[i].f, symbol);
+#endif
+
+#ifdef __64_BITS__
+                printf("%-3u %-20s %18p %s\n", i + IVT_FIRST, exc_table[i].name,
+                        exc_table[i].f, symbol);
+#endif
                 
                 if (((i + 1) % 20) == 0) {
@@ -159 +164 @@
         int i;
 
-        for (i=0;i < IVT_ITEMS; i++)
+        for (i = 0; i < IVT_ITEMS; i++)
                 exc_register(i, "undef", (iroutine) exc_undef);