Changeset eb522e8 in mainline for kernel/test/mm/mapping1.c

Timestamp:

2011-06-01T08:43:42Z (14 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

8d6c1f1

Parents:

9e2e715 (diff), e51a514 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Huuuuuge merge from development - all the work actually

File:

• kernel/test/mm/mapping1.c (modified) (4 diffs)

kernel/test/mm/mapping1.c

@@ -39 +39 @@
 #define PAGE1  (PAGE0 + PAGE_SIZE)
 
-#define VALUE0  0x01234567
-#define VALUE1  0x89abcdef
+#define VALUE0  UINT32_C(0x01234567)
+#define VALUE1  UINT32_C(0x89abcdef)
 
 const char *test_mapping1(void)
@@ -50 +50 @@
         frame1 = (uintptr_t) frame_alloc(ONE_FRAME, FRAME_KA);
         
-        TPRINTF("Writing %#x to physical address %p.\n", VALUE0, KA2PA(frame0));
+        TPRINTF("Writing %#" PRIx32 " to physical address %p.\n",
+            (uint32_t) VALUE0, (void *) KA2PA(frame0));
         *((uint32_t *) frame0) = VALUE0;
         
-        TPRINTF("Writing %#x to physical address %p.\n", VALUE1, KA2PA(frame1));
+        TPRINTF("Writing %#" PRIx32 " to physical address %p.\n",
+            (uint32_t) VALUE1, (void *) KA2PA(frame1));
         *((uint32_t *) frame1) = VALUE1;
         
-        TPRINTF("Mapping virtual address %p to physical address %p.\n", PAGE0, KA2PA(frame0));
+        TPRINTF("Mapping virtual address %p to physical address %p.\n",
+            (void *) PAGE0, (void *) KA2PA(frame0));
         page_mapping_insert(AS_KERNEL, PAGE0, KA2PA(frame0), PAGE_PRESENT | PAGE_WRITE);
         
-        TPRINTF("Mapping virtual address %p to physical address %p.\n", PAGE1, KA2PA(frame1));
+        TPRINTF("Mapping virtual address %p to physical address %p.\n",
+            (void *) PAGE1, (void *) KA2PA(frame1));
         page_mapping_insert(AS_KERNEL, PAGE1, KA2PA(frame1), PAGE_PRESENT | PAGE_WRITE);
         
         v0 = *((uint32_t *) PAGE0);
         v1 = *((uint32_t *) PAGE1);
-        TPRINTF("Value at virtual address %p is %#x.\n", PAGE0, v0);
-        TPRINTF("Value at virtual address %p is %#x.\n", PAGE1, v1);
+        TPRINTF("Value at virtual address %p is %#" PRIx32 ".\n",
+            (void *) PAGE0, v0);
+        TPRINTF("Value at virtual address %p is %#" PRIx32 ".\n",
+            (void *) PAGE1, v1);
         
         if (v0 != VALUE0)
@@ -72 +78 @@
                 return "Value at v1 not equal to VALUE1";
         
-        TPRINTF("Writing %#x to virtual address %p.\n", 0, PAGE0);
+        TPRINTF("Writing %#" PRIx32 " to virtual address %p.\n",
+            (uint32_t) 0, (void *) PAGE0);
         *((uint32_t *) PAGE0) = 0;
         
-        TPRINTF("Writing %#x to virtual address %p.\n", 0, PAGE1);
+        TPRINTF("Writing %#" PRIx32 " to virtual address %p.\n",
+            (uint32_t) 0, (void *) PAGE1);
         *((uint32_t *) PAGE1) = 0;
         
@@ -81 +89 @@
         v1 = *((uint32_t *) PAGE1);
         
-        TPRINTF("Value at virtual address %p is %#x.\n", PAGE0, *((uint32_t *) PAGE0)); 
-        TPRINTF("Value at virtual address %p is %#x.\n", PAGE1, *((uint32_t *) PAGE1));
+        TPRINTF("Value at virtual address %p is %#" PRIx32 ".\n",
+            (void *) PAGE0, *((uint32_t *) PAGE0));
+        TPRINTF("Value at virtual address %p is %#" PRIx32 ".\n",
+            (void *) PAGE1, *((uint32_t *) PAGE1));
         
         if (v0 != 0)