Changeset 2e9eae2 in mainline for test

Timestamp:

2006-06-23T16:03:53Z (20 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

757551a3

Parents:

a832dd7

Message:

Changed interface of frame_alloc/free to use address of frame instead of the pfn.
This makes it impossible to use >4GB of memory on 32-bit machines, but who cares…

Location:

test/mm

Files:

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

test/mm/falloc1/test.c

@@ -56 +56 @@
                         allocated = 0;
                         for (i = 0; i < MAX_FRAMES >> order; i++) {
-                                frames[allocated] = PA2KA(PFN2ADDR(frame_alloc_rc(order, FRAME_ATOMIC | FRAME_KA, &status)));
+                                frames[allocated] = frame_alloc_rc(order, FRAME_ATOMIC | FRAME_KA, &status);
                                 
                                 if (ALIGN_UP(frames[allocated], FRAME_SIZE << order) != frames[allocated]) {
@@ -81 +81 @@
                         printf("Deallocating ... ");
                         for (i = 0; i < allocated; i++) {
-                                frame_free(ADDR2PFN(KA2PA(frames[i])));
+                                frame_free(KA2PA(frames[i]));
                         }
                         printf("done.\n");

test/mm/falloc2/test.c

@@ -66 +66 @@
                         allocated = 0;
                         for (i = 0; i < (MAX_FRAMES >> order); i++) {
-                                frames[allocated] = PA2KA(PFN2ADDR(frame_alloc_rc(order, FRAME_ATOMIC | FRAME_KA, &status)));
+                                frames[allocated] = frame_alloc_rc(order, FRAME_ATOMIC | FRAME_KA, &status);
                                 if (status == 0) {
                                         memsetb(frames[allocated], FRAME_SIZE << order, val);
@@ -84 +84 @@
                                         }
                                 }
-                                frame_free(ADDR2PFN(KA2PA(frames[i])));
+                                frame_free(KA2PA(frames[i]));
                         }
                         printf("Thread #%d (cpu%d): Finished run.\n", THREAD->tid, CPU->id);

test/mm/mapping1/test.c

@@ -48 +48 @@
         printf("Memory management test mapping #1\n");
 
-        frame0 = PA2KA(PFN2ADDR(frame_alloc(ONE_FRAME, FRAME_KA)));
-        frame1 = PA2KA(PFN2ADDR(frame_alloc(ONE_FRAME, FRAME_KA)));
+        frame0 = frame_alloc(ONE_FRAME, FRAME_KA);
+        frame1 = frame_alloc(ONE_FRAME, FRAME_KA);
 
         printf("Writing %#x to physical address %p.\n", VALUE0, KA2PA(frame0));