Changeset d43d2f7 in mainline for generic/src/mm

Timestamp:

2005-12-06T19:42:04Z (20 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

090e7ea1

Parents:

795ff98

Message:

Cleanup and fixes.

Location:

generic/src/mm

Files:

• page.c (modified) (3 diffs)
• vm.c (modified) (2 diffs)

generic/src/mm/page.c

@@ -80 +80 @@
 
         if (GET_PTL1_FLAGS(ptl0, PTL0_INDEX(page)) & PAGE_NOT_PRESENT) {
-                newpt = frame_alloc(FRAME_KA, 0);
+                newpt = frame_alloc(FRAME_KA, ONE_FRAME);
                 memsetb(newpt, PAGE_SIZE, 0);
                 SET_PTL1_ADDRESS(ptl0, PTL0_INDEX(page), KA2PA(newpt));
-                SET_PTL1_FLAGS(ptl0, PTL0_INDEX(page), PAGE_PRESENT | PAGE_USER | PAGE_EXEC);
+                SET_PTL1_FLAGS(ptl0, PTL0_INDEX(page), PAGE_PRESENT | PAGE_USER | PAGE_EXEC | PAGE_CACHEABLE);
         }
 
@@ -89 +89 @@
 
         if (GET_PTL2_FLAGS(ptl1, PTL1_INDEX(page)) & PAGE_NOT_PRESENT) {
-                newpt = frame_alloc(FRAME_KA, 0);
+                newpt = frame_alloc(FRAME_KA, ONE_FRAME);
                 memsetb(newpt, PAGE_SIZE, 0);
                 SET_PTL2_ADDRESS(ptl1, PTL1_INDEX(page), KA2PA(newpt));
-                SET_PTL2_FLAGS(ptl1, PTL1_INDEX(page), PAGE_PRESENT | PAGE_USER | PAGE_EXEC);
+                SET_PTL2_FLAGS(ptl1, PTL1_INDEX(page), PAGE_PRESENT | PAGE_USER | PAGE_EXEC | PAGE_CACHEABLE);
         }
 
@@ -98 +98 @@
 
         if (GET_PTL3_FLAGS(ptl2, PTL2_INDEX(page)) & PAGE_NOT_PRESENT) {
-                newpt = frame_alloc(FRAME_KA, 0);
+                newpt = frame_alloc(FRAME_KA, ONE_FRAME);
                 memsetb(newpt, PAGE_SIZE, 0);
                 SET_PTL3_ADDRESS(ptl2, PTL2_INDEX(page), KA2PA(newpt));
-                SET_PTL3_FLAGS(ptl2, PTL2_INDEX(page), PAGE_PRESENT | PAGE_USER | PAGE_EXEC);
+                SET_PTL3_FLAGS(ptl2, PTL2_INDEX(page), PAGE_PRESENT | PAGE_USER | PAGE_EXEC | PAGE_CACHEABLE);
         }
 

generic/src/mm/vm.c

@@ -70 +70 @@
                 
                         src_ptl0 = (pte_t *) PA2KA((__address) GET_PTL0_ADDRESS());
-                        dst_ptl0 = (pte_t *) frame_alloc(FRAME_KA | FRAME_PANIC, 0);
+                        dst_ptl0 = (pte_t *) frame_alloc(FRAME_KA | FRAME_PANIC, ONE_FRAME);
 
 //                      memsetb((__address) dst_ptl0, PAGE_SIZE, 0);
@@ -116 +116 @@
                 
                 for (i=0; i<size; i++)
-                        a->mapping[i] = frame_alloc(0,0);
+                        a->mapping[i] = frame_alloc(0, ONE_FRAME);
                 
                 spinlock_initialize(&a->lock);