Changeset cf85e24c in mainline for test

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:

test

Files:

• mm/falloc1/test.c (modified) (2 diffs)
• mm/falloc2/test.c (modified) (1 diff)
• mm/mapping1/test.c (modified) (2 diffs)
• synch/rwlock4/test.c (modified) (1 diff)

test/mm/falloc1/test.c

@@ -41 +41 @@
 
 void test(void) {
-        __address * frames = (__address *) malloc(MAX_FRAMES*sizeof(__address),
-                                                  0);
+        __address * frames = (__address *) malloc(MAX_FRAMES*sizeof(__address), 0);
         int results[MAX_ORDER+1];
         
@@ -60 +59 @@
                                 
                                 if (ALIGN_UP(frames[allocated], FRAME_SIZE << order) != frames[allocated]) {
-                                        panic("Test failed. Block at address %P (size %dK) is not aligned\n", frames[allocated], (FRAME_SIZE << order) >> 10);
+                                        panic("Test failed. Block at address %p (size %dK) is not aligned\n", frames[allocated], (FRAME_SIZE << order) >> 10);
                                 }
                                 

test/mm/falloc2/test.c

@@ -78 +78 @@
                                 for (k = 0; k <= ((FRAME_SIZE << order) - 1); k++) {
                                         if (((__u8 *) frames[i])[k] != val) {
-                                                printf("Thread #%d (cpu%d): Unexpected data (%d) in block %P offset %#zX\n", THREAD->tid, CPU->id, ((char *) frames[i])[k], frames[i], k);
+                                                printf("Thread #%d (cpu%d): Unexpected data (%d) in block %p offset %#zx\n", THREAD->tid, CPU->id, ((char *) frames[i])[k], frames[i], k);
                                                 failed();
                                         }

test/mm/mapping1/test.c

@@ -51 +51 @@
         frame1 = PA2KA(PFN2ADDR(frame_alloc(ONE_FRAME, FRAME_KA)));
 
-        printf("Writing %#X to physical address %P.\n", VALUE0, KA2PA(frame0));
+        printf("Writing %#x to physical address %p.\n", VALUE0, KA2PA(frame0));
         *((__u32 *) frame0) = VALUE0;
-        printf("Writing %#X to physical address %P.\n", VALUE1, KA2PA(frame1));
+        printf("Writing %#x to physical address %p.\n", VALUE1, KA2PA(frame1));
         *((__u32 *) frame1) = VALUE1;
         
-        printf("Mapping virtual address %P to physical address %P.\n", PAGE0, KA2PA(frame0));
+        printf("Mapping virtual address %p to physical address %p.\n", PAGE0, KA2PA(frame0));
         page_mapping_insert(AS_KERNEL, PAGE0, KA2PA(frame0), PAGE_PRESENT | PAGE_WRITE);
-        printf("Mapping virtual address %P to physical address %P.\n", PAGE1, KA2PA(frame1));   
+        printf("Mapping virtual address %p to physical address %p.\n", PAGE1, KA2PA(frame1));   
         page_mapping_insert(AS_KERNEL, PAGE1, KA2PA(frame1), PAGE_PRESENT | PAGE_WRITE);
         
-        printf("Value at virtual address %P is %#X.\n", PAGE0, v0 = *((__u32 *) PAGE0));
-        printf("Value at virtual address %P is %#X.\n", PAGE1, v1 = *((__u32 *) PAGE1));
+        printf("Value at virtual address %p is %#x.\n", PAGE0, v0 = *((__u32 *) PAGE0));
+        printf("Value at virtual address %p is %#x.\n", PAGE1, v1 = *((__u32 *) PAGE1));
         
         ASSERT(v0 == VALUE0);
         ASSERT(v1 == VALUE1);
 
-        printf("Writing %#X to virtual address %P.\n", 0, PAGE0);
+        printf("Writing %#x to virtual address %p.\n", 0, PAGE0);
         *((__u32 *) PAGE0) = 0;
-        printf("Writing %#X to virtual address %P.\n", 0, PAGE1);
+        printf("Writing %#x to virtual address %p.\n", 0, PAGE1);
         *((__u32 *) PAGE1) = 0; 
 
@@ -75 +75 @@
         v1 = *((__u32 *) PAGE1);
         
-        printf("Value at virtual address %P is %#X.\n", PAGE0, *((__u32 *) PAGE0));     
-        printf("Value at virtual address %P is %#X.\n", PAGE1, *((__u32 *) PAGE1));
+        printf("Value at virtual address %p is %#x.\n", PAGE0, *((__u32 *) PAGE0));     
+        printf("Value at virtual address %p is %#x.\n", PAGE1, *((__u32 *) PAGE1));
 
         ASSERT(v0 == 0);

test/synch/rwlock4/test.c

@@ -133 +133 @@
                 
                 context_save(&ctx);
-                printf("sp=%#X, readers_in=%d\n", ctx.sp, rwlock.readers_in);
+                printf("sp=%#x, readers_in=%d\n", ctx.sp, rwlock.readers_in);
                 
                 k = random(7) + 1;