X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_pm.c;h=55a7d3710e96933296e417961cfa348c72b30aac;hb=050d28da3358d5c1434fda542ec11adbee182ea5;hp=7ecab1eb418ee35fb6ef1d30a77ea3e6c53f51c0;hpb=fb900d77df687bfa549995e15a762017c381e552;p=16.git

diff --git a/src/lib/16_pm.c b/src/lib/16_pm.c
index 7ecab1eb..55a7d371 100755
--- a/src/lib/16_pm.c
+++ b/src/lib/16_pm.c
@@ -1,5 +1,5 @@
 /* Project 16 Source Code~
- * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover
+ * Copyright (C) 2012-2017 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover
  *
  * This file is part of Project 16.
  *
@@ -29,10 +29,6 @@
 #include "src/lib/16_pm.h"
 #pragma hdrstop
 
-#ifdef __DEBUG__
-boolean dbg_debugpm=0;
-#endif
-
 //	Main Mem specific variables
 	//boolean			MainPresent;
 /*	memptr			MainMemPages[PMMaxMainMem];
@@ -88,7 +84,9 @@ static union REGS CPURegs;
 #define _DH CPURegs.h.dh
 #define _DL CPURegs.h.dl
 
+#ifdef __WATCOMC__
 #define geninterrupt(n) int86(n,&CPURegs,&CPURegs);
+#endif
 
 static	char		*ParmStrings[] = {"nomain","noems","noxms",nil};
 
@@ -141,7 +139,7 @@ PML_MapEMS(word logical, byte physical, global_game_variables_t *gvar)
 		strcpy(str,"MM_MapEMS: EMS error ");
 		MM_EMSerr(str, err);
 		printf("%s\n",str);
-		Quit("PML_MapEMS: Page mapping failed\n");
+		Quit ("PML_MapEMS: Page mapping failed\n");
 		return err;
 	}
 	return 0;
@@ -155,49 +153,28 @@ PML_MapEMS(word logical, byte physical, global_game_variables_t *gvar)
 //		If there's more than our minimum (2 pages) available, allocate it (up
 //			to the maximum we need)
 //
+//	Please call MML_CheckForEMS() before calling this function.
+//	MML_CheckForEMS is not local despite the name wwww.
+//
 
 boolean
 PML_StartupEMS(global_game_variables_t *gvar)
 {
 	int		i;
-	//long	size;
+#ifdef __PM__NOHOGEMS__
+	long	size;
+#endif
 	byte	err=0, str[64];
 
 	boolean errorflag=false;
-	static char	emmname[] = "EMMXXXX0";	//fix by andrius4669
-	unsigned int EMSVer = 0;
-	unsigned	totalEMSpages,freeEMSpages,EMSPageFrame,EMSHandle=0,EMSAvail=0;
-	totalEMSpages = freeEMSpages = EMSPageFrame = 0;
+	unsigned	EMSVer;
+	unsigned	totalEMSpages,freeEMSpages,EMSPageFrame,EMSHandle,EMSAvail;
+	totalEMSpages = freeEMSpages = EMSPageFrame = EMSHandle = EMSAvail = EMSVer = 0;	// set all to 0~
 	gvar->pm.emm.EMSPresent = false;			// Assume that we'll fail
-	gvar->pm.emm.EMSAvail = 0;
-	gvar->mmi.EMSmem = 0;
+	gvar->pm.emm.EMSAvail = gvar->mmi.EMSmem = 0;
 
 	__asm {
-		mov	dx,OFFSET emmname	//fix by andrius4669
-		mov	ax,0x3d00
-		int	EMM_INT		// try to open EMMXXXX0 device
-		jc	error1
-
-		mov	bx,ax
-		mov	ax,0x4400
-
-		int	EMM_INT		// get device info
-		jc	error1
-
-		and	dx,0x80
-		jz	error1
-
-		mov	ax,0x4407
-
-		int	EMM_INT		// get status
-		jc	error1
-		or	al,al
-		jz	error1
-
-		mov	ah,0x3e
-		int	EMM_INT		// close handle
-		jc	error1
-
+		//MML_CheckForEMS() takes care of what the code did here
 		mov	ah,EMS_STATUS
 		int	EMS_INT
 		jc	error1			// make sure EMS hardware is present
@@ -206,7 +183,7 @@ PML_StartupEMS(global_game_variables_t *gvar)
 		int	EMS_INT			// only work on EMS 3.2 or greater (silly, but...)
 		or	ah,ah
 		jnz	error1
-		mov	[EMSVer],ax		//	set EMSVer
+		mov	[EMSVer],ax		// set EMSVer
 		cmp	al,0x32			// only work on ems 3.2 or greater
 		jb	error1
 
@@ -227,7 +204,7 @@ PML_StartupEMS(global_game_variables_t *gvar)
 		mov	[totalEMSpages],dx
 		mov	[freeEMSpages],bx
 		mov	[EMSAvail],bx
-		jmp End1
+		jmp	End1
 #ifdef __BORLANDC__
 	}
 #endif
@@ -237,7 +214,7 @@ PML_StartupEMS(global_game_variables_t *gvar)
 #endif
 		mov	err,ah
 		mov	errorflag,1
-		jmp End1
+		jmp	End1
 #ifdef __BORLANDC__
 	}
 #endif
@@ -246,7 +223,7 @@ End1:
 #ifdef __WATCOMC__
 	}
 #endif
-/*
+#ifdef __PM__NOHOGEMS__
 	if(errorflag==false)
 	{
 		// Don't hog all available EMS
@@ -257,7 +234,7 @@ End1:
 			gvar->pm.emm.EMSAvail = size / EMSPageSize;
 		}
 	}
-*/
+#endif
 	__asm {
 		mov	ah,EMS_ALLOCPAGES
 		mov	bx,[EMSAvail];
@@ -275,31 +252,26 @@ End1:
 #endif
 		mov	err,ah
 		mov	errorflag,1
-		jmp End2
+		jmp	End2
 #ifdef __BORLANDC__
-	}
+	}//end of assembly
 #endif
 End2:
 #ifdef __WATCOMC__
-	}
+	}//end of assembly
 #endif
-
-	if(errorflag==false)
-	{
-	gvar->mmi.EMSmem = EMSAvail * (dword)EMSPageSize;
-
-	// Initialize EMS mapping cache
-	for (i = 0;i < EMSFrameCount;i++)
-		gvar->pm.emm.EMSList[i].baseEMSPage = -1;
-
-	}
-	else
+	if(errorflag==true)
 	{
 		strcpy(str,"PML_StartupEMS: EMS error ");
 		MM_EMSerr(str, err);
 		printf("%s\n",str);
 		return(gvar->pm.emm.EMSPresent);
 	}
+	gvar->mmi.EMSmem = EMSAvail * (dword)EMSPageSize;
+
+	// Initialize EMS mapping cache
+	for (i = 0;i < EMSFrameCount;i++)
+		gvar->pm.emm.EMSList[i].baseEMSPage = -1;
 
 	gvar->pm.emm.EMSPresent = true;			// We have EMS
 	gvar->pm.emm.EMSPageFrame = EMSPageFrame;
@@ -354,7 +326,7 @@ PML_ShutdownEMS(global_game_variables_t *gvar)
 			strcpy(str,"PML_ShutdownEMS: Error freeing EMS ");
 			MM_EMSerr(str, err);
 			printf("%s\n",str);
-			Quit("PML_ShutdownEMS: Error freeing EMS\n");
+			Quit ("PML_ShutdownEMS: Error freeing EMS\n");
 			//return;
 		}
 	}
@@ -534,8 +506,7 @@ PML_XMSCopy(boolean toxms,byte far *addr,word xmspage,word length, global_game_v
 
 	if (!addr)
 	{
-		Quit("PML_XMSCopy: zero address\n");
-		//return;
+		Quit ("PML_XMSCopy: zero address\n");
 	}
 
 	xoffset = (dword)xmspage * PMPageSize;
@@ -556,7 +527,7 @@ PML_XMSCopy(boolean toxms,byte far *addr,word xmspage,word length, global_game_v
 	}
 	if (!_AX)
 	{
-		Quit("PML_XMSCopy: Error on copy");
+		Quit ("PML_XMSCopy: Error on copy");
 		//return;
 	}
 }
@@ -623,7 +594,7 @@ PML_ShutdownXMS(global_game_variables_t *gvar)
 #endif
 		if(errorflag==true)
 		{
-			Quit("PML_ShutdownXMS: Error freeing XMS");
+			Quit ("PML_ShutdownXMS: Error freeing XMS");
 			//return;
 		}
 	}
@@ -649,8 +620,10 @@ PM_SetMainMemPurge(int level, global_game_variables_t *gvar)
 	for (i = 0;i < PMMaxMainMem;i++)
 	{
 #ifdef __DEBUG_PM__
+#ifdef __DEBUG_PM_MAIN__
 		printf("PM_SetMainMemPurge()	info of gvar->pm.mm.MainMemPages[i]\n");
 		printf("&	%Fp,	%Fp\n", &gvar->pm.mm.MainMemPages[i],	&(gvar->pm.mm.MainMemPages[i]));
+#endif
 #endif
 		if (gvar->pm.mm.MainMemPages[i])
 			MM_SetPurge(&(gvar->pm.mm.MainMemPages[i]),level, gvar);
@@ -658,7 +631,7 @@ PM_SetMainMemPurge(int level, global_game_variables_t *gvar)
 
 	else
 	{
-		Quit("MainPresent IS NULL\n");
+		Quit ("MainPresent IS NULL\n");
 	}
 }
 
@@ -767,7 +740,7 @@ PML_StartupMainMem(global_game_variables_t *gvar)
 		gvar->mm.mmerror = false;
 	if (gvar->pm.mm.MainPagesAvail < PMMinMainMem)
 	{
-		Quit("PM_SetupMainMem: Not enough main memory");
+		Quit ("PM_SetupMainMem: Not enough main memory");
 		//return;
 	}
 	gvar->pm.mm.MainPresent = true;
@@ -803,22 +776,22 @@ PML_ReadFromFile(byte far *buf,long offset,word length, global_game_variables_t
 {
 	if (!buf)
 	{
-		Quit("PML_ReadFromFile: Null pointer");
+		Quit ("PML_ReadFromFile: Null pointer");
 		//return;
 	}
 	if (!offset)
 	{
-		Quit("PML_ReadFromFile: Zero offset");
+		Quit ("PML_ReadFromFile: Zero offset");
 		//return;
 	}
 	if (lseek(gvar->pm.fi.PageFile,offset,SEEK_SET) != offset)
 	{
-		Quit("PML_ReadFromFile: Seek failed");
+		Quit ("PML_ReadFromFile: Seek failed");
 		//return;
 	}
 	if (!CA_FarRead(gvar->pm.fi.PageFile,buf,length, gvar))
 	{
-		Quit("PML_ReadFromFile: Read failed");
+		Quit ("PML_ReadFromFile: Read failed");
 		//return;
 	}
 }
@@ -831,8 +804,7 @@ PML_OpenPageFile(global_game_variables_t *gvar)
 {
 	int				i;
 	long			size;
-				//__SEGA buf;
-	memptr		buf;
+	void			_seg *buf;
 	dword		far *offsetptr;
 	word			far *lengthptr;
 	PageListStruct	far *page;
@@ -840,7 +812,7 @@ PML_OpenPageFile(global_game_variables_t *gvar)
 	gvar->pm.fi.PageFile = open(gvar->pm.fi.PageFileName,O_RDONLY + O_BINARY);
 	if (gvar->pm.fi.PageFile == -1)
 	{
-		Quit("PML_OpenPageFile: Unable to open page file");
+		Quit ("PML_OpenPageFile: Unable to open page file");
 		//return;
 	}
 
@@ -851,36 +823,36 @@ PML_OpenPageFile(global_game_variables_t *gvar)
 
 	// Allocate and clear the page list
 	gvar->pm.PMNumBlocks = gvar->pm.fi.ChunksInFile;
-	MM_GetPtr((memptr *)gvar->pm.PMSegPages, sizeof(PageListStruct) * (gvar->pm.PMNumBlocks), gvar);
-	MM_SetLock((memptr *)gvar->pm.PMSegPages,true, gvar);
+	MM_GetPtr((memptr *)&gvar->pm.PMSegPages, sizeof(PageListStruct) * (gvar->pm.PMNumBlocks), gvar);
+	MM_SetLock((memptr *)&gvar->pm.PMSegPages,true, gvar);
 	gvar->pm.PMPages = (PageListStruct far *)gvar->pm.PMSegPages;
 	_fmemset(gvar->pm.PMPages,0,sizeof(PageListStruct) * gvar->pm.PMNumBlocks);
 
 	// Read in the chunk offsets
 	size = sizeof(dword) * gvar->pm.fi.ChunksInFile;
-	MM_GetPtr(&buf, size, gvar);
+	MM_GetPtr((memptr *)&buf, size, gvar);
 	if (!CA_FarRead(gvar->pm.fi.PageFile,(byte far *)buf,size, gvar))
 	{
-		Quit("PML_OpenPageFile: Offset read failed");
+		Quit ("PML_OpenPageFile: Offset read failed");
 		//return;
 	}
 	offsetptr = (dword far *)buf;
 	for (i = 0,page = gvar->pm.PMPages;i < gvar->pm.fi.ChunksInFile;i++,page++)
 		page->offset = *offsetptr++;
-	MM_FreePtr(&buf, gvar);
+	MM_FreePtr((memptr *)&buf, gvar);
 
 	// Read in the chunk lengths
 	size = sizeof(word) * gvar->pm.fi.ChunksInFile;
 	MM_GetPtr(&buf,size, gvar);
 	if (!CA_FarRead(gvar->pm.fi.PageFile,(byte far *)buf,size, gvar))
 	{
-		Quit("PML_OpenPageFile: Length read failed");
+		Quit ("PML_OpenPageFile: Length read failed");
 		//return;
 	}
 	lengthptr = (word far *)buf;
 	for (i = 0,page = gvar->pm.PMPages;i < gvar->pm.fi.ChunksInFile;i++,page++)
 		page->length = *lengthptr++;
-	MM_FreePtr(&buf, gvar);
+	MM_FreePtr((memptr *)&buf, gvar);
 }
 
 //
@@ -893,8 +865,8 @@ PML_ClosePageFile(global_game_variables_t *gvar)
 		close(gvar->pm.fi.PageFile);
 	if (gvar->pm.PMSegPages)
 	{
-		MM_SetLock((memptr)gvar->pm.PMSegPages,false, gvar);
-		MM_FreePtr((memptr)gvar->pm.PMSegPages, gvar);
+		MM_SetLock((memptr *)&gvar->pm.PMSegPages,false, gvar);
+		MM_FreePtr((void _seg *)&gvar->pm.PMSegPages, gvar);
 	}
 }
 
@@ -951,7 +923,7 @@ PML_GetEMSAddress(int page,PMLockType lock, global_game_variables_t *gvar)
 	}
 
 	if (emspage == -1)
-		Quit("PML_GetEMSAddress: EMS find failed");
+		Quit ("PML_GetEMSAddress: EMS find failed");
 
 	gvar->pm.emm.EMSList[emspage].lastHit = gvar->pm.PMFrameCount;
 	offset = emspage * EMSPageSizeSeg;
@@ -1020,7 +992,7 @@ PML_GiveLRUPage(boolean mainonly, global_game_variables_t *gvar)
 	}
 
 	if (lru == -1)
-		Quit("PML_GiveLRUPage: LRU Search failed");
+		Quit ("PML_GiveLRUPage: LRU Search failed");
 	return(lru);
 }
 
@@ -1075,7 +1047,7 @@ PML_PutPageInXMS(int pagenum, global_game_variables_t *gvar)
 	{
 		usexms = PML_GiveLRUXMSPage(gvar);
 		if (usexms == -1)
-			Quit("PML_PutPageInXMS: No XMS LRU");
+			Quit ("PML_PutPageInXMS: No XMS LRU");
 		page->xmsPage = gvar->pm.PMPages[usexms].xmsPage;
 		gvar->pm.PMPages[usexms].xmsPage = -1;
 	}
@@ -1093,16 +1065,16 @@ PML_TransferPageSpace(int orig,int new, global_game_variables_t *gvar)
 	PageListStruct	far *origpage,far *newpage;
 
 	if (orig == new)
-		Quit("PML_TransferPageSpace: Identity replacement");
+		Quit ("PML_TransferPageSpace: Identity replacement");
 
 	origpage = &gvar->pm.PMPages[orig];
 	newpage = &gvar->pm.PMPages[new];
 
 	if (origpage->locked != pml_Unlocked)
-		Quit("PML_TransferPageSpace: Killing locked page");
+		Quit ("PML_TransferPageSpace: Killing locked page");
 
 	if ((origpage->emsPage == -1) && (origpage->mainPage == -1))
-		Quit("PML_TransferPageSpace: Reusing non-existent page");
+		Quit ("PML_TransferPageSpace: Reusing non-existent page");
 
 	// Copy page that's about to be purged into XMS
 	PML_PutPageInXMS(orig, gvar);
@@ -1118,7 +1090,7 @@ PML_TransferPageSpace(int orig,int new, global_game_variables_t *gvar)
 	origpage->mainPage = origpage->emsPage = -1;
 
 	if (!addr)
-		Quit("PML_TransferPageSpace: Zero replacement");
+		Quit ("PML_TransferPageSpace: Zero replacement");
 
 	return(addr);
 }
@@ -1159,10 +1131,10 @@ PML_GetAPageBuffer(int pagenum,boolean mainonly, global_game_variables_t *gvar)
 			}
 		}
 		if (n == -1)
-			Quit("PML_GetPageBuffer: MainPagesAvail lied");
+			Quit ("PML_GetPageBuffer: MainPagesAvail lied");
 		addr = gvar->pm.mm.MainMemPages[n];
 		if (!addr)
-			Quit("PML_GetPageBuffer: Purged main block");
+			Quit ("PML_GetPageBuffer: Purged main block");
 		page->mainPage = n;
 		gvar->pm.MainPagesUsed++;
 	}
@@ -1170,7 +1142,7 @@ PML_GetAPageBuffer(int pagenum,boolean mainonly, global_game_variables_t *gvar)
 		addr = PML_TransferPageSpace(PML_GiveLRUPage(mainonly, gvar),pagenum, gvar);
 
 	if (!addr)
-		Quit("PML_GetPageBuffer: Search failed");
+		Quit ("PML_GetPageBuffer: Search failed");
 	return(addr);
 }
 
@@ -1196,7 +1168,7 @@ PML_GetPageFromXMS(int pagenum,boolean mainonly, global_game_variables_t *gvar)
 		gvar->pm.xmm.XMSProtectPage = pagenum;
 		checkaddr = PML_GetAPageBuffer(pagenum,mainonly, gvar);
 		if (FP_OFF(checkaddr))
-			Quit("PML_GetPageFromXMS: Non segment pointer");
+			Quit ("PML_GetPageFromXMS: Non segment pointer");
 		addr = (memptr)FP_SEG(checkaddr);
 		PML_CopyFromXMS(addr,page->xmsPage,page->length, gvar);
 		gvar->pm.xmm.XMSProtectPage = -1;
@@ -1234,9 +1206,9 @@ PM_GetPage(int pagenum, global_game_variables_t *gvar)
 	memptr	result;
 
 	if (pagenum >= gvar->pm.fi.ChunksInFile)
-		Quit("PM_GetPage: Invalid page request");
+		Quit ("PM_GetPage: Invalid page request");
 
-#ifdef __DEBUG_2__	// for debugging
+//#ifdef __DEBUG_2__	// for debugging
 	__asm {
 		mov	dx,STATUS_REGISTER_1
 		in	al,dx
@@ -1246,7 +1218,7 @@ PM_GetPage(int pagenum, global_game_variables_t *gvar)
 		mov	al,10	// bright green
 		out	dx,al
 	}
-#endif
+//#endif
 
 	if (!(result = PM_GetPageAddress(pagenum, gvar)))
 	{
@@ -1264,7 +1236,7 @@ if (!gvar->pm.PMPages[pagenum].offset)	// JDC: sparse page
 	}
 	gvar->pm.PMPages[pagenum].lastHit =  gvar->pm.PMFrameCount;
 
-#ifdef __DEBUG_2__	// for debugging
+//#ifdef __DEBUG_2__	// for debugging
 	__asm{
 		mov	dx,STATUS_REGISTER_1
 		in	al,dx
@@ -1275,7 +1247,8 @@ if (!gvar->pm.PMPages[pagenum].offset)	// JDC: sparse page
 		out	dx,al
 		mov	al,0x20	// normal
 		out	dx,al
-#endif
+	}
+//#endif
 
 	return(result);
 }
@@ -1292,7 +1265,7 @@ void
 PM_SetPageLock(int pagenum,PMLockType lock, global_game_variables_t *gvar)
 {
 	if (pagenum < gvar->pm.fi.PMSoundStart)
-		Quit("PM_SetPageLock: Locking/unlocking non-sound page");
+		Quit ("PM_SetPageLock: Locking/unlocking non-sound page");
 
 	gvar->pm.PMPages[pagenum].locked = lock;
 }
@@ -1378,7 +1351,7 @@ PM_Preload(boolean (*update)(word current,word total), global_game_variables_t *
 		;
 		addr = PM_GetPage(oogypage, gvar);
 		if (!addr)
-			Quit("PM_Preload: XMS buffer failed");
+			Quit ("PM_Preload: XMS buffer failed");
 
 		while (xmstotal)
 		{
@@ -1392,9 +1365,9 @@ PM_Preload(boolean (*update)(word current,word total), global_game_variables_t *
 
 			p->xmsPage = gvar->pm.XMSPagesUsed++;
 			if (gvar->pm.XMSPagesUsed > gvar->pm.xmm.XMSPagesAvail)
-				Quit("PM_Preload: Exceeded XMS pages");
+				Quit ("PM_Preload: Exceeded XMS pages");
 			if (p->length > PMPageSize)
-				Quit("PM_Preload: Page too long");
+				Quit ("PM_Preload: Page too long");
 
 			PML_ReadFromFile((byte far *)addr,p->offset,p->length, gvar);
 			PML_CopyToXMS((byte far *)addr,p->xmsPage,p->length, gvar);
@@ -1447,7 +1420,7 @@ PM_NextFrame(global_game_variables_t *gvar)
 		{
 			char buf[40];
 			sprintf(buf,"PM_NextFrame: Page %d is locked",i);
-			Quit(buf);
+			Quit (buf);
 		}
 	}
 //#endif
@@ -1508,7 +1481,7 @@ PM_Startup(global_game_variables_t *gvar)
 	if (gvar->pm.PMStarted)
 		return;
 
-	//strcpy(&(gvar->pm.fi.PageFileName), "VSWAP.");
+	//0000+=+=strcpy(&(gvar->pm.fi.PageFileName), "VSWAP.");
 
 	nomain = noems = noxms = false;
 	for (i = 1;i < _argc;i++)
@@ -1538,7 +1511,7 @@ PM_Startup(global_game_variables_t *gvar)
 
 	if (!gvar->pm.mm.MainPresent && !gvar->pm.emm.EMSPresent && !gvar->pm.xmm.XMSPresent)
 	{
-		Quit("PM_Startup: No main or EMS\n");
+		Quit ("PM_Startup: No main or EMS\n");
 		//return;
 	}
 
@@ -1559,7 +1532,7 @@ PM_Shutdown(global_game_variables_t *gvar)
 	if (!gvar->pm.PMStarted)
 		return;
 
-	//PML_ClosePageFile(gvar);
+	//0000+=+=PML_ClosePageFile(gvar);
 
 	PML_ShutdownMainMem(gvar);
 }