Changeset cf85e24c in mainline for generic

Timestamp:

2006-04-22T23:00:26Z (19 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

12c7f27

Parents:

e692a27

Message:

printf-related and other code cleanup

Location:

generic

Files:

• include/debug.h (modified) (1 diff)
• src/adt/btree.c (modified) (5 diffs)
• src/main/main.c (modified) (2 diffs)
• src/mm/frame.c (modified) (1 diff)
• src/mm/page.c (modified) (1 diff)
• src/proc/scheduler.c (modified) (1 diff)

generic/include/debug.h

@@ -50 +50 @@
  */
 #ifdef CONFIG_DEBUG
-#       define ASSERT(expr) if (!(expr)) { panic("assertion failed (%s), caller=%P\n", #expr, CALLER); }
+#       define ASSERT(expr) if (!(expr)) { panic("assertion failed (%s), caller=%p\n", #expr, CALLER); }
 #else
 #       define ASSERT(expr)

generic/src/adt/btree.c

@@ -118 +118 @@
         if (!lnode) {
                 if (btree_search(t, key, &lnode)) {
-                        panic("B-tree %P already contains key %d\n", t, key);
+                        panic("B-tree %p already contains key %d\n", t, key);
                 }
         }
@@ -201 +201 @@
         if (!lnode) {
                 if (!btree_search(t, key, &lnode)) {
-                        panic("B-tree %P does not contain key %d\n", t, key);
+                        panic("B-tree %p does not contain key %d\n", t, key);
                 }
         }
@@ -501 +501 @@
                 }
         }
-        panic("node %P does not contain key %d\n", node, key);
+        panic("node %p does not contain key %d\n", node, key);
 }
 
@@ -528 +528 @@
                 }
         }
-        panic("node %P does not contain key %d\n", node, key);
+        panic("node %p does not contain key %d\n", node, key);
 }
 
@@ -670 +670 @@
                         return i - (int) (right != false);
         }
-        panic("node %P does not contain subtree %P\n", node, subtree);
+        panic("node %p does not contain subtree %p\n", node, subtree);
 }
 

generic/src/main/main.c

@@ -177 +177 @@
 
         version_print();
-        printf("%#zX: hardcoded_ktext_size=%zdK, hardcoded_kdata_size=%zdK\n",
-                config.base, hardcoded_ktext_size/1024, hardcoded_kdata_size/1024);
+        printf("%#zx: hardcoded_ktext_size=%zdK, hardcoded_kdata_size=%zdK\n", config.base, hardcoded_ktext_size / 1024, hardcoded_kdata_size / 1024);
 
         arch_pre_smp_init();
@@ -197 +196 @@
         
         for (i = 0; i < init.cnt; i++)
-                printf("init[%zd].addr=%P, init[%zd].size=%zd\n", i, init.tasks[i].addr, i, init.tasks[i].size);
+                printf("init[%zd].addr=%p, init[%zd].size=%zd\n", i, init.tasks[i].addr, i, init.tasks[i].size);
         
         ipc_init();

generic/src/mm/frame.c

@@ -1029 +1029 @@
                 zone = zones.info[i];
                 spinlock_lock(&zone->lock);
-                printf("%d: %#X \t%zd\t\t%zd\n",i,PFN2ADDR(zone->base), 
-                       zone->free_count, zone->busy_count);
+                printf("%d: %#x \t%zd\t\t%zd\n", i, PFN2ADDR(zone->base), zone->free_count, zone->busy_count);
                 spinlock_unlock(&zone->lock);
         }

generic/src/mm/page.c

@@ -64 +64 @@
         int i, cnt, length;
 
-        length = size + (s - (s & ~(PAGE_SIZE-1)));
-        cnt = length/PAGE_SIZE + (length%PAGE_SIZE>0);
+        length = size + (s - (s & ~(PAGE_SIZE - 1)));
+        cnt = length / PAGE_SIZE + (length % PAGE_SIZE > 0);
 
         for (i = 0; i < cnt; i++)
-                page_mapping_insert(AS_KERNEL, s + i*PAGE_SIZE, s + i*PAGE_SIZE, PAGE_NOT_CACHEABLE);
+                page_mapping_insert(AS_KERNEL, s + i * PAGE_SIZE, s + i * PAGE_SIZE, PAGE_NOT_CACHEABLE);
 
 }

generic/src/proc/scheduler.c

@@ -634 +634 @@
 
                 spinlock_lock(&cpus[cpu].lock);
-                printf("cpu%d: address=%P, nrdy=%ld, needs_relink=%ld\n",
+                printf("cpu%d: address=%p, nrdy=%ld, needs_relink=%ld\n",
                        cpus[cpu].id, &cpus[cpu], atomic_get(&cpus[cpu].nrdy), cpus[cpu].needs_relink);