X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Farch%2Fx86_64%2Fmm_phys.c;h=68701b280c7bfa4bc610a8d769aaa05d100d7e31;hb=7d7952eb5cab57587c50a9c0d8c1bc45c55c0f2c;hp=8f382c4830e309dd35d1f322c2b14d8584fe6552;hpb=7384cf5b052f3a3fce67c971a95e03aa28692fc7;p=tpg%2Facess2.git

diff --git a/Kernel/arch/x86_64/mm_phys.c b/Kernel/arch/x86_64/mm_phys.c
index 8f382c48..68701b28 100644
--- a/Kernel/arch/x86_64/mm_phys.c
+++ b/Kernel/arch/x86_64/mm_phys.c
@@ -3,6 +3,7 @@
  * 
  * Physical Memory Manager
  */
+#define DEBUG	1
 #include <acess.h>
 #include <mboot.h>
 #include <mm_virt.h>
@@ -61,18 +62,18 @@ void MM_InitPhys_Multiboot(tMBoot_Info *MBoot)
 	tVAddr	vaddr;
 	tPAddr	paddr, firstFreePage;
 	
-	Log("MM_InitPhys_Multiboot: (MBoot=%p)", MBoot);
+	ENTER("pMBoot=%p", MBoot);
 	
 	// Scan the physical memory map
 	// Looking for the top of physical memory
 	mmapStart = (void *)( KERNEL_BASE | MBoot->MMapAddr );
-	Log(" MM_InitPhys_Multiboot: mmapStart = %p", mmapStart);
+	LOG("mmapStart = %p", mmapStart);
 	ent = mmapStart;
 	while( (Uint)ent < (Uint)mmapStart + MBoot->MMapLength )
 	{
 		// Adjust for the size of the entry
 		ent->Size += 4;
-		Log(" MM_InitPhys_Multiboot: ent={Type:%i,Base:0x%x,Length:%x",
+		LOG("ent={Type:%i,Base:0x%x,Length:%x",
 			ent->Type, ent->Base, ent->Length);
 		
 		// If entry is RAM and is above `maxAddr`, change `maxAddr`
@@ -92,7 +93,7 @@ void MM_InitPhys_Multiboot(tMBoot_Info *MBoot)
 		// Goodie, goodie gumdrops
 		giMaxPhysPage = maxAddr >> 12;
 	}
-	Log(" MM_InitPhys_Multiboot: giMaxPhysPage = 0x%x", giMaxPhysPage);
+	LOG("giMaxPhysPage = 0x%x", giMaxPhysPage);
 	
 	// Find a contigous section of memory to hold it in
 	// - Starting from the end of the kernel
@@ -100,8 +101,7 @@ void MM_InitPhys_Multiboot(tMBoot_Info *MBoot)
 	superPages = ((giMaxPhysPage+64*8-1)/(64*8) + 0xFFF) >> 12;
 	numPages = (giMaxPhysPage + 7) / 8;
 	numPages = (numPages + 0xFFF) >> 12;
-	Log(" MM_InitPhys_Multiboot: numPages = %i, superPages = %i",
-		numPages, superPages);
+	LOG("numPages = %i, superPages = %i", numPages, superPages);
 	if(maxAddr == 0)
 	{
 		 int	todo = numPages*2 + superPages;
@@ -153,7 +153,7 @@ void MM_InitPhys_Multiboot(tMBoot_Info *MBoot)
 			if( ent->Base + ent->Size < (tPAddr)&gKernelBase )
 				continue;
 			
-			Log(" MM_InitPhys_Multiboot: %x <= %x && %x > %x",
+			LOG("%x <= %x && %x > %x",
 				ent->Base, (tPAddr)&gKernelBase,
 				ent->Base + ent->Size, (tPAddr)&gKernelEnd - KERNEL_BASE
 				);
@@ -206,14 +206,14 @@ void MM_InitPhys_Multiboot(tMBoot_Info *MBoot)
 	// Save the current value of paddr to simplify the allocation later
 	firstFreePage = paddr;
 	
-	Log(" MM_InitPhys_Multiboot: Clearing multi bitmap");
+	LOG("Clearing multi bitmap");
 	// Fill the bitmaps
 	memset(gaMultiBitmap, 0, numPages<<12);
 	// - initialise to one, then clear the avaliable areas
 	memset(gaMainBitmap, -1, numPages<<12);
-	Log(" MM_InitPhys_Multiboot: Setting main bitmap");
+	LOG("Setting main bitmap");
 	// - Clear all Type=1 areas
-	Log(" MM_InitPhys_Multiboot: Clearing valid regions");
+	LOG("Clearing valid regions");
 	for(
 		ent = mmapStart;
 		(Uint)ent < (Uint)mmapStart + MBoot->MMapLength;
@@ -272,7 +272,7 @@ void MM_InitPhys_Multiboot(tMBoot_Info *MBoot)
 	}
 	
 	// Fill the super bitmap
-	Log(" MM_InitPhys_Multiboot: Filling super bitmap");
+	LOG("Filling super bitmap");
 	memset(gaSuperBitmap, 0, superPages<<12);
 	for( base = 0; base < (size+63)/64; base ++)
 	{
@@ -300,6 +300,8 @@ void MM_InitPhys_Multiboot(tMBoot_Info *MBoot)
 		// updated anymore, hence will be correct)
 		giPhysRangeLast[ rangeID ] = base;
 	}
+	
+	LEAVE('-');
 }
 
 /**
@@ -312,27 +314,26 @@ void MM_InitPhys_Multiboot(tMBoot_Info *MBoot)
  */
 tPAddr MM_AllocPhysRange(int Num, int Bits)
 {
-	tPAddr	addr;
+	tPAddr	addr, ret;
 	 int	rangeID;
 	 int	nFree = 0, i;
 	
-	Log("MM_AllocPhysRange: (Num=%i,Bits=%i)", Num, Bits);
+	ENTER("iNum iBits", Num, Bits);
 	
 	if( Bits <= 0 || Bits >= 64 )	// Speedup for the common case
 		rangeID = MM_PHYS_MAX;
 	else
 		rangeID = MM_int_GetRangeID( (1 << Bits) -1 );
 	
-	Log(" MM_AllocPhysRange: rangeID = %i", rangeID);
+	LOG("rangeID = %i", rangeID);
 	
 	LOCK(&glPhysicalPages);
-	Log(" MM_AllocPhysRange: i has lock");
 	
 	// Check if the range actually has any free pages
 	while(giPhysRangeFree[rangeID] == 0 && rangeID)
 		rangeID --;
 	
-	Log(" MM_AllocPhysRange: rangeID = %i", rangeID);
+	LOG("rangeID = %i", rangeID);
 	
 	// What the? Oh, man. No free pages
 	if(giPhysRangeFree[rangeID] == 0) {
@@ -344,43 +345,54 @@ tPAddr MM_AllocPhysRange(int Num, int Bits)
 			"Out of memory (unable to fulfil request for %i pages), zero remaining",
 			Num
 			);
+		LEAVE('i', 0);
 		return 0;
 	}
 	
 	// Check if there is enough in the range
 	if(giPhysRangeFree[rangeID] >= Num)
 	{
+		LOG("{%i,0x%x -> 0x%x}",
+			giPhysRangeFree[rangeID],
+			giPhysRangeFirst[rangeID], giPhysRangeLast[rangeID]
+			);
 		// Do a cheap scan, scanning upwards from the first free page in
 		// the range
-		nFree = 1;
+		nFree = 0;
 		addr = giPhysRangeFirst[ rangeID ];
-		while( addr < giPhysRangeLast[ rangeID ] )
+		while( addr <= giPhysRangeLast[ rangeID ] )
 		{
+			//Log(" MM_AllocPhysRange: addr = 0x%x", addr);
 			// Check the super bitmap
 			if( gaSuperBitmap[addr >> (6+6)] == -1 ) {
+				LOG("nFree = %i = 0 (super) (0x%x)", nFree, addr);
 				nFree = 0;
 				addr += 1 << (6+6);
-				addr &= (1 << (6+6)) - 1;
+				addr &= ~( (1 << (6+6)) - 1 );
 				continue;
 			}
 			// Check page block (64 pages)
 			if( gaSuperBitmap[addr >> (6+6)] & (1 << (addr>>6)&63)) {
+				LOG("nFree = %i = 0 (main) (0x%x)", nFree, addr);
 				nFree = 0;
 				addr += 1 << (12+6);
-				addr &= (1 << (12+6)) - 1;
+				addr &= ~( (1 << (12+6)) - 1 );
 				continue;
 			}
 			// Check individual page
 			if( gaMainBitmap[addr >> 6] & (1 << (addr & 63)) ) {
+				LOG("nFree = %i = 0 (page) (0x%x)", nFree, addr);
 				nFree = 0;
 				addr ++;
 				continue;
 			}
 			nFree ++;
 			addr ++;
+			LOG("nFree(%i) == %i (0x%x)", nFree, Num, addr);
 			if(nFree == Num)
 				break;
 		}
+		LOG("nFree = %i", nFree);
 		// If we don't find a contiguous block, nFree will not be equal
 		// to Num, so we set it to zero and do the expensive lookup.
 		if(nFree != Num)	nFree = 0;
@@ -401,18 +413,22 @@ tPAddr MM_AllocPhysRange(int Num, int Bits)
 			"Out of memory (unable to fulfil request for %i pages)",
 			Num
 			);
+		LEAVE('i', 0);
 		return 0;
 	}
-	Log(" MM_AllocPhysRange: nFree = %i, addr = 0x%08x", nFree, addr);
+	LOG("nFree = %i, addr = 0x%08x", nFree, addr);
 	
 	// Mark pages as allocated
 	addr -= Num;
-	for( i = 0; i < Num; i++ )
+	for( i = 0; i < Num; i++, addr++ )
 	{
-		gaiPageReferences[addr >> 6] |= 1 << (addr & 63);
-		rangeID = MM_int_GetRangeID(addr);
+		gaMainBitmap[addr >> 6] |= 1 << (addr & 63);
+		rangeID = MM_int_GetRangeID(addr << 12);
 		giPhysRangeFree[ rangeID ] --;
+		if(addr << 12 == giPhysRangeFirst[ rangeID ])
+			giPhysRangeFirst[ rangeID ] += 1;
 	}
+	ret = addr;	// Save the return address
 	
 	// Update super bitmap
 	Num += addr & (64-1);
@@ -425,8 +441,8 @@ tPAddr MM_AllocPhysRange(int Num, int Bits)
 	}
 	
 	RELEASE(&glPhysicalPages);
-	Log("MM_AllocPhysRange: RETURN %x", addr << 12);
-	return addr << 12;
+	LEAVE('x', ret << 12);
+	return ret << 12;
 }
 
 /**
@@ -493,15 +509,20 @@ void MM_DerefPhys(tPAddr PAddr)
 	else
 		gaMainBitmap[ page >> 6 ] &= ~(1 << (page&63));
 	
-	// TODO: Update free counts
+	// Update the free counts if the page was freed
 	if( !(gaMainBitmap[ page >> 6 ] & (1 << (page&63))) )
 	{
 		 int	rangeID;
 		rangeID = MM_int_GetRangeID( PAddr );
 		giPhysRangeFree[ rangeID ] ++;
+		if( giPhysRangeFirst[rangeID] > page )
+			giPhysRangeFirst[rangeID] = page;
+		if( giPhysRangeLast[rangeID] < page )
+			giPhysRangeLast[rangeID] = page;
 	}
 	
-	if(gaMainBitmap[ page >> 6 ] == 0) {
+	// If the bitmap entry is not -1, unset the bit in the super bitmap
+	if(gaMainBitmap[ page >> 6 ] != -1 ) {
 		gaSuperBitmap[page >> 12] &= ~(1 << ((page >> 6) & 63));
 	}
 }