Changeset 2e9eae2 in mainline for generic/src

Timestamp:

2006-06-23T16:03:53Z (19 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:

generic/src

Files:

• console/klog.c (modified) (1 diff)
• cpu/cpu.c (modified) (1 diff)
• mm/as.c (modified) (1 diff)
• mm/backend_anon.c (modified) (3 diffs)
• mm/backend_elf.c (modified) (5 diffs)
• mm/frame.c (modified) (4 diffs)
• mm/slab.c (modified) (4 diffs)
• proc/thread.c (modified) (4 diffs)
• time/clock.c (modified) (1 diff)

generic/src/console/klog.c

@@ -59 +59 @@
         void *faddr;
 
-        faddr = (void *)PFN2ADDR(frame_alloc(KLOG_ORDER, FRAME_ATOMIC));
+        faddr = frame_alloc(KLOG_ORDER, FRAME_ATOMIC);
         if (!faddr)
                 panic("Cannot allocate page for klog");

generic/src/cpu/cpu.c

@@ -72 +72 @@
 
                 for (i=0; i < config.cpu_count; i++) {
-                        cpus[i].stack = (__u8 *) PA2KA(PFN2ADDR(frame_alloc(STACK_FRAMES, FRAME_KA | FRAME_PANIC)));
+                        cpus[i].stack = (__u8 *) frame_alloc(STACK_FRAMES, FRAME_KA | FRAME_PANIC);
                         
                         cpus[i].id = i;

generic/src/mm/as.c

@@ -1497 +1497 @@
                         node = list_get_instance(cur, btree_node_t, leaf_link);
                         for (i = 0; i < node->keys; i++) 
-                                frame_free(ADDR2PFN((__address) node->value[i]));
+                                frame_free((__address) node->value[i]);
                 }
                 

generic/src/mm/backend_anon.c

@@ -106 +106 @@
                         }
                         if (allocate) {
-                                frame = PFN2ADDR(frame_alloc(ONE_FRAME, 0));
+                                frame = (__address) frame_alloc(ONE_FRAME, 0);
                                 memsetb(PA2KA(frame), FRAME_SIZE, 0);
                                 
@@ -133 +133 @@
                  *   the different causes
                  */
-                frame = PFN2ADDR(frame_alloc(ONE_FRAME, 0));
+                frame = (__address)frame_alloc(ONE_FRAME, 0);
                 memsetb(PA2KA(frame), FRAME_SIZE, 0);
         }
@@ -159 +159 @@
 void anon_frame_free(as_area_t *area, __address page, __address frame)
 {
-        frame_free(ADDR2PFN(frame));
+        frame_free(frame);
 }
 

generic/src/mm/backend_elf.c

@@ -135 +135 @@
                  */
                 if (entry->p_flags & PF_W) {
-                        frame = PFN2ADDR(frame_alloc(ONE_FRAME, 0));
+                        frame = (__address)frame_alloc(ONE_FRAME, 0);
                         memcpy((void *) PA2KA(frame), (void *) (base + i*FRAME_SIZE), FRAME_SIZE);
                         
@@ -154 +154 @@
                  * and cleared.
                  */
-                frame = PFN2ADDR(frame_alloc(ONE_FRAME, 0));
+                frame = (__address)frame_alloc(ONE_FRAME, 0);
                 memsetb(PA2KA(frame), FRAME_SIZE, 0);
 
@@ -171 +171 @@
                  */
                 size = entry->p_filesz - (i<<PAGE_WIDTH);
-                frame = PFN2ADDR(frame_alloc(ONE_FRAME, 0));
+                frame = (__address)frame_alloc(ONE_FRAME, 0);
                 memsetb(PA2KA(frame) + size, FRAME_SIZE - size, 0);
                 memcpy((void *) PA2KA(frame), (void *) (base + i*FRAME_SIZE), size);
@@ -219 +219 @@
                          * Free the frame with the copy of writable segment data.
                          */
-                        frame_free(ADDR2PFN(frame));
+                        frame_free(frame);
                 }
         } else {
@@ -227 +227 @@
                  * In any case, a frame needs to be freed.
                  */
-                frame_free(ADDR2PFN(frame)); 
+                frame_free(frame); 
         }
 }

generic/src/mm/frame.c

@@ -929 +929 @@
  * @param pzone  Preferred zone
  *
- * @return Allocated frame.
- *
- */
-pfn_t frame_alloc_generic(__u8 order, int flags, int *status, int *pzone) 
+ * @return Physical address of the allocated frame.
+ *
+ */
+void * frame_alloc_generic(__u8 order, int flags, int *status, int *pzone) 
 {
         ipl_t ipl;
@@ -972 +972 @@
                         if (status)
                                 *status = FRAME_NO_MEMORY;
-                        return NULL;
+                        return 0;
                 }
                 
@@ -987 +987 @@
         if (status)
                 *status = FRAME_OK;
-        return v;
+
+        if (flags & FRAME_KA)
+                return (void *)PA2KA(PFN2ADDR(v));
+        return (void *)PFN2ADDR(v);
 }
 
@@ -996 +999 @@
  * If it drops to zero, move the frame structure to free list.
  *
- * @param pfn Frame number of the frame to be freed.
- */
-void frame_free(pfn_t pfn)
+ * @param Frame Physical Address of of the frame to be freed.
+ */
+void frame_free(__address frame)
 {
         ipl_t ipl;
         zone_t *zone;
+        pfn_t pfn = ADDR2PFN(frame);
 
         ipl = interrupts_disable();

generic/src/mm/slab.c

@@ -163 +163 @@
         int i;
         int status;
-        pfn_t pfn;
         int zone=0;
         
-        pfn = frame_alloc_rc_zone(cache->order, FRAME_KA | flags, &status, &zone);
-        data = (void *) PA2KA(PFN2ADDR(pfn));
+        data = frame_alloc_rc_zone(cache->order, FRAME_KA | flags, &status, &zone);
         if (status != FRAME_OK) {
                 return NULL;
@@ -174 +172 @@
                 slab = slab_alloc(slab_extern_cache, flags);
                 if (!slab) {
-                        frame_free(ADDR2PFN(KA2PA(data)));
+                        frame_free(KA2PA(data));
                         return NULL;
                 }
@@ -184 +182 @@
         /* Fill in slab structures */
         for (i=0; i < (1 << cache->order); i++)
-                frame_set_parent(pfn+i, slab, zone);
+                frame_set_parent(ADDR2PFN(KA2PA(data))+i, slab, zone);
 
         slab->start = data;
@@ -205 +203 @@
 static count_t slab_space_free(slab_cache_t *cache, slab_t *slab)
 {
-        frame_free(ADDR2PFN(KA2PA(slab->start)));
+        frame_free(KA2PA(slab->start));
         if (! (cache->flags & SLAB_CACHE_SLINSIDE))
                 slab_free(slab_extern_cache, slab);

generic/src/proc/thread.c

@@ -125 +125 @@
 {
         thread_t *t = (thread_t *)obj;
-        pfn_t pfn;
         int status;
 
@@ -143 +142 @@
 #endif  
 
-        pfn = frame_alloc_rc(STACK_FRAMES, FRAME_KA | kmflags,&status);
+        t->kstack = frame_alloc_rc(STACK_FRAMES, FRAME_KA | kmflags,&status);
         if (status) {
 #ifdef ARCH_HAS_FPU
@@ -151 +150 @@
                 return -1;
         }
-        t->kstack = (__u8 *)PA2KA(PFN2ADDR(pfn));
 
         return 0;
@@ -161 +159 @@
         thread_t *t = (thread_t *)obj;
 
-        frame_free(ADDR2PFN(KA2PA(t->kstack)));
+        frame_free(KA2PA(t->kstack));
 #ifdef ARCH_HAS_FPU
         if (t->saved_fpu_context)

generic/src/time/clock.c

@@ -80 +80 @@
         void *faddr;
 
-        faddr = (void *)PFN2ADDR(frame_alloc(0, FRAME_ATOMIC));
+        faddr = frame_alloc(0, FRAME_ATOMIC);
         if (!faddr)
                 panic("Cannot allocate page for clock");