X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_mm.c;h=f0c40f9ec4f53b210bba7444cc90f3a280c7fff5;hb=974303f5ca3975d925d08452c175e09b77e8d4b4;hp=dd754efdd6fe2369c36c01cd6bad27caff633c24;hpb=8243a7d2a157ab520384f5019a63fd29c5c1383c;p=16.git

diff --git a/src/lib/16_mm.c b/src/lib/16_mm.c
index dd754efd..f0c40f9e 100644
--- a/src/lib/16_mm.c
+++ b/src/lib/16_mm.c
@@ -143,7 +143,7 @@ unsigned MML_SetupEMS(mminfo_t *mm)
 	union REGS CPURegs;
 
 	unsigned int EMSVer = 0;
-	byte	EMS_status;
+	//byte	EMS_status;
 	unsigned	totalEMSpages,freeEMSpages,EMSpageframe,EMSpagesmapped,EMShandle;
 	totalEMSpages = freeEMSpages = EMSpageframe = EMSpagesmapped = 0;
 
@@ -152,7 +152,7 @@ unsigned MML_SetupEMS(mminfo_t *mm)
 		mov	ah,EMS_STATUS
 		int	EMS_INT						// make sure EMS hardware is present
 		or	ah,ah
-		mov	[EMS_status],ah
+		//mov	[EMS_status],ah
 		jnz	error
 
 		mov	ah,EMS_VERSION
@@ -272,7 +272,7 @@ unsigned MM_MapEMS(mminfo_t *mm)
 	union REGS CPURegs;
 	EMShandle=mm->EMShandle;
 
-	for (i=0;i<4/*mm->EMSpagesmapped*/;i++)
+	for (i=0;i<MAPPAGES/*4mm->EMSpagesmapped*/;i++)
 	{
 		__asm
 		{
@@ -863,7 +863,7 @@ void MM_FreePtr(memptr *baseptr, mminfo_t *mm)
 
 	if(!scan)
 	{
-		printf("MM_FreePtr: Block not found!");
+		printf("MM_FreePtr: Block not found!\n");
 		return;
 	}
 
@@ -1075,10 +1075,10 @@ void MM_SortMem(mminfo_t *mm)
 void MM_ShowMemory(page_t *page, mminfo_t *mm)
 {
 	mmblocktype huge *scan;
-	unsigned color,temp;
+	word color,temp;
 	long	end,owner;
 	word chx,chy;
-	char    scratch[160],str[16];
+	byte    scratch[160],str[16];
 
 //****	VW_SetDefaultColors();
 //****	VW_SetLineWidth(40);
@@ -1111,14 +1111,36 @@ CA_OpenDebug ();
 			return;
 		}
 		end = scan->start+scan->length-1;
-				modexhlin(page, scan->start, (unsigned)end, chy, color);
+		chy = scan->start/320;
+		chx = scan->start%320;
+				//modexhlin(page, scan->start, (unsigned)end, chy, color);
+				//for(chx=scan->start;chx+4>=(word)end;chx+=4)
+				//{
+					modexClearRegion(page, chx, chy, 4, 4, color);
+				//}
+
 //++++		VW_Hlin(scan->start,(unsigned)end,0,color);
 
 //++++		VW_Plot(scan->start,0,15);
-				modexClearRegion(page, scan->start, chy, 4, 4, 15);
+				modexClearRegion(page, chx, chy, 4, 4, 15);
 		if(scan->next->start > end+1)
 //++++			VW_Hlin(end+1,scan->next->start,0,0);	// black = free
-					modexhlin(page, end+1,scan->next->start, chy, 9);
+			//for(chx=scan->next->start;chx+4>=(word)end+1;chx+=4)
+			//{
+				chx+=scan->next->start;
+				modexClearRegion(page, chx, chy, 4, 4, 2);
+			//}
+					//modexhlin(page, end+1,scan->next->start, chy, 0);
+
+/*
+		end = scan->length-1;
+		y = scan->start/320;
+		x = scan->start%320;
+		VW_Hlin(x,x+end,y,color);
+		VW_Plot(x,y,15);
+		if (scan->next && scan->next->start > end+1)
+			VW_Hlin(x+end+1,x+(scan->next->start-scan->start),y,0);	// black = free
+*/
 
 //****#if 0
 printf("\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0");	//bug!
@@ -1150,70 +1172,70 @@ CA_CloseDebug ();
 }
 //****#endif
 
-//==========================================================================
-
-/*
-=====================
-=
-= MM_DumpData
-=
-=====================
-*/
-
-void MM_DumpData(mminfo_t *mm)
-{
-	mmblocktype far *scan,far *best;
-	long	lowest,oldlowest;
-	unsigned	owner;
-	char	lock,purge;
-	FILE	*dumpfile;
-
-
-	free (mm->nearheap);
-	dumpfile = fopen ("mmdump.txt","w");
-	if (!dumpfile){
-		printf("MM_DumpData: Couldn't open MMDUMP.TXT!");
+//==========================================================================
+
+/*
+=====================
+=
+= MM_DumpData
+=
+=====================
+*/
+
+void MM_DumpData(mminfo_t *mm)
+{
+	mmblocktype far *scan,far *best;
+	long	lowest,oldlowest;
+	word	owner;
+	byte	lock,purge;
+	FILE	*dumpfile;
+
+
+	free (mm->nearheap);
+	dumpfile = fopen ("mmdump.txt","w");
+	if (!dumpfile){
+		printf("MM_DumpData: Couldn't open MMDUMP.TXT!\n");
 		return;
-	}
-
-	lowest = -1;
-	do
-	{
-		oldlowest = lowest;
-		lowest = 0xffff;
-
-		scan = mm->mmhead;
-		while (scan)
-		{
-			owner = (unsigned)scan->useptr;
-
-			if (owner && owner<lowest && owner > oldlowest)
-			{
-				best = scan;
-				lowest = owner;
-			}
-
-			scan = scan->next;
-		}
-
-		if (lowest != 0xffff)
-		{
-			if (best->attributes & PURGEBITS)
-				purge = 'P';
-			else
-				purge = '-';
-			if (best->attributes & LOCKBIT)
-				lock = 'L';
-			else
-				lock = '-';
-			fprintf (dumpfile,"0x%p (%c%c) = %u\n"
-			,(unsigned)lowest,lock,purge,best->length);
-		}
-
-	} while (lowest != 0xffff);
-
-	fclose (dumpfile);
-	printf("MMDUMP.TXT created.");
+	}
+
+	lowest = -1;
+	do
+	{
+		oldlowest = lowest;
+		lowest = 0xffff;
+
+		scan = mm->mmhead;
+		while (scan)
+		{
+			owner = (word)scan->useptr;
+
+			if (owner && owner<lowest && owner > oldlowest)
+			{
+				best = scan;
+				lowest = owner;
+			}
+
+			scan = scan->next;
+		}
+
+		if (lowest != 0xffff)
+		{
+			if (best->attributes & PURGEBITS)
+				purge = 'P';
+			else
+				purge = '-';
+			if (best->attributes & LOCKBIT)
+				lock = 'L';
+			else
+				lock = '-';
+			fprintf (dumpfile,"0x%p (%c%c) = %u\n"
+			,(word)lowest,lock,purge,best->length);
+		}
+
+	} while (lowest != 0xffff);
+
+	fclose (dumpfile);
+	printf("MMDUMP.TXT created.\n");
 }
 
 //==========================================================================