Changeset 8cbf1c3 in mainline for kernel/test

Timestamp:

2013-09-09T23:13:10Z (12 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

e2a0d76

Parents:

c67dbd6

Message:

prepare the public API of the frame allocator for the new backend
remove FRAME_KA (can be easily implemented explicitly)

Location:

kernel/test/mm

Files:

• falloc1.c (modified) (1 diff)
• falloc2.c (modified) (3 diffs)
• mapping1.c (modified) (1 diff)

kernel/test/mm/falloc1.c

@@ -58 +58 @@
                         unsigned int allocated = 0;
                         for (unsigned int i = 0; i < (MAX_FRAMES >> order); i++) {
-                                frames[allocated] = (uintptr_t)
-                                    frame_alloc(order, FRAME_ATOMIC | FRAME_KA);
+                                frames[allocated] =
+                                    PA2KA(frame_alloc(order, FRAME_ATOMIC, 0));
                                 
                                 if (ALIGN_UP(frames[allocated], FRAME_SIZE << order) !=

kernel/test/mm/falloc2.c

@@ -53 +53 @@
         uint8_t val = THREAD->tid % THREADS;
         
-        void **frames = (void **)
-            malloc(MAX_FRAMES * sizeof(void *), FRAME_ATOMIC);
+        uintptr_t *frames = (uintptr_t *)
+            malloc(MAX_FRAMES * sizeof(uintptr_t), FRAME_ATOMIC);
         if (frames == NULL) {
                 TPRINTF("Thread #%" PRIu64 " (cpu%u): "
@@ -74 +74 @@
                         for (unsigned int i = 0; i < (MAX_FRAMES >> order); i++) {
                                 frames[allocated] =
-                                    frame_alloc(order, FRAME_ATOMIC | FRAME_KA);
+                                    PA2KA(frame_alloc(order, FRAME_ATOMIC, 0));
                                 if (frames[allocated]) {
-                                        memsetb(frames[allocated], FRAME_SIZE << order, val);
+                                        memsetb((void *) frames[allocated], FRAME_SIZE << order, val);
                                         allocated++;
                                 } else
@@ -93 +93 @@
                                         if (((uint8_t *) frames[i])[k] != val) {
                                                 TPRINTF("Thread #%" PRIu64 " (cpu%u): "
-                                                    "Unexpected data (%c) in block %p offset %zu\n",
+                                                    "Unexpected data (%c) in block %zu offset %zu\n",
                                                     THREAD->tid, CPU->id, ((char *) frames[i])[k],
                                                     frames[i], k);

kernel/test/mm/mapping1.c

@@ -42 +42 @@
 {
         uintptr_t page0, page1;
-        uintptr_t frame;
         uint32_t v;
         int i;
         
-        frame = (uintptr_t) frame_alloc(ONE_FRAME, FRAME_NONE);
-
+        uintptr_t frame = frame_alloc(ONE_FRAME, FRAME_NONE, 0);
+        
         page0 = km_map(frame, FRAME_SIZE,
             PAGE_READ | PAGE_WRITE | PAGE_CACHEABLE);