X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Farch%2Fx86%2Fmm_phys.c;h=3c7dcddc4f2bea4907c9dc3e98e8c624acb6a710;hb=3998cfbbadb005bf3ad52ea2538dc21f82864ddc;hp=988a15e474e3b6e9cdce36fec198fa012e122ca7;hpb=88ad2daf974ce4c4c770307546a9b4968c6183c2;p=tpg%2Facess2.git

diff --git a/Kernel/arch/x86/mm_phys.c b/Kernel/arch/x86/mm_phys.c
index 988a15e4..3c7dcddc 100644
--- a/Kernel/arch/x86/mm_phys.c
+++ b/Kernel/arch/x86/mm_phys.c
@@ -15,7 +15,7 @@
 extern void	gKernelEnd;
 
 // === PROTOTYPES ===
-tPAddr	MM_AllocPhys();
+tPAddr	MM_AllocPhys(void);
 tPAddr	MM_AllocPhysRange(int Pages, int MaxBits);
 void	MM_RefPhys(tPAddr PAddr);
 void	MM_DerefPhys(tPAddr PAddr);
@@ -39,12 +39,10 @@ void MM_Install(tMBoot_Info *MBoot)
 	tMBoot_MMapEnt	*ent;
 	
 	// --- Find largest address
-	Log("MBoot->MMapAddr = %08x", MBoot->MMapAddr);
 	MBoot->MMapAddr |= KERNEL_BASE;
 	ent = (void *)( MBoot->MMapAddr );
 	while( (Uint)ent < MBoot->MMapAddr + MBoot->MMapLength )
 	{
-		Log(" ent->Size = %08x", ent->Size);
 		// Adjust for size
 		ent->Size += 4;
 		
@@ -73,7 +71,7 @@ void MM_Install(tMBoot_Info *MBoot)
 		ent = (tMBoot_MMapEnt *)( (Uint)ent + ent->Size );
 	}
 	
-	// Get used page count
+	// Get used page count (Kernel)
 	kernelPages = (Uint)&gKernelEnd - KERNEL_BASE - 0x100000;
 	kernelPages += 0xFFF;	// Page Align
 	kernelPages >>= 12;
@@ -91,12 +89,10 @@ void MM_Install(tMBoot_Info *MBoot)
 	// Mark Multiboot's pages as taken
 	// - Structure
 	MM_RefPhys( (Uint)MBoot - KERNEL_BASE );
-	Log("MBoot->ModuleCount = %i", MBoot->ModuleCount);
 	// - Module List
 	for(i = (MBoot->ModuleCount*sizeof(tMBoot_Module)+0xFFF)>12; i--; )
 		MM_RefPhys( MBoot->Modules + (i << 12) );
 	// - Modules
-	Log("MBoot->Modules = %p", MBoot->Modules);
 	mods = (void*)(MBoot->Modules + KERNEL_BASE);
 	for(i = 0; i < MBoot->ModuleCount; i++)
 	{
@@ -123,10 +119,10 @@ void MM_Install(tMBoot_Info *MBoot)
 }
 
 /**
- * \fn tPAddr MM_AllocPhys()
+ * \fn tPAddr MM_AllocPhys(void)
  * \brief Allocates a physical page from the general pool
  */
-tPAddr MM_AllocPhys()
+tPAddr MM_AllocPhys(void)
 {
 	// int	a, b, c;
 	 int	indx;
@@ -211,8 +207,13 @@ tPAddr MM_AllocPhysRange(int Pages, int MaxBits)
 	 int	i, idx, sidx;
 	tPAddr	ret;
 	
+	ENTER("iPages iMaxBits", Pages, MaxBits);
+	
 	// Sanity Checks
-	if(MaxBits < 0)	return 0;
+	if(MaxBits < 0) {
+		LEAVE('i', 0);
+		return 0;
+	}
 	if(MaxBits > PHYS_BITS)	MaxBits = PHYS_BITS;
 	
 	// Lock
@@ -230,16 +231,28 @@ tPAddr MM_AllocPhysRange(int Pages, int MaxBits)
 	b = idx % 32;
 	a = idx / 32;
 	
+	#if 0
+	LOG("a=%i, b=%i, idx=%i, sidx=%i", a, b, idx, sidx);
+	
 	// Find free page
-	for( ; gaSuperBitmap[a] == -1 && a --; );
+	for( ; gaSuperBitmap[a] == -1 && a --; )	b = 31;
 	if(a < 0) {
 		RELEASE( &giPhysAlloc );
 		Warning("MM_AllocPhysRange - OUT OF MEMORY (Called by %p)", __builtin_return_address(0));
+		LEAVE('i', 0);
 		return 0;
 	}
-	for( ; gaSuperBitmap[a] & (1 << b); b-- );
+	LOG("a = %i", a);
+	for( ; gaSuperBitmap[a] & (1 << b); b-- )	sidx = 31;
+	LOG("b = %i", b);
 	idx = a * 32 + b;
-	for( ; gaPageBitmap[idx] & (1 << sidx); sidx-- );
+	for( ; gaPageBitmap[idx] & (1 << sidx); sidx-- )
+		LOG("gaPageBitmap[%i] = 0x%08x", idx, gaPageBitmap[idx]);
+	
+	LOG("idx = %i, sidx = %i", idx, sidx);
+	#else
+	
+	#endif
 	
 	// Check if the gap is large enough
 	while( idx >= 0 )
@@ -284,6 +297,8 @@ tPAddr MM_AllocPhysRange(int Pages, int MaxBits)
 	if( idx < 0 ) {
 		RELEASE( &giPhysAlloc );
 		Warning("MM_AllocPhysRange - OUT OF MEMORY (Called by %p)", __builtin_return_address(0));
+		LEAVE('i', 0);
+		return 0;
 	}
 	
 	// Mark pages used
@@ -293,7 +308,7 @@ tPAddr MM_AllocPhysRange(int Pages, int MaxBits)
 			gaPageReferences[idx*32+sidx] = 1;
 		gaPageBitmap[ idx ] |= 1 << sidx;
 		sidx ++;
-		if(sidx == 32) {	sidx = 0;	idx ++;	}
+		if(sidx == 32) { sidx = 0;	idx ++;	}
 	}
 	
 	// Get address
@@ -305,6 +320,7 @@ tPAddr MM_AllocPhysRange(int Pages, int MaxBits)
 	// Release Spinlock
 	RELEASE( &giPhysAlloc );
 	
+	LEAVE('X', ret);
 	return ret;
 }