X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=KernelLand%2FKernel%2Farch%2Fx86%2Fmboot.c;h=726d2d23311b9698d3bf27c4e69c551aa5a860d0;hb=a02ac21b74b7030647c033ed6c6793e2d69364ac;hp=7403f387236ad246a2255041d5d6c85a8678b8a5;hpb=f194730e75d6d3681e5f99a4efed1616fd1ea738;p=tpg%2Facess2.git

diff --git a/KernelLand/Kernel/arch/x86/mboot.c b/KernelLand/Kernel/arch/x86/mboot.c
index 7403f387..726d2d23 100644
--- a/KernelLand/Kernel/arch/x86/mboot.c
+++ b/KernelLand/Kernel/arch/x86/mboot.c
@@ -13,8 +13,6 @@
 int Multiboot_LoadMemoryMap(tMBoot_Info *MBInfo, tVAddr MapOffset, tPMemMapEnt *Map, const int MapSize, tPAddr KStart, tPAddr KEnd)
 {
 	 int	nPMemMapEnts = 0;
-	tMBoot_MMapEnt	*ent = (void*)((tVAddr)MBInfo->MMapAddr + MapOffset);
-	tMBoot_MMapEnt	*last = (void*)((tVAddr)ent + MBInfo->MMapLength);
 	
 	ENTER("pMBInfo pMapOffset pMap iMapSize PKStart PKEnd",
 		MBInfo, MapOffset, Map, MapSize, KStart, KEnd);
@@ -22,6 +20,8 @@ int Multiboot_LoadMemoryMap(tMBoot_Info *MBInfo, tVAddr MapOffset, tPMemMapEnt *
 	// Check that the memory map is present
 	if( MBInfo->Flags & (1 << 6) )
 	{
+		tMBoot_MMapEnt	*ent = (void*)((tVAddr)MBInfo->MMapAddr + MapOffset);
+		tMBoot_MMapEnt	*last = (void*)((tVAddr)ent + MBInfo->MMapLength);
 		// Build up memory map
 		nPMemMapEnts = 0;
 		while( ent < last && nPMemMapEnts < MapSize )
@@ -48,10 +48,16 @@ int Multiboot_LoadMemoryMap(tMBoot_Info *MBInfo, tVAddr MapOffset, tPMemMapEnt *
 			nPMemMapEnts ++;
 			ent = (void*)( (tVAddr)ent + ent->Size + 4 );
 		}
+		if( ent < last )
+		{
+			Log_Warning("MBoot", "Memory map has >%i entries, internal version is truncated",
+				MapSize);
+		}
 	}
 	else if( MBInfo->Flags & (1 << 0) )
 	{
 		Log_Warning("MBoot", "No memory map passed, using mem_lower and mem_upper");
+		ASSERT(MapSize >= 2);
 		nPMemMapEnts = 2;
 		Map[0].Start = 0;
 		Map[0].Length = MBInfo->LowMem * 1024;
@@ -133,22 +139,29 @@ tBootModule *Multiboot_LoadModules(tMBoot_Info *MBInfo, tVAddr MapOffset, int *M
 	
 		// Always HW map the module data	
 		ofs = mods[i].Start&0xFFF;
-		ret[i].Base = (void*)( MM_MapHWPages(mods[i].Start,
-			(ret[i].Size+ofs+0xFFF) / 0x1000
-			) + ofs );
+		ret[i].Base = (void*)( (tVAddr)MM_MapHWPages(mods[i].Start, (ret[i].Size+ofs+0xFFF) / 0x1000)
+			+ ofs );
 		
-		// Only map the string if needed
-		if( !MM_GetPhysAddr( (void*)(mods[i].String + MapOffset) ) )
-		{
-			// Assumes the string is < 4096 bytes long)
-			ret[i].ArgString = (void*)(
-				MM_MapHWPages(mods[i].String, 2) + (mods[i].String&0xFFF)
-				);
-		}
-		else
-			ret[i].ArgString = (char*)(tVAddr)mods[i].String + MapOffset;
+		// Assumes the string is < 4096 bytes long)
+		ret[i].ArgString = (char*)MM_MapHWPages(mods[i].String, 2) + (mods[i].String&0xFFF);
 	}
 
 	return ret;
 }
 
+void Multiboot_FreeModules(const int ModuleCount, tBootModule *Modules)
+{
+	for( int i = 0; i < ModuleCount; i ++ )
+	{
+		Uint	ofs = Modules[i].PBase % PAGE_SIZE;
+		Uint	nPages = (Modules[i].Size+ofs+PAGE_SIZE-1) / PAGE_SIZE;
+		MM_UnmapHWPages(Modules[i].Base, nPages);
+		MM_UnmapHWPages(Modules[i].ArgString, 2);
+		
+		// TODO: handle previous freeing of this page
+		for( int pg = 0; pg < nPages; pg ++ )
+			MM_DerefPhys( Modules[i].PBase + pg*PAGE_SIZE );
+	}
+	free(Modules);
+}
+