X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Farch%2Fx86%2Fvm8086.c;h=8ef7453e26818c62ba1e2644175b8b12d8d82147;hb=302b755a1a7b1d607774353b908e325e934aacdc;hp=c837475b7b200b6f45a3df1e4d1d84020e2923dc;hpb=54746c855c6e2fe42fde9f93b0ce3f41aeefc2e5;p=tpg%2Facess2.git

diff --git a/Kernel/arch/x86/vm8086.c b/Kernel/arch/x86/vm8086.c
index c837475b..8ef7453e 100644
--- a/Kernel/arch/x86/vm8086.c
+++ b/Kernel/arch/x86/vm8086.c
@@ -74,7 +74,7 @@ int VM8086_Install(char **Arguments)
 			//MM_SetFlags( i * 0x1000, MM_PFLAG_RO, MM_PFLAG_RO );	// Set Read Only
 		}
 		MM_Map( 0, 0 );	// IVT / BDA
-		for(i=0x70;i<0x80;i++) {
+		for(i=0x10;i<0x9F;i++) {
 			MM_Map( i * 0x1000, i * 0x1000 );	MM_DerefPhys( i * 0x1000 );
 		}
 		MM_Map( 0x9F000, 0x9F000 );	// Stack / EBDA
@@ -294,23 +294,25 @@ void *VM8086_Allocate(tVM8086 *State, int Size, Uint16 *Segment, Uint16 *Offset)
 {
 	 int	i, j, base = 0;
 	 int	nBlocks, rem;
-	Uint32	bmp;
 	
 	Size = (Size + 127) & ~127;
-	nBlocks = Size >> 7;
+	nBlocks = Size / 128;
 	
 	if(Size > 4096)	return NULL;
 	
 	for( i = 0; i < VM8086_PAGES_PER_INST; i++ )
 	{
 		if( State->Internal->AllocatedPages[i].VirtBase == 0 )	continue;
-		bmp = State->Internal->AllocatedPages[i].Bitmap;
+		
+		
+		//Log_Debug("VM8086", "AllocatedPages[%i].Bitmap = 0b%b", i, State->Internal->AllocatedPages[i].Bitmap);
+		
 		rem = nBlocks;
 		base = 0;
 		// Scan the bitmap for a free block
-		for( j = 0; j < 32-nBlocks; j++ ) {
-			if( bmp & (1 << j) ) {
-				base = 0;
+		for( j = 0; j < 32; j++ ) {
+			if( State->Internal->AllocatedPages[i].Bitmap & (1 << j) ) {
+				base = j;
 				rem = nBlocks;
 			}
 			else {
@@ -321,6 +323,7 @@ void *VM8086_Allocate(tVM8086 *State, int Size, Uint16 *Segment, Uint16 *Offset)
 						State->Internal->AllocatedPages[i].Bitmap |= 1 << (base + j);
 					*Segment = State->Internal->AllocatedPages[i].PhysAddr / 16 + base * 8;
 					*Offset = 0;
+					//Log_Debug("VM8086", "Allocated at #%i,%04x", i, base*128);
 					return (void*)( State->Internal->AllocatedPages[i].VirtBase + base * 128 );
 				}
 			}
@@ -344,6 +347,7 @@ void *VM8086_Allocate(tVM8086 *State, int Size, Uint16 *Segment, Uint16 *Offset)
 		
 	for( j = 0; j < nBlocks; j++ )
 		State->Internal->AllocatedPages[i].Bitmap |= 1 << j;
+	//Log_Debug("VM8086", "AllocatedPages[%i].Bitmap = 0b%b", i, State->Internal->AllocatedPages[i].Bitmap);
 	*Segment = State->Internal->AllocatedPages[i].PhysAddr / 16;
 	*Offset = 0;
 	return (void*) State->Internal->AllocatedPages[i].VirtBase;