Changeset 2e9eae2 in mainline for genarch/src

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:

genarch/src

Files:

• fb/fb.c (modified) (1 diff)
• mm/as_pt.c (modified) (2 diffs)
• mm/page_pt.c (modified) (6 diffs)

genarch/src/fb/fb.c

@@ -395 +395 @@
                 order = fnzb(pages-1)+1;
 
-        pfn_t frame = frame_alloc_rc(order,FRAME_ATOMIC,&rc);
-        if (!rc)
-                dbbuffer = (void *)PA2KA(PFN2ADDR(frame));
-        else 
+        dbbuffer = frame_alloc_rc(order,FRAME_ATOMIC | FRAME_KA, &rc);
+        if (!dbbuffer)
                 printf("Failed to allocate scroll buffer.\n");
         dboffset = 0;

genarch/src/mm/as_pt.c

@@ -74 +74 @@
         ipl_t ipl;
 
-        dst_ptl0 = (pte_t *) PA2KA(PFN2ADDR(frame_alloc(ONE_FRAME, FRAME_KA | FRAME_PANIC)));
+        dst_ptl0 = (pte_t *) frame_alloc(ONE_FRAME, FRAME_KA | FRAME_PANIC);
 
         if (flags & FLAG_AS_KERNEL) {
@@ -109 +109 @@
 void ptl0_destroy(pte_t *page_table)
 {
-        frame_free(ADDR2PFN((__address) page_table));
+        frame_free((__address)page_table);
 }
 

genarch/src/mm/page_pt.c

@@ -72 +72 @@
 {
         pte_t *ptl0, *ptl1, *ptl2, *ptl3;
-        __address newpt;
+        pte_t *newpt;
 
         ptl0 = (pte_t *) PA2KA((__address) as->page_table);
 
         if (GET_PTL1_FLAGS(ptl0, PTL0_INDEX(page)) & PAGE_NOT_PRESENT) {
-                newpt = PA2KA(PFN2ADDR(frame_alloc(ONE_FRAME, FRAME_KA)));
-                memsetb(newpt, PAGE_SIZE, 0);
+                newpt = (pte_t *)frame_alloc(ONE_FRAME, FRAME_KA);
+                memsetb((__address)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 | PAGE_CACHEABLE | PAGE_WRITE);
@@ -86 +86 @@
 
         if (GET_PTL2_FLAGS(ptl1, PTL1_INDEX(page)) & PAGE_NOT_PRESENT) {
-                newpt = PA2KA(PFN2ADDR(frame_alloc(ONE_FRAME, FRAME_KA)));
-                memsetb(newpt, PAGE_SIZE, 0);
+                newpt = (pte_t *)frame_alloc(ONE_FRAME, FRAME_KA);
+                memsetb((__address)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 | PAGE_CACHEABLE | PAGE_WRITE);
@@ -95 +95 @@
 
         if (GET_PTL3_FLAGS(ptl2, PTL2_INDEX(page)) & PAGE_NOT_PRESENT) {
-                newpt = PA2KA(PFN2ADDR(frame_alloc(ONE_FRAME, FRAME_KA)));
-                memsetb(newpt, PAGE_SIZE, 0);
+                newpt = (pte_t *)frame_alloc(ONE_FRAME, FRAME_KA);
+                memsetb((__address)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 | PAGE_CACHEABLE | PAGE_WRITE);
@@ -166 +166 @@
                  * Release the frame and remove PTL3 pointer from preceding table.
                  */
-                frame_free(ADDR2PFN(KA2PA((__address) ptl3)));
+                frame_free(KA2PA((__address) ptl3));
                 if (PTL2_ENTRIES)
                         memsetb((__address) &ptl2[PTL2_INDEX(page)], sizeof(pte_t), 0);
@@ -195 +195 @@
                          * Release the frame and remove PTL2 pointer from preceding table.
                          */
-                        frame_free(ADDR2PFN(KA2PA((__address) ptl2)));
+                        frame_free(KA2PA((__address) ptl2));
                         if (PTL1_ENTRIES)
                                 memsetb((__address) &ptl1[PTL1_INDEX(page)], sizeof(pte_t), 0);
@@ -224 +224 @@
                          * Release the frame and remove PTL1 pointer from preceding table.
                          */
-                        frame_free(ADDR2PFN(KA2PA((__address) ptl1)));
+                        frame_free(KA2PA((__address) ptl1));
                         memsetb((__address) &ptl0[PTL0_INDEX(page)], sizeof(pte_t), 0);
                 }