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

diff --git a/Kernel/arch/x86_64/mm_phys.c b/Kernel/arch/x86_64/mm_phys.c
index 68701b28..a5f6f276 100644
--- a/Kernel/arch/x86_64/mm_phys.c
+++ b/Kernel/arch/x86_64/mm_phys.c
@@ -3,7 +3,7 @@
  * 
  * Physical Memory Manager
  */
-#define DEBUG	1
+#define DEBUG	0
 #include <acess.h>
 #include <mboot.h>
 #include <mm_virt.h>
@@ -228,14 +228,14 @@ void MM_InitPhys_Multiboot(tMBoot_Info *MBoot)
 		size = ent->Size >> 12;
 		
 		if(base & 63) {
-			Uint64	val = -1 << (base & 63);
+			Uint64	val = -1L << (base & 63);
 			gaMainBitmap[base / 64] &= ~val;
 			size -= (base & 63);
 			base += 64 - (base & 63);
 		}
 		memset( &gaMainBitmap[base / 64], 0, size/8 );
 		if( size & 7 ) {
-			Uint64	val = -1 << (size & 7);
+			Uint64	val = -1L << (size & 7);
 			val <<= (size/8)&7;
 			gaMainBitmap[base / 64] &= ~val;
 		}
@@ -246,7 +246,7 @@ void MM_InitPhys_Multiboot(tMBoot_Info *MBoot)
 		size = (size + (base & 63) + 63) >> 6;
 		base = base >> 6;
 		if(base & 63) {
-			Uint64	val = -1 << (base & 63);
+			Uint64	val = -1L << (base & 63);
 			gaSuperBitmap[base / 64] &= ~val;
 			size -= (base & 63);
 			base += 64 - (base & 63);
@@ -258,7 +258,7 @@ void MM_InitPhys_Multiboot(tMBoot_Info *MBoot)
 	size = firstFreePage >> 12;
 	memset( &gaMainBitmap[base / 64], -1, size/8 );
 	if( size & 7 ) {
-		Uint64	val = -1 << (size & 7);
+		Uint64	val = -1L << (size & 7);
 		val <<= (size/8)&7;
 		gaMainBitmap[base / 64] |= val;
 	}
@@ -268,7 +268,7 @@ void MM_InitPhys_Multiboot(tMBoot_Info *MBoot)
 		if(gaiStaticAllocPages[i] != 0)
 			continue;
 		gaMainBitmap[ gaiStaticAllocPages[i] >> (12+6) ]
-			&= ~(1 << ((gaiStaticAllocPages[i]>>12)&63));
+			&= ~(1L << ((gaiStaticAllocPages[i]>>12)&63));
 	}
 	
 	// Fill the super bitmap
@@ -276,8 +276,8 @@ void MM_InitPhys_Multiboot(tMBoot_Info *MBoot)
 	memset(gaSuperBitmap, 0, superPages<<12);
 	for( base = 0; base < (size+63)/64; base ++)
 	{
-		if( gaMainBitmap[ base ] == -1 )
-			gaSuperBitmap[ base/64 ] |= 1 << (base&63);
+		if( gaMainBitmap[ base ] + 1 == 0 )
+			gaSuperBitmap[ base/64 ] |= 1L << (base&63);
 	}
 	
 	// Set free page counts
@@ -285,7 +285,7 @@ void MM_InitPhys_Multiboot(tMBoot_Info *MBoot)
 	{
 		 int	rangeID;
 		// Skip allocated
-		if( gaMainBitmap[ base >> 6 ] & (1 << (base&63))  )	continue;
+		if( gaMainBitmap[ base >> 6 ] & (1L << (base&63))  )	continue;
 		
 		// Get range ID
 		rangeID = MM_int_GetRangeID( base << 12 );
@@ -323,7 +323,7 @@ tPAddr MM_AllocPhysRange(int Num, int Bits)
 	if( Bits <= 0 || Bits >= 64 )	// Speedup for the common case
 		rangeID = MM_PHYS_MAX;
 	else
-		rangeID = MM_int_GetRangeID( (1 << Bits) -1 );
+		rangeID = MM_int_GetRangeID( (1L << Bits) - 1 );
 	
 	LOG("rangeID = %i", rangeID);
 	
@@ -364,23 +364,23 @@ tPAddr MM_AllocPhysRange(int Num, int Bits)
 		{
 			//Log(" MM_AllocPhysRange: addr = 0x%x", addr);
 			// Check the super bitmap
-			if( gaSuperBitmap[addr >> (6+6)] == -1 ) {
+			if( gaSuperBitmap[addr >> (6+6)] + 1 == 0 ) {
 				LOG("nFree = %i = 0 (super) (0x%x)", nFree, addr);
 				nFree = 0;
-				addr += 1 << (6+6);
-				addr &= ~( (1 << (6+6)) - 1 );
+				addr += 1L << (6+6);
+				addr &= ~0xFFF;	// (1L << 6+6) - 1
 				continue;
 			}
 			// Check page block (64 pages)
-			if( gaSuperBitmap[addr >> (6+6)] & (1 << (addr>>6)&63)) {
+			if( gaMainBitmap[addr >> 6] + 1 == 0) {
 				LOG("nFree = %i = 0 (main) (0x%x)", nFree, addr);
 				nFree = 0;
-				addr += 1 << (12+6);
-				addr &= ~( (1 << (12+6)) - 1 );
+				addr += 1L << (6);
+				addr &= ~0x3F;
 				continue;
 			}
 			// Check individual page
-			if( gaMainBitmap[addr >> 6] & (1 << (addr & 63)) ) {
+			if( gaMainBitmap[addr >> 6] & (1L << (addr & 63)) ) {
 				LOG("nFree = %i = 0 (page) (0x%x)", nFree, addr);
 				nFree = 0;
 				addr ++;
@@ -422,10 +422,11 @@ tPAddr MM_AllocPhysRange(int Num, int Bits)
 	addr -= Num;
 	for( i = 0; i < Num; i++, addr++ )
 	{
-		gaMainBitmap[addr >> 6] |= 1 << (addr & 63);
+		gaMainBitmap[addr >> 6] |= 1L << (addr & 63);
 		rangeID = MM_int_GetRangeID(addr << 12);
 		giPhysRangeFree[ rangeID ] --;
-		if(addr << 12 == giPhysRangeFirst[ rangeID ])
+		LOG("%x == %x", addr, giPhysRangeFirst[ rangeID ]);
+		if(addr == giPhysRangeFirst[ rangeID ])
 			giPhysRangeFirst[ rangeID ] += 1;
 	}
 	ret = addr;	// Save the return address
@@ -436,8 +437,8 @@ tPAddr MM_AllocPhysRange(int Num, int Bits)
 	Num = (Num + (64-1)) & ~(64-1);
 	for( i = 0; i < Num/64; i++ )
 	{
-		if( gaMainBitmap[ addr >> 6 ] == -1 )
-			gaSuperBitmap[addr>>12] |= 1 << ((addr >> 6) & 64);
+		if( gaMainBitmap[ addr >> 6 ] + 1 == 0 )
+			gaSuperBitmap[addr>>12] |= 1L << ((addr >> 6) & 63);
 	}
 	
 	RELEASE(&glPhysicalPages);
@@ -475,18 +476,18 @@ void MM_RefPhys(tPAddr PAddr)
 	
 	if( PAddr >> 12 > giMaxPhysPage )	return ;
 	
-	if( gaMainBitmap[ page >> 6 ] & (1 << (page&63)) )
+	if( gaMainBitmap[ page >> 6 ] & (1L << (page&63)) )
 	{
 		// Reference again
-		gaMultiBitmap[ page >> 6 ] |= 1 << (page&63);
+		gaMultiBitmap[ page >> 6 ] |= 1L << (page&63);
 		gaiPageReferences[ page ] ++;
 	}
 	else
 	{
 		// Allocate
-		gaMainBitmap[page >> 6] |= 1 << (page&63);
-		if( gaMainBitmap[page >> 6 ] == -1 )
-			gaSuperBitmap[page>> 12] |= 1 << ((page >> 6) & 63);
+		gaMainBitmap[page >> 6] |= 1L << (page&63);
+		if( gaMainBitmap[page >> 6 ] + 1 == 0 )
+			gaSuperBitmap[page>> 12] |= 1L << ((page >> 6) & 63);
 	}
 }
 
@@ -499,18 +500,18 @@ void MM_DerefPhys(tPAddr PAddr)
 	
 	if( PAddr >> 12 > giMaxPhysPage )	return ;
 	
-	if( gaMultiBitmap[ page >> 6 ] & (1 << (page&63)) ) {
+	if( gaMultiBitmap[ page >> 6 ] & (1L << (page&63)) ) {
 		gaiPageReferences[ page ] --;
 		if( gaiPageReferences[ page ] == 1 )
-			gaMultiBitmap[ page >> 6 ] &= ~(1 << (page&63));
+			gaMultiBitmap[ page >> 6 ] &= ~(1L << (page&63));
 		if( gaiPageReferences[ page ] == 0 )
-			gaMainBitmap[ page >> 6 ] &= ~(1 << (page&63));
+			gaMainBitmap[ page >> 6 ] &= ~(1L << (page&63));
 	}
 	else
-		gaMainBitmap[ page >> 6 ] &= ~(1 << (page&63));
+		gaMainBitmap[ page >> 6 ] &= ~(1L << (page&63));
 	
 	// Update the free counts if the page was freed
-	if( !(gaMainBitmap[ page >> 6 ] & (1 << (page&63))) )
+	if( !(gaMainBitmap[ page >> 6 ] & (1L << (page&63))) )
 	{
 		 int	rangeID;
 		rangeID = MM_int_GetRangeID( PAddr );
@@ -522,8 +523,8 @@ void MM_DerefPhys(tPAddr PAddr)
 	}
 	
 	// 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));
+	if(gaMainBitmap[ page >> 6 ] + 1 != 0 ) {
+		gaSuperBitmap[page >> 12] &= ~(1L << ((page >> 6) & 63));
 	}
 }