X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_mm.c;h=9c8bcdbe12f977810c02cb92c6722a0e1f9f931f;hb=bd35bd7d97646cc726bd40cc54c9a158af008b4d;hp=9eb93c67b45d47774fe81758d1870ce9d48f803a;hpb=1dbd79f535c2617caefe848842199988dbedc12f;p=16.git

diff --git a/src/lib/16_mm.c b/src/lib/16_mm.c
index 9eb93c67..9c8bcdbe 100755
--- a/src/lib/16_mm.c
+++ b/src/lib/16_mm.c
@@ -140,7 +140,7 @@ boolean MML_CheckForEMS(void)
 	return(emmcfems);
 }
 
-
+#ifndef __16_PM__
 /*
 ======================
 =
@@ -157,8 +157,8 @@ byte MML_SetupEMS(global_game_variables_t *gvar)
 
 	unsigned int EMSVer = 0;
 	//byte	EMS_status;
-	unsigned	totalEMSpages,freeEMSpages,EMSpageframe,EMSpagesmapped,EMShandle;
-	totalEMSpages = freeEMSpages = EMSpageframe = EMSpagesmapped = 0;
+	unsigned	totalEMSpages,freeEMSpages,EMSPageFrame,EMSpagesmapped,EMSHandle;
+	totalEMSpages = freeEMSpages = EMSPageFrame = EMSpagesmapped = 0;
 
 	__asm {
 		mov	ah,EMS_STATUS
@@ -179,7 +179,7 @@ byte MML_SetupEMS(global_game_variables_t *gvar)
 		int	EMS_INT						// find the page frame address
 		or	ah,ah
 		jnz	error
-		mov	[EMSpageframe],bx
+		mov	[EMSPageFrame],bx
 
 		mov	ah,EMS_GETPAGES
 		int	EMS_INT						// find out how much EMS is there
@@ -218,7 +218,7 @@ byte MML_SetupEMS(global_game_variables_t *gvar)
 		int	EMS_INT
 		or	ah,ah
 		jnz	error
-		mov	[EMShandle],dx
+		mov	[EMSHandle],dx
 		jmp End
 #ifdef __BORLANDC__
 	}
@@ -247,9 +247,9 @@ End:
 	}
 	gvar->mm.totalEMSpages=totalEMSpages;
 	gvar->mm.freeEMSpages=freeEMSpages;
-	gvar->mm.EMSpageframe=EMSpageframe;
+	gvar->mm.EMSPageFrame=EMSPageFrame;
 	gvar->mm.EMSpagesmapped=EMSpagesmapped;
-	gvar->mm.EMShandle=EMShandle;
+	gvar->mm.EMSHandle=EMSHandle;
 	gvar->mm.EMSVer=EMSVer;
 	return 0;
 }
@@ -266,13 +266,13 @@ End:
 void MML_ShutdownEMS(global_game_variables_t *gvar)
 {
 	boolean errorflag=false;
-	unsigned EMShandle=gvar->mm.EMShandle;
+	unsigned EMSHandle=gvar->mm.EMSHandle;
 
-	if(!EMShandle)
+	if(!EMSHandle)
 		return;
 	__asm {
 		mov	ah,EMS_FREEPAGES
-		mov	dx,[EMShandle]
+		mov	dx,[EMSHandle]
 		int	EMS_INT
 		or	ah,ah
 		jz	ok
@@ -303,11 +303,11 @@ void MML_ShutdownEMS(global_game_variables_t *gvar)
 byte MM_MapEMS(global_game_variables_t *gvar)
 {
 	byte	str[160];
-	unsigned	EMShandle;
+	unsigned	EMSHandle;
 	byte err;
 	boolean	errorflag=false;
 	int	i;
-	EMShandle=gvar->mm.EMShandle;
+	EMSHandle=gvar->mm.EMSHandle;
 
 	for (i=0;i<4/*MAPPAGES*/;i++)
 	{
@@ -315,7 +315,7 @@ byte MM_MapEMS(global_game_variables_t *gvar)
 			mov	ah,EMS_MAPPAGE
 			mov	bx,[i]			// logical page
 			mov	al,bl			// physical page
-			mov	dx,[EMShandle]	// handle
+			mov	dx,[EMSHandle]	// handle
 			int	EMS_INT
 			or	ah,ah
 			jnz	error
@@ -345,7 +345,6 @@ byte MM_MapEMS(global_game_variables_t *gvar)
 		}
 	}
 	gvar->mmi.EMSmem = (i)*0x4000lu;
-	//printf("		gvar->mmi.EMSmem=%lu\n", gvar->mmi.EMSmem);
 	return 0;
 }
 
@@ -375,10 +374,10 @@ byte MM_MapXEMS(global_game_variables_t *gvar)
 //END SUB
 	byte	str[160];
 	byte err;
-	word	EMShandle;
+	word	EMSHandle;
 	boolean	errorflag=false;
 	int	i;
-	EMShandle=gvar->mm.EMShandle;
+	EMSHandle=gvar->mm.EMSHandle;
 
 	if(gvar->mm.EMSVer<0x40)
 		return 5;
@@ -389,7 +388,7 @@ byte MM_MapXEMS(global_game_variables_t *gvar)
 			mov	ah,EMS_MAPXPAGE
 			mov	cx,[i]			// logical page
 			mov	al,bl			// physical page
-			mov	dx,[EMShandle]	// handle
+			mov	dx,[EMSHandle]	// handle
 			int	EMS_INT
 			or	ah,ah
 			jnz	error
@@ -425,7 +424,7 @@ byte MM_MapXEMS(global_game_variables_t *gvar)
 	gvar->mmi.EMSmem = (i)*0x4000lu;
 	return 0;
 }
-
+#endif
 //==========================================================================
 
 /*
@@ -438,10 +437,9 @@ byte MM_MapXEMS(global_game_variables_t *gvar)
 =======================
 */
 
-boolean MML_CheckForXMS(global_game_variables_t *gvar)
+boolean MML_CheckForXMS(void)
 {
 	boolean	errorflag=false;
-	gvar->mm.numUMBs = 0;
 
 	__asm {
 		mov	ax,0x4300
@@ -460,7 +458,7 @@ boolean MML_CheckForXMS(global_game_variables_t *gvar)
 	else return true;
 }
 
-
+#ifndef __16_PM__
 /*
 ======================
 =
@@ -547,7 +545,7 @@ void MML_ShutdownXMS(global_game_variables_t *gvar)
 		}
 	}
 }
-
+#endif
 //==========================================================================
 
 /*
@@ -818,12 +816,13 @@ void MM_Startup(global_game_variables_t *gvar)
 	//printf("_FARCORELEFT				%lu\n", _FCORELEFT);
 #ifdef __WATCOMC__
 	_fheapgrow();
+	length=_FCORELEFT;//_fcoreleft();//(dword)GetFarFreeSize();//0xffffUL*4UL;
 #endif
 #ifdef __BORLANDC__
 	printf("farcoreleft()				%lu\n", farcoreleft());
 	printf("(farcoreleft()+32)-_FCORELEFT	%d\n", (sword)((farcoreleft()+32)-_FCORELEFT));
+	length=farcoreleft();//_fcoreleft();//(dword)GetFarFreeSize();//0xffffUL*4UL;
 #endif
-	length=_FCORELEFT;//_fcoreleft();//(dword)GetFarFreeSize();//0xffffUL*4UL;
 	start = gvar->mm.farheap = _fmalloc(length);
 	//start = gvar->mm.farheap = halloc(length, 1);
 	length -= 16-(FP_OFF(start)&15);
@@ -836,6 +835,8 @@ void MM_Startup(global_game_variables_t *gvar)
 
 	gvar->mmi.mainmem = gvar->mmi.nearheap + gvar->mmi.farheap;
 
+#ifndef __16_PM__
+	if(!dbg_debugpm) {
 //
 // detect EMS and allocate up to 64K at page frame
 //
@@ -863,8 +864,8 @@ void MM_Startup(global_game_variables_t *gvar)
 	if(MML_CheckForEMS())
 	{
 		MML_SetupEMS(gvar);					// allocate space
-		//TODO: EMS4! AND EMS 3.2 MASSIVE DATA HANDLMENT!
-		MML_UseSpace(gvar->mm.EMSpageframe,(MAPPAGES)*0x4000lu, gvar);
+		//16_PM: EMS4! AND EMS 3.2 MASSIVE DATA HANDLMENT!
+		MML_UseSpace(gvar->mm.EMSPageFrame,(MAPPAGES)*0x4000lu, gvar);
 		//if(gvar->pm.emm.EMSVer<0x40)
 			MM_MapEMS(gvar);					// map in used pages
 		//else
@@ -896,11 +897,13 @@ goto xmsskip;//0000
 			,ParmStringsexmm) == 0)
 			goto xmsskip;				// param NOXMS
 	}
-	if(MML_CheckForXMS(gvar))
+	if(MML_CheckForXMS())
 	{
 		MML_SetupXMS(gvar);					// allocate as many UMBs as possible
 	}
 
+	}
+#endif
 //
 // allocate the misc buffer
 //
@@ -934,8 +937,16 @@ void MM_Shutdown(global_game_variables_t *gvar)
 #ifdef __BORLANDC__
 	free(gvar->mm.nearheap);//	printf("		near freed\n");
 #endif
+#ifdef __DEBUG__
+	if(!dbg_debugpm) {
+#endif
+#ifndef __16_PM__
 	if(MML_CheckForEMS()){ MML_ShutdownEMS(gvar); }//printf("		EMS freed\n"); }
-	if(MML_CheckForXMS(gvar)){ MML_ShutdownXMS(gvar); }//printf("		XMS freed\n"); }
+	if(MML_CheckForXMS()){ MML_ShutdownXMS(gvar); }//printf("		XMS freed\n"); }
+#endif
+#ifdef __DEBUG__
+	}
+#endif
 }
 
 //==========================================================================
@@ -963,10 +974,12 @@ void MM_GetPtr (memptr *baseptr, dword size, global_game_variables_t *gvar)
 	gvar->mm.mmnew->length = needed;
 	gvar->mm.mmnew->useptr = baseptr;
 	//if(gvar->mm.mmnew->useptr==NULL){
-#ifdef __DEBUG__
-		printf("baseptr=%04x	", baseptr); printf("useptr=%04x\n", gvar->mm.mmnew->useptr);
-		printf("*baseptr=%04x	", *baseptr); printf("*useptr=%04x\n", *(gvar->mm.mmnew->useptr));
-		printf("*baseptr=%Fp	", *baseptr); printf("*useptr=%Fp\n", *(gvar->mm.mmnew->useptr));
+#ifdef __DEBUG_MM__
+		printf("MM_GetPtr\n");
+		//%04x
+		printf("	baseptr=%Fp	", baseptr); printf("useptr=%Fp\n", gvar->mm.mmnew->useptr);
+		printf("	*baseptr=%Fp	", *baseptr); printf("*useptr=%Fp\n", *(gvar->mm.mmnew->useptr));
+		printf("	&baseptr=%Fp	", &baseptr); printf("&useptr=%Fp\n", &(gvar->mm.mmnew->useptr));
 #endif
 	//exit(-5); }
 	gvar->mm.mmnew->attributes = BASEATTRIBUTES;
@@ -1106,6 +1119,7 @@ void MM_FreePtr(memptr *baseptr, global_game_variables_t *gvar)
 =====================
 */
 
+
 void MM_SetPurge(memptr *baseptr, int purge, global_game_variables_t *gvar)
 {
 	//huge mmblocktype huge *start;
@@ -1600,25 +1614,29 @@ dword MM_TotalFree(global_game_variables_t *gvar)
 void MM_Report_(global_game_variables_t *gvar)
 {
 	printf("========================================\n");
-	printf("		MM_Report\n");
+	printf("		MM_Report_\n");
 	printf("========================================\n");
 	if(MML_CheckForEMS())
 	{
-		printf("	LIMEMS\n");
-		printf("		EMM v%x.%x available\n", gvar->mm.EMSVer>>4,gvar->mm.EMSVer&0x0F);
-		printf("		totalEMSpages:	%u	", gvar->mm.totalEMSpages); printf("freeEMSpages:	%u\n", gvar->mm.freeEMSpages);
-		printf("		EMSpageframe:	%x\n", gvar->mm.EMSpageframe);
+		printf("	%cLIMEMS	%u\n", 0xC9, gvar->pm.emm.EMSPresent);
+		printf("	%c%cEMM v%x.%x available\n", 0xC7, 0xC4, gvar->pm.emm.EMSVer>>4,gvar->pm.emm.EMSVer&0x0F);
+		printf("	%c%ctotalEMSpages:	%u	", 0xC7, 0xC4, gvar->pm.emm.totalEMSpages); printf("freeEMSpages:	%u\n", gvar->pm.emm.freeEMSpages);
+		printf("	%c%cEMSPageFrame:	%04x\n", 0xC7, 0xC4, gvar->pm.emm.EMSPageFrame);
+		printf("	%c%cEMSmem:	%lu\n", 0xD3, 0xC4, gvar->mmi.EMSmem);
 	}
-	if(MML_CheckForXMS(gvar))
+	if(MML_CheckForXMS())
 	{
-		printf("	XMS\n");
-		printf("		XMSaddr:	%X\n", *XMSaddr);
+		printf("	%cXMS	%u\n", 0xC9, gvar->pm.xmm.XMSPresent);
+		printf("	%c%cXMS v%x.%x available\n", 0xC7, 0xC4, XMSVer>>8,XMSVer&0x0F);
+		printf("	%c%cXMSDriver:	%Fp\n", 0xC7, 0xC4, XMSDriver);
+		printf("	%c%cXMSHandle:	%04x\n", 0xC7, 0xC4, gvar->pm.xmm.XMSHandle);
+		printf("	%c%cXMSmem:	%lu\n", 0xD3, 0xC4, gvar->mmi.XMSmem);
 	}
-	printf("near:	%lu	", gvar->mmi.nearheap); printf("far:	%lu\n", gvar->mmi.farheap); if(MML_CheckForEMS())
-	printf("EMSmem:	%lu	", gvar->mmi.EMSmem); if(MML_CheckForXMS(gvar)) printf("XMSmem:	%lu", gvar->mmi.XMSmem); printf("\n");
+	printf("	%cConv.	%u\n", 0xC9, gvar->pm.mm.MainPresent); DebugMemory_(gvar, 0);
 	//printf("mainmem:	%lu\n", gvar->mmi.mainmem);
-	printf("Total convmem:	%lu	", gvar->mmi.mainmem); printf("TotalFree:	%lu	", MM_TotalFree(gvar)); printf("TotalUsed:	%lu\n", gvar->mmi.mainmem+gvar->mmi.EMSmem+gvar->mmi.XMSmem+gvar->mmi.XMSmem);
-	printf("			UnusedMemory:	%lu\n", MM_UnusedMemory(gvar));
+	//printf("Total convmem:	%lu	", gvar->mmi.mainmem); printf("TotalFree:	%lu	", MM_TotalFree(gvar)+gvar->mmi.EMSmem+gvar->mmi.XMSmem+gvar->mmi.XMSmem); printf("TotalUsed:	%lu\n", gvar->mmi.mainmem);
+	//printf("			UnusedMemory:	%lu\n", MM_UnusedMemory(gvar));
+	printf("nearheap:	%lu		", gvar->mmi.nearheap); printf("farheap:	%lu\n", gvar->mmi.farheap);
 }
 
 //==========================================================================
@@ -1788,6 +1806,15 @@ void MM_FreeBlock(mmblocktype *x, global_game_variables_t *gvar)
 	gvar->mm.mmfree=x;
 }*/
 
+void xms_call(byte v, global_game_variables_t *gvar)
+{
+	dword XMSDriver = gvar->pm.xmm.XMSDriver;
+	__asm {
+		mov	ah,[v]
+		call [DWORD PTR XMSDriver]
+	}
+}
+
 /*void MM_seguin(void)
 {
 	__asm {