Add Post Memory Manager (PMM) support.

[seabios.git] / src / memmap.c

diff --git a/src/memmap.c b/src/memmap.c
index 9fc3626fcdb7108364a10670b753c333b9538b71..005c474cc7b660a10f57f0dacacbe43698b974db 100644 (file)
--- a/src/memmap.c
+++ b/src/memmap.c
@@ -132,93 +132,3 @@ memmap_finalize()
 {
     dump_map();
 }
-
-
-/****************************************************************
- * malloc
- ****************************************************************/
-
-#define MINALIGN 16
-
-struct zone_s {
-    u32 top, bottom, cur;
-};
-
-static struct zone_s ZoneHigh, ZoneFSeg;
-
-static void *
-__malloc(struct zone_s *zone, u32 size)
-{
-    u32 newpos = (zone->cur - size) / MINALIGN * MINALIGN;
-    if ((s32)(newpos - zone->bottom) < 0)
-        // No space
-        return NULL;
-    zone->cur = newpos;
-    return (void*)newpos;
-}
-
-// Allocate memory at the top of 32bit ram.
-void *
-malloc_high(u32 size)
-{
-    return __malloc(&ZoneHigh, size);
-}
-
-// Allocate memory in the 0xf0000-0x100000 area of ram.
-void *
-malloc_fseg(u32 size)
-{
-    return __malloc(&ZoneFSeg, size);
-}
-
-void
-malloc_setup()
-{
-    dprintf(3, "malloc setup\n");
-
-    // Memory in 0xf0000 area.
-    memset(BiosTableSpace, 0, CONFIG_MAX_BIOSTABLE);
-    ZoneFSeg.bottom = (u32)BiosTableSpace;
-    ZoneFSeg.top = ZoneFSeg.cur = ZoneFSeg.bottom + CONFIG_MAX_BIOSTABLE;
-
-    // Find memory at the top of ram.
-    u32 top = 0;
-    int i;
-    for (i=e820_count-1; i>=0; i--) {
-        struct e820entry *e = &e820_list[i];
-        u64 end = e->start + e->size;
-        if (e->type != E820_RAM || end > 0xffffffff
-            || e->size < CONFIG_MAX_HIGHTABLE)
-            continue;
-        top = end;
-        break;
-    }
-    if (top < 1024*1024 + CONFIG_MAX_HIGHTABLE) {
-        // No memory above 1Meg
-        memset(&ZoneHigh, 0, sizeof(ZoneHigh));
-        return;
-    }
-    ZoneHigh.bottom = top - CONFIG_MAX_HIGHTABLE;
-    ZoneHigh.top = ZoneHigh.cur = ZoneHigh.bottom + CONFIG_MAX_HIGHTABLE;
-    add_e820(ZoneHigh.bottom, CONFIG_MAX_HIGHTABLE, E820_RESERVED);
-}
-
-void
-malloc_finalize()
-{
-    dprintf(3, "malloc finalize\n");
-
-    // Give back unused high ram.
-    u32 giveback = (ZoneHigh.cur - ZoneHigh.bottom) / 4096 * 4096;
-    add_e820(ZoneHigh.bottom, giveback, E820_RAM);
-
-    // Report statistics
-    u32 used = ZoneFSeg.top - ZoneFSeg.cur;
-    u32 avail = ZoneFSeg.top - ZoneFSeg.bottom;
-    dprintf(1, "malloc_fseg used=%d (%d%%)\n"
-            , used, (100 * used) / avail);
-    used = ZoneHigh.top - ZoneHigh.cur;
-    avail = ZoneHigh.top - ZoneHigh.bottom;
-    dprintf(1, "malloc_high used=%d (%d%%) (returned %d)\n"
-            , used, (100 * used) / avail, giveback);
-}