Changeset 052da81 in mainline for generic/src/mm/frame.c

Timestamp:

2006-02-18T14:40:15Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

daea4bf

Parents:

ede493e

Message:

Fixes in memory allocator

• proper kernel blacklisting, when kernel not loaded on page boundary
• correct zone adding in zone list (how could this work??)

File:

• generic/src/mm/frame.c (modified) (7 diffs)

generic/src/mm/frame.c

@@ -137 +137 @@
         if (zones.count+1 == ZONES_MAX)
                 panic("Maximum zone(%d) count exceeded.", ZONES_MAX);
-
         for (i=0; i < zones.count; i++) {
                 /* Check for overflow */
-                z = zones.info[zones.count];
+                z = zones.info[i];
                 if (overlaps(newzone->base,newzone->count,
                              z->base, z->count)) {
@@ -146 +145 @@
                         return -1;
                 }
-                if (z->base < newzone->base)
+                if (newzone->base < z->base)
                         break;
         }
@@ -152 +151 @@
         for (j=i;j < zones.count;j++)
                 zones.info[j+1] = zones.info[j];
-
         zones.info[i] = newzone;
         zones.count++;
-
         spinlock_unlock(&zones.lock);
         interrupts_restore(ipl);
@@ -768 +765 @@
                 frame_initialize(&z->frames[i]);
         }
-
+        
         /* Stuffing frames */
         for (i = 0; i < count; i++) {
@@ -844 +841 @@
                         zone_mark_unavailable(z, i - z->base);
                 }
-
         return znum;
 }
@@ -972 +968 @@
         zone_t *zone;
         int prefzone = 0;
-
+        
         for (i=0; i < count; i++) {
                 zone = find_zone_and_lock(start+i,&prefzone);
@@ -996 +992 @@
         frame_arch_init();
         if (config.cpu_active == 1) {
-                frame_mark_unavailable(ADDR2PFN(KA2PA(config.base)),
-                                       SIZE2FRAMES(config.kernel_size));
+                pfn_t firstframe = ADDR2PFN(KA2PA(config.base));
+                pfn_t lastframe = ADDR2PFN(KA2PA(config.base+config.kernel_size));
+                frame_mark_unavailable(firstframe,lastframe-firstframe+1);
                 if (config.init_size > 0)
                         frame_mark_unavailable(ADDR2PFN(KA2PA(config.init_addr)),