X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_mm.c;h=b6af09e5bef9328c5ddd1a2e3359501f747c5bcf;hb=a01469473921b0dee332486b27897f937beabded;hp=f63c126a1158d6926ecddb3b03b38bc38a0ad781;hpb=bdee759b6e146ec13bb1be9bbf972d518c43cea6;p=16.git

diff --git a/src/lib/16_mm.c b/src/lib/16_mm.c
index f63c126a..b6af09e5 100644
--- a/src/lib/16_mm.c
+++ b/src/lib/16_mm.c
@@ -143,6 +143,7 @@ unsigned MML_SetupEMS(mminfo_t *mm)
 	union REGS CPURegs;
 
 	unsigned int EMSVer = 0;
+	byte	EMSstatus;
 	unsigned	totalEMSpages,freeEMSpages,EMSpageframe,EMSpagesmapped,EMShandle;
 	totalEMSpages = freeEMSpages = EMSpageframe = EMSpagesmapped = 0;
 
@@ -151,6 +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	[EMSstatus],ah
 		jnz	error
 
 		mov	ah,EMS_VERSION
@@ -217,6 +219,7 @@ End:
 	mm->EMSpagesmapped=EMSpagesmapped;
 	mm->EMShandle=EMShandle;
 	mm->EMSVer=EMSVer;
+	//mm->EMSstatus=EMSstatus;
 	return 0;
 }
 
@@ -325,6 +328,10 @@ SUB EMS.MapXPages (PhysicalStart, LogicalStart, NumPages, Handle)
 
 END SUB
 */
+void MM_MapXEMS(mminfo_t *mm)
+{
+
+}
 
 //==========================================================================
 
@@ -662,15 +669,16 @@ void MM_Startup(mminfo_t *mm, mminfotype *mmi)
 	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!
 	if(MML_CheckForEMS())
 	{
-//printf("EMS1\n");
+printf("EMS1\n");
 		MML_SetupEMS(mm);					// allocate space
+printf("EMS2\n");
 		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!
 		//TODO: EMS4! AND EMS 3.2 MASSIVE DATA HANDLMENT!
-		MML_UseSpace(mm->EMSpageframe,(mm->EMSpagesmapped)*0x4000lu, mm);
-//printf("EMS3\n");
+		MML_UseSpace(mm->EMSpageframe,(MAPPAGES)*0x4000lu, mm);
+printf("EMS3\n");
 		MM_MapEMS(mm);					// map in used pages
-//printf("EMS4\n");
-		mmi->EMSmem = (mm->EMSpagesmapped)*0x4000lu;
+printf("EMS4\n");
+		mmi->EMSmem = (MAPPAGES)*0x4000lu;
 	}
 
 //
@@ -687,6 +695,7 @@ emsskip:
 	if(MML_CheckForXMS(mm))
 	{
 		printf("XMS!\n");
+		//====needs work!
 		//MML_SetupXMS(mm, mmi);					// allocate as many UMBs as possible
 	}
 
@@ -720,8 +729,6 @@ void MM_Shutdown(mminfo_t *mm)
 	printf("far freed\n");
 	free(mm->nearheap);
 	printf("near freed\n");
-	//hfree(mm->hugeheap);
-	//printf("huge freed\n");
 	if(MML_CheckForEMS()){ MML_ShutdownEMS(mm); printf("EMS freed\n"); }
 	if(MML_CheckForXMS(mm)){ MML_ShutdownXMS(mm); printf("XMS freed\n"); }
 }
@@ -856,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;
 	}
 
@@ -893,7 +900,7 @@ void MM_SetPurge(memptr *baseptr, int purge, mminfo_t *mm)
 			mm->mmrover = mm->mmhead;
 		else if(mm->mmrover == start)
 		{
-			printf("MM_SetPurge: Block not found!");
+			printf("MM_SetPurge: Block not found!\n");
 			return;
 		}
 
@@ -1065,12 +1072,13 @@ void MM_SortMem(mminfo_t *mm)
 =====================
 */
 
-void MM_ShowMemory(mminfo_t *mm)
+void MM_ShowMemory(page_t *page, mminfo_t *mm)
 {
 	mmblocktype huge *scan;
-	unsigned color,temp;
+	word color,temp;
 	long	end,owner;
-	char    scratch[160],str[16];
+	word chx,chy;
+	byte    scratch[160],str[16];
 
 //****	VW_SetDefaultColors();
 //****	VW_SetLineWidth(40);
@@ -1082,7 +1090,10 @@ void MM_ShowMemory(mminfo_t *mm)
 
 	end = -1;
 
-//CA_OpenDebug ();
+CA_OpenDebug ();
+
+	chx=0;
+	chy=0;
 
 	while(scan)
 	{
@@ -1094,18 +1105,47 @@ void MM_ShowMemory(mminfo_t *mm)
 			color = 12;		// red = locked
 		if(scan->start<=end)
 		{
-			printf("\nMM_ShowMemory: Memory block order currupted!\n");
+			//printf(");
+			write(debughandle,"\nMM_ShowMemory: Memory block order currupted!\n",strlen("\nMM_ShowMemory: Memory block order currupted!\n"));
+			//modexprint(&page, chx, chy, 1, 0, 24, "\nMM_ShowMemory: Memory block order currupted!\n");
 			return;
 		}
 		end = scan->start+scan->length-1;
+		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, chx, chy, 4, 4, 15);
 		if(scan->next->start > end+1)
 //++++			VW_Hlin(end+1,scan->next->start,0,0);	// black = free
+			//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!
-strcpy(scratch,"Location:");
+strcpy(scratch,"Seg:");
 ultoa (scan->start,str,16);
 strcat (scratch,str);
 strcat (scratch,"\tSize:");
@@ -1116,14 +1156,16 @@ owner = (unsigned)scan->useptr;
 ultoa (owner,str,16);
 strcat (scratch,str);
 strcat (scratch,"\n");
-//++++write (debughandle,scratch,strlen(scratch));
-fprintf(stdout, "%s", scratch);
+write(debughandle,scratch,strlen(scratch));
+//modexprint(page, chx, chy, 1, 0, 24, &scratch);
+chy+=4;
+//fprintf(stdout, "%s", scratch);
 //****#endif
 
 		scan = scan->next;
 	}
 
-//CA_CloseDebug ();
+CA_CloseDebug ();
 
 //++++mh	IN_Ack();
 //****	VW_SetLineWidth(64);
@@ -1131,6 +1173,72 @@ fprintf(stdout, "%s", scratch);
 }
 //****#endif
 
+//==========================================================================
+
+/*
+=====================
+=
+= 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!");
+		return;
+	}
+
+	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.");
+}
+
 //==========================================================================
 
 
@@ -1205,13 +1313,14 @@ dword MM_TotalFree(mminfo_t *mm)
 =====================
 */
 
-void MM_Report(mminfo_t *mm, mminfotype *mmi)
+void MM_Report(page_t *page, mminfo_t *mm, mminfotype *mmi)
 {
+	printf("\n");
 	if(MML_CheckForEMS())
 	{
-		printf("EMM %x available\n", mm->EMSVer);
+		printf("Expanded memory manager present. EMM v%x.%x available\n", mm->EMSVer>>4,mm->EMSVer&0x0F);
 		printf("totalEMSpages=%u\n", mm->totalEMSpages);
-		printf("freeEMSpages=%u\n", mm->freeEMSpages);
+		printf("Page frame @0x%04x\n", mm->freeEMSpages);
 		printf("EMSpageframe=%x\n", mm->EMSpageframe);
 	}
 	if(MML_CheckForXMS(mm)) printf("XMSaddr=%Fp\n", *XMSaddr);