commit 8b9137d29561e958ba557ba31e73da71d3b03249
author Kevin O'Connor <kevin@koconnor.net> Wed Aug 03 20:15:26 2011 -0400
committer Kevin O'Connor <kevin@koconnor.net> Wed Aug 03 20:15:26 2011 -0400
tree 2cac91b6355e812cff0c94c95b07dc6a018610a1
parent e0f87ce6610a0f341ff79c2c40ddc29f26932353

Allow free space in f-segment to be used by malloc_fseg().

src/optionroms.c

diff --git a/src/optionroms.c b/src/optionroms.c
index be02f2a..2832eab 100644
--- a/src/optionroms.c
+++ b/src/optionroms.c
@@ -483,7 +483,7 @@
         init_optionrom((void*)BUILD_ROM_START, 0, 1);
     } else {
         // Clear option rom memory
-        memset((void*)RomEnd, 0, _max_rom() - RomEnd);
+        memset((void*)RomEnd, 0, max_rom() - RomEnd);
 
         // Find and deploy PCI VGA rom.
         struct pci_device *pci;

src/pmm.c

diff --git a/src/pmm.c b/src/pmm.c
index b812515..82a0b1d 100644
--- a/src/pmm.c
+++ b/src/pmm.c
@@ -216,6 +216,13 @@
         struct zone_s *zone = Zones[i];
         zone->info->pprev = &zone->info;
     }
+
+    // Add space free'd during relocation in f-segment to ZoneFSeg
+    extern u8 code32init_end[];
+    if ((u32)code32init_end > BUILD_BIOS_ADDR) {
+        memset((void*)BUILD_BIOS_ADDR, 0, (u32)code32init_end - BUILD_BIOS_ADDR);
+        addSpace(&ZoneFSeg, (void*)BUILD_BIOS_ADDR, code32init_end);
+    }
 }
 
 void