X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_pm.c;h=4cf503968b292a4b375c229e4e08e926758c08ad;hb=c11666ac6f605f561e9c6c6f2bba3bccea4a7b18;hp=75ad2aae103f2034078d45e44b4de8700af9159b;hpb=f3c21c71444277afd8389f577439ab655620ce51;p=16.git

diff --git a/src/lib/16_pm.c b/src/lib/16_pm.c
index 75ad2aae..4cf50396 100755
--- a/src/lib/16_pm.c
+++ b/src/lib/16_pm.c
@@ -29,10 +29,6 @@
 #include "src/lib/16_pm.h"
 #pragma hdrstop
 
-#ifdef __DEBUG__
-boolean debugpm=0;
-#endif
-
 //	Main Mem specific variables
 	//boolean			MainPresent;
 /*	memptr			MainMemPages[PMMaxMainMem];
@@ -48,7 +44,8 @@ boolean debugpm=0;
 //	XMS specific variables
 	//boolean			XMSPresent;
 	//word			gvar->pm.xmm.XMSAvail,gvar->pm.xmm.XMSPagesAvail,gvar->pm.xmm.XMSHandle;
-	word		XMSDriver;
+	dword			XMSDriver;	//hard to put in gvar
+	word				XMSVer;	//hard to put in gvar
 /*	int				gvar->pm.xmm.XMSProtectPage = -1;
 
 //	File specific variables
@@ -69,6 +66,28 @@ boolean debugpm=0;
 	PageListStruct	far *gvar->pm.PMPages,
 					_seg *gvar->pm.PMSegPages;*/
 
+static union REGS CPURegs;
+
+#define _AX CPURegs.x.ax
+#define _BX CPURegs.x.bx
+#define _CX CPURegs.x.cx
+#define _DX CPURegs.x.dx
+
+#define _SI CPURegs.x.si
+
+#define _AH CPURegs.h.ah
+#define _AL CPURegs.h.al
+#define _BH CPURegs.h.bh
+#define _BL CPURegs.h.bl
+#define _CH CPURegs.h.ch
+#define _CL CPURegs.h.cl
+#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};
 
 /////////////////////////////////////////////////////////////////////////////
@@ -83,11 +102,11 @@ static	char		*ParmStrings[] = {"nomain","noems","noxms",nil};
 byte
 PML_MapEMS(word logical, byte physical, global_game_variables_t *gvar)
 {
-	byte	str[160];
+	byte	err=0, str[160];
 	unsigned	EMShandle;
-	byte err;
+	//int	i;
+
 	boolean	errorflag=false;
-	int	i;
 	EMShandle=gvar->pm.emm.EMSHandle;
 
 	__asm {
@@ -97,12 +116,12 @@ PML_MapEMS(word logical, byte physical, global_game_variables_t *gvar)
 		mov	dx,EMShandle
 		int	EMS_INT
 		or	ah,ah
-		jnz	error
-		jmp End
+		jnz	errorme
+		jmp	Endme
 #ifdef __BORLANDC__
 	}
 #endif
-		error:
+		errorme:
 #ifdef __BORLANDC__
 	__asm {
 #endif
@@ -111,7 +130,7 @@ PML_MapEMS(word logical, byte physical, global_game_variables_t *gvar)
 #ifdef __BORLANDC__
 	}
 #endif
-		End:
+		Endme:
 #ifdef __WATCOMC__
 	}
 #endif
@@ -120,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 (gvar, "PML_MapEMS: Page mapping failed\n");
 		return err;
 	}
 	return 0;
@@ -139,14 +158,13 @@ boolean
 PML_StartupEMS(global_game_variables_t *gvar)
 {
 	int		i;
-	long	size;
-	byte	str[64];
-	byte err;
+	//long	size;
+	byte	err=0, str[64];
 
-	boolean errorflag=0;
+	boolean errorflag=false;
 	static char	emmname[] = "EMMXXXX0";	//fix by andrius4669
 	unsigned int EMSVer = 0;
-	unsigned	totalEMSpages,freeEMSpages,EMSPageFrame,EMSHandle,EMSAvail;
+	unsigned	totalEMSpages,freeEMSpages,EMSPageFrame,EMSHandle=0,EMSAvail=0;
 	totalEMSpages = freeEMSpages = EMSPageFrame = 0;
 	gvar->pm.emm.EMSPresent = false;			// Assume that we'll fail
 	gvar->pm.emm.EMSAvail = 0;
@@ -155,13 +173,13 @@ PML_StartupEMS(global_game_variables_t *gvar)
 	__asm {
 		mov	dx,OFFSET emmname	//fix by andrius4669
 		mov	ax,0x3d00
-		int	EMS_INT		// try to open EMMXXXX0 device
+		int	EMM_INT		// try to open EMMXXXX0 device
 		jc	error1
 
 		mov	bx,ax
 		mov	ax,0x4400
 
-		int	EMS_INT		// get device info
+		int	EMM_INT		// get device info
 		jc	error1
 
 		and	dx,0x80
@@ -169,13 +187,13 @@ PML_StartupEMS(global_game_variables_t *gvar)
 
 		mov	ax,0x4407
 
-		int	EMS_INT		// get status
+		int	EMM_INT		// get status
 		jc	error1
 		or	al,al
 		jz	error1
 
 		mov	ah,0x3e
-		int	EMS_INT		// close handle
+		int	EMM_INT		// close handle
 		jc	error1
 
 		mov	ah,EMS_STATUS
@@ -266,7 +284,7 @@ End2:
 
 	if(errorflag==false)
 	{
-	gvar->mmi.EMSmem += gvar->pm.emm.EMSAvail * (long)EMSPageSize;
+	gvar->mmi.EMSmem = EMSAvail * (dword)EMSPageSize;
 
 	// Initialize EMS mapping cache
 	for (i = 0;i < EMSFrameCount;i++)
@@ -299,10 +317,9 @@ void
 PML_ShutdownEMS(global_game_variables_t *gvar)
 {
 	word EMSHandle;
-	byte err;
-	byte	str[64];
-	boolean errorflag=false;
+	byte err=0, str[64];
 
+	boolean errorflag=false;
 	EMSHandle=gvar->pm.emm.EMSHandle;
 
 	if (gvar->pm.emm.EMSPresent)
@@ -311,22 +328,22 @@ PML_ShutdownEMS(global_game_variables_t *gvar)
 			mov	ah,EMS_FREEPAGES
 			mov	dx,[EMSHandle]
 			int	EMS_INT
-			jc	errors
-			jmp	Ends
+			jc	errores
+			jmp	Endes
 #ifdef __BORLANDC__
 		}
 #endif
-			errors:
+			errores:
 #ifdef __BORLANDC__
 		__asm {
 #endif
 			mov	err,ah
 			mov	errorflag,1
-			jmp Ends
+			jmp	Endes
 #ifdef __BORLANDC__
 		}
 #endif
-		Ends:
+			Endes:
 #ifdef __WATCOMC__
 		}
 #endif
@@ -335,7 +352,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 (gvar, "PML_ShutdownEMS: Error freeing EMS\n");
 			//return;
 		}
 	}
@@ -356,45 +373,143 @@ PML_ShutdownEMS(global_game_variables_t *gvar)
 boolean
 PML_StartupXMS(global_game_variables_t *gvar)
 {
+//TODO: translate the _REG into working assembly
+//#define STARTUPXMSASM
+	byte err;
+	word XMSAvail, XMSHandle;//, XMSVer;
+	boolean errorflag=false;
+	word e=0;
 	gvar->pm.xmm.XMSPresent = false;					// Assume failure
-	gvar->pm.xmm.XMSAvail = 0;
-
-	_AX=0x4300;
-	geninterrupt(XMS_INT);         				// Check for presence of XMS driver
-	if (_AL != 0x80)
-		goto error;
-
+	XMSAvail = gvar->mmi.XMSmem = 0;
 
 	__asm {
+		mov	ax,0x4300
+		int	XMS_INT         				// Check for presence of XMS driver
+		cmp	al,0x80
+		jne	error1
+		mov	e,1
+
 		mov	ax,0x4310
 		int	XMS_INT							// Get address of XMS driver
 		mov	[WORD PTR XMSDriver],bx
 		mov	[WORD PTR XMSDriver+2],es		// function pointer to XMS driver
-	}
 
+		mov	ah,XMS_VERSION
+		call	[DWORD PTR XMSDriver]						//; Get XMS Version Number
+		mov	[XMSVer],ax
+		mov	e,2
+
+#ifdef STARTUPXMSASM
+		mov	ah,XMS_QUERYFREE			// Find out how much XMS is available
+		call	[DWORD PTR XMSDriver]
+		mov	XMSAvail,ax
+		or	ax,ax				// AJR: bugfix 10/8/92
+		jz	error1
+		mov	e,3
+#endif
+		jmp	End1
+#ifdef __BORLANDC__
+	}
+#endif
+	error1:
+#ifdef __BORLANDC__
+	__asm {
+#endif
+		mov	err,bl
+		mov	errorflag,1
+		jmp End1
+#ifdef __BORLANDC__
+	}
+#endif
+End1:
+#ifdef __WATCOMC__
+	}
+#endif
+	if(errorflag==true) goto error;
+#ifndef STARTUPXMSASM
 	XMS_CALL(XMS_QUERYFREE);			// Find out how much XMS is available
-	gvar->pm.xmm.XMSAvail = _AX;
+	XMSAvail = _AX;
 	if (!_AX)				// AJR: bugfix 10/8/92
+	{
+		errorflag = true;
+		err = _BL;
 		goto error;
+	}
+	e++;
+#endif
 
-	gvar->pm.xmm.XMSAvail &= ~(PMPageSizeKB - 1);	// Round off to nearest page size
-	if (gvar->pm.xmm.XMSAvail < (PMPageSizeKB * 2))	// Need at least 2 pages
+#ifdef __DEBUG_PM__
+	printf("XMSVer=%02X	", XMSVer);
+	printf("XMSAvail=%u\n", XMSAvail);
+	getch();
+#endif
+	XMSAvail &= ~(PMPageSizeKB - 1);	// Round off to nearest page size
+	if (XMSAvail < (PMPageSizeKB * 2))	// Need at least 2 pages
+	{
+		errorflag=true;
 		goto error;
-
-	_DX = gvar->pm.xmm.XMSAvail;
+	}
+#ifdef STARTUPXMSASM
+	__asm {
+		mov	dx,XMSAvail
+		mov	ah,XMS_ALLOC				// And do the allocation
+		call	[DWORD PTR XMSDriver]
+		mov	XMSHandle,dx
+		or	ax,ax				// AJR: bugfix 10/8/92
+		jz	error2
+		mov	e,4
+		jmp	End2
+#ifdef __BORLANDC__
+	}
+#endif
+	error2:
+#ifdef __BORLANDC__
+	__asm {
+#endif
+		mov	err,bl
+		mov	errorflag,1
+		jmp End2
+#ifdef __BORLANDC__
+	}
+#endif
+End2:
+#ifdef __WATCOMC__
+	}
+#endif
+#else
+	_DX = XMSAvail;
 	XMS_CALL(XMS_ALLOC);				// And do the allocation
-	gvar->pm.xmm.XMSHandle = _DX;
-
+	XMSHandle = _DX;
 	if (!_AX)				// AJR: bugfix 10/8/92
 	{
-		gvar->pm.xmm.XMSAvail = 0;
+		errorflag=true;
+		err = _BL;
 		goto error;
 	}
-
-	gvar->mmi.XMSmem += gvar->pm.xmm.XMSAvail * 1024;
-
-	gvar->pm.xmm.XMSPresent = true;
+	e++;
+#endif
 error:
+	if(errorflag==false)
+	{
+		gvar->mmi.XMSmem = (dword)(XMSAvail) * 1024;
+		gvar->pm.xmm.XMSAvail = XMSAvail;
+		gvar->pm.xmm.XMSHandle = XMSHandle;
+		//gvar->pm.xmm.XMSVer = XMSVer;
+		gvar->pm.xmm.XMSPresent = true;
+#ifdef __DEBUG_PM__
+		printf("	XMSmem=%lu	XMSAvail=%u\n", gvar->mmi.XMSmem, XMSAvail);
+#endif
+	}
+	else
+	{
+#ifdef __DEBUG_PM__
+		//printf("XMSHandle\n");
+		//printf("	1=%u	2=%u	3=%u	4=%u\n", XMSHandle1, XMSHandle2, XMSHandle3, XMSHandle4);
+		//printf("	2=%u	", XMSHandle);
+		//printf("	%u", gvar->pm.xmm.XMSHandle);
+		printf("	err=%02X	e=%u\n", err, e);
+#endif
+	}
 	return(gvar->pm.xmm.XMSPresent);
 }
 
@@ -417,7 +532,7 @@ PML_XMSCopy(boolean toxms,byte far *addr,word xmspage,word length, global_game_v
 
 	if (!addr)
 	{
-		Quit("PML_XMSCopy: zero address\n");
+		Quit (gvar, "PML_XMSCopy: zero address\n");
 		//return;
 	}
 
@@ -439,7 +554,7 @@ PML_XMSCopy(boolean toxms,byte far *addr,word xmspage,word length, global_game_v
 	}
 	if (!_AX)
 	{
-		Quit("PML_XMSCopy: Error on copy");
+		Quit (gvar, "PML_XMSCopy: Error on copy");
 		//return;
 	}
 }
@@ -475,13 +590,38 @@ PML_CopyFromXMS(byte far *target,int sourcepage,word length, global_game_variabl
 void
 PML_ShutdownXMS(global_game_variables_t *gvar)
 {
+	boolean errorflag=false;
+	word XMSHandle = gvar->pm.xmm.XMSHandle;
 	if (gvar->pm.xmm.XMSPresent)
 	{
-		_DX = gvar->pm.xmm.XMSHandle;
-		XMS_CALL(XMS_FREE);
-		if (_BL)
+		__asm {
+			mov	dx,[XMSHandle]
+			//XMS_CALL(XMS_FREE);
+			mov	ah,XMS_FREE
+			call	[DWORD PTR XMSDriver]
+			or	bl,bl
+			jz	errorxs
+			jmp	Endxs
+#ifdef __BORLANDC__
+		}
+#endif
+			errorxs:
+#ifdef __BORLANDC__
+		__asm {
+#endif
+			//mov	err,ah
+			mov	errorflag,1
+			jmp	Endxs
+#ifdef __BORLANDC__
+		}
+#endif
+			Endxs:
+#ifdef __WATCOMC__
+		}
+#endif
+		if(errorflag==true)
 		{
-			Quit("PML_ShutdownXMS: Error freeing XMS");
+			Quit (gvar, "PML_ShutdownXMS: Error freeing XMS");
 			//return;
 		}
 	}
@@ -516,7 +656,7 @@ PM_SetMainMemPurge(int level, global_game_variables_t *gvar)
 
 	else
 	{
-		Quit("MainPresent IS NULL\n");
+		Quit (gvar, "MainPresent IS NULL\n");
 	}
 }
 
@@ -605,15 +745,12 @@ PM_CheckMainMem(global_game_variables_t *gvar)
 void
 PML_StartupMainMem(global_game_variables_t *gvar)
 {
-	int		i,n;
+	int		i;//,n;
 	memptr	*p;
 
 	gvar->pm.mm.MainPagesAvail = 0;
 	gvar->pm.mm.MainPresent = false;
 	MM_BombOnError(false, gvar);
-	printf("PML_StartupMainMem()\n");
-	printf("	p=%04x	MainMemPages=%04x\n", p, gvar->pm.mm.MainMemPages);
-	printf("	p=%Fp	MainMemPages=%Fp\n", p, gvar->pm.mm.MainMemPages);
 	for (i = 0,p = gvar->pm.mm.MainMemPages;i < PMMaxMainMem;i++,p++)
 	{
 		MM_GetPtr(p,PMPageSize, gvar);
@@ -628,7 +765,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 (gvar, "PM_SetupMainMem: Not enough main memory");
 		//return;
 	}
 	gvar->pm.mm.MainPresent = true;
@@ -664,22 +801,22 @@ PML_ReadFromFile(byte far *buf,long offset,word length, global_game_variables_t
 {
 	if (!buf)
 	{
-		Quit("PML_ReadFromFile: Null pointer");
+		Quit (gvar, "PML_ReadFromFile: Null pointer");
 		//return;
 	}
 	if (!offset)
 	{
-		Quit("PML_ReadFromFile: Zero offset");
+		Quit (gvar, "PML_ReadFromFile: Zero offset");
 		//return;
 	}
 	if (lseek(gvar->pm.fi.PageFile,offset,SEEK_SET) != offset)
 	{
-		Quit("PML_ReadFromFile: Seek failed");
+		Quit (gvar, "PML_ReadFromFile: Seek failed");
 		//return;
 	}
 	if (!CA_FarRead(gvar->pm.fi.PageFile,buf,length, gvar))
 	{
-		Quit("PML_ReadFromFile: Read failed");
+		Quit (gvar, "PML_ReadFromFile: Read failed");
 		//return;
 	}
 }
@@ -701,7 +838,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 (gvar, "PML_OpenPageFile: Unable to open page file");
 		//return;
 	}
 
@@ -722,7 +859,7 @@ PML_OpenPageFile(global_game_variables_t *gvar)
 	MM_GetPtr(&buf, size, gvar);
 	if (!CA_FarRead(gvar->pm.fi.PageFile,(byte far *)buf,size, gvar))
 	{
-		Quit("PML_OpenPageFile: Offset read failed");
+		Quit (gvar, "PML_OpenPageFile: Offset read failed");
 		//return;
 	}
 	offsetptr = (dword far *)buf;
@@ -735,7 +872,7 @@ PML_OpenPageFile(global_game_variables_t *gvar)
 	MM_GetPtr(&buf,size, gvar);
 	if (!CA_FarRead(gvar->pm.fi.PageFile,(byte far *)buf,size, gvar))
 	{
-		Quit("PML_OpenPageFile: Length read failed");
+		Quit (gvar, "PML_OpenPageFile: Length read failed");
 		//return;
 	}
 	lengthptr = (word far *)buf;
@@ -812,7 +949,7 @@ PML_GetEMSAddress(int page,PMLockType lock, global_game_variables_t *gvar)
 	}
 
 	if (emspage == -1)
-		Quit("PML_GetEMSAddress: EMS find failed");
+		Quit (gvar, "PML_GetEMSAddress: EMS find failed");
 
 	gvar->pm.emm.EMSList[emspage].lastHit = gvar->pm.PMFrameCount;
 	offset = emspage * EMSPageSizeSeg;
@@ -881,7 +1018,7 @@ PML_GiveLRUPage(boolean mainonly, global_game_variables_t *gvar)
 	}
 
 	if (lru == -1)
-		Quit("PML_GiveLRUPage: LRU Search failed");
+		Quit (gvar, "PML_GiveLRUPage: LRU Search failed");
 	return(lru);
 }
 
@@ -936,7 +1073,7 @@ PML_PutPageInXMS(int pagenum, global_game_variables_t *gvar)
 	{
 		usexms = PML_GiveLRUXMSPage(gvar);
 		if (usexms == -1)
-			Quit("PML_PutPageInXMS: No XMS LRU");
+			Quit (gvar, "PML_PutPageInXMS: No XMS LRU");
 		page->xmsPage = gvar->pm.PMPages[usexms].xmsPage;
 		gvar->pm.PMPages[usexms].xmsPage = -1;
 	}
@@ -954,16 +1091,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 (gvar, "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 (gvar, "PML_TransferPageSpace: Killing locked page");
 
 	if ((origpage->emsPage == -1) && (origpage->mainPage == -1))
-		Quit("PML_TransferPageSpace: Reusing non-existent page");
+		Quit (gvar, "PML_TransferPageSpace: Reusing non-existent page");
 
 	// Copy page that's about to be purged into XMS
 	PML_PutPageInXMS(orig, gvar);
@@ -979,7 +1116,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 (gvar, "PML_TransferPageSpace: Zero replacement");
 
 	return(addr);
 }
@@ -1020,10 +1157,10 @@ PML_GetAPageBuffer(int pagenum,boolean mainonly, global_game_variables_t *gvar)
 			}
 		}
 		if (n == -1)
-			Quit("PML_GetPageBuffer: MainPagesAvail lied");
+			Quit (gvar, "PML_GetPageBuffer: MainPagesAvail lied");
 		addr = gvar->pm.mm.MainMemPages[n];
 		if (!addr)
-			Quit("PML_GetPageBuffer: Purged main block");
+			Quit (gvar, "PML_GetPageBuffer: Purged main block");
 		page->mainPage = n;
 		gvar->pm.MainPagesUsed++;
 	}
@@ -1031,7 +1168,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 (gvar, "PML_GetPageBuffer: Search failed");
 	return(addr);
 }
 
@@ -1057,7 +1194,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 (gvar, "PML_GetPageFromXMS: Non segment pointer");
 		addr = (memptr)FP_SEG(checkaddr);
 		PML_CopyFromXMS(addr,page->xmsPage,page->length, gvar);
 		gvar->pm.xmm.XMSProtectPage = -1;
@@ -1095,7 +1232,7 @@ PM_GetPage(int pagenum, global_game_variables_t *gvar)
 	memptr	result;
 
 	if (pagenum >= gvar->pm.fi.ChunksInFile)
-		Quit("PM_GetPage: Invalid page request");
+		Quit (gvar, "PM_GetPage: Invalid page request");
 
 #ifdef __DEBUG_2__	// for debugging
 	__asm {
@@ -1113,7 +1250,7 @@ PM_GetPage(int pagenum, global_game_variables_t *gvar)
 	{
 		boolean mainonly = (pagenum >= gvar->pm.fi.PMSoundStart);
 if (!gvar->pm.PMPages[pagenum].offset)	// JDC: sparse page
-	Quit ("Tried to load a sparse page!");
+	Quit (gvar, "Tried to load a sparse page!");
 		if (!(result = PML_GetPageFromXMS(pagenum,mainonly, gvar)))
 		{
 			if (gvar->pm.PMPages[pagenum].lastHit ==  gvar->pm.PMFrameCount)
@@ -1153,7 +1290,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 (gvar, "PM_SetPageLock: Locking/unlocking non-sound page");
 
 	gvar->pm.PMPages[pagenum].locked = lock;
 }
@@ -1166,15 +1303,15 @@ PM_SetPageLock(int pagenum,PMLockType lock, global_game_variables_t *gvar)
 void
 PM_Preload(boolean (*update)(word current,word total), global_game_variables_t *gvar)
 {
-	int				i,j,
+	int				i,//j,
 					page,oogypage;
 	word			current,total,
-					totalnonxms,totalxms,
+					//totalnonxms,totalxms,
 					mainfree,maintotal,
-					emsfree,emstotal,
+					//emstotal,emsfree,
 					xmsfree,xmstotal;
 	memptr			addr;
-	PageListStruct	far *p;
+	PageListStruct	__far *p;
 
 	mainfree = (gvar->pm.mm.MainPagesAvail - gvar->pm.MainPagesUsed) + (gvar->pm.emm.EMSPagesAvail - gvar->pm.EMSPagesUsed);
 	xmsfree = (gvar->pm.xmm.XMSPagesAvail - gvar->pm.XMSPagesUsed);
@@ -1220,7 +1357,7 @@ PM_Preload(boolean (*update)(word current,word total), global_game_variables_t *
 			page++;
 
 		if (page >= gvar->pm.fi.ChunksInFile)
-			Quit ("PM_Preload: Pages>=gvar->pm.fi.ChunksInFile");
+			Quit (gvar, "PM_Preload: Pages>=gvar->pm.fi.ChunksInFile");
 
 		PM_GetPage(page, gvar);
 
@@ -1239,7 +1376,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 (gvar, "PM_Preload: XMS buffer failed");
 
 		while (xmstotal)
 		{
@@ -1247,15 +1384,15 @@ PM_Preload(boolean (*update)(word current,word total), global_game_variables_t *
 				page++;
 
 			if (page >= gvar->pm.fi.ChunksInFile)
-				Quit ("PM_Preload: Pages>=gvar->pm.fi.ChunksInFile");
+				Quit (gvar, "PM_Preload: Pages>=gvar->pm.fi.ChunksInFile");
 
 			p = &gvar->pm.PMPages[page];
 
 			p->xmsPage = gvar->pm.XMSPagesUsed++;
 			if (gvar->pm.XMSPagesUsed > gvar->pm.xmm.XMSPagesAvail)
-				Quit("PM_Preload: Exceeded XMS pages");
+				Quit (gvar, "PM_Preload: Exceeded XMS pages");
 			if (p->length > PMPageSize)
-				Quit("PM_Preload: Page too long");
+				Quit (gvar, "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);
@@ -1308,7 +1445,7 @@ PM_NextFrame(global_game_variables_t *gvar)
 		{
 			char buf[40];
 			sprintf(buf,"PM_NextFrame: Page %d is locked",i);
-			Quit(buf);
+			Quit(gvar, buf);
 		}
 	}
 //#endif
@@ -1369,26 +1506,12 @@ 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 <
-#ifdef __WATCOMC__
-	__argc
-#endif
-#ifdef __BORLANDC__
-	_argc
-#endif
-	;i++)
+	for (i = 1;i < _argc;i++)
 	{
-		switch (US_CheckParm(
-#ifdef __WATCOMC__
-	__argv[i]
-#endif
-#ifdef __BORLANDC__
-	_argv[i]
-#endif
-		,ParmStrings))
+		switch (US_CheckParm(_argv[i],ParmStrings))
 		{
 		case 0:
 			nomain = true;
@@ -1402,19 +1525,20 @@ PM_Startup(global_game_variables_t *gvar)
 		}
 	}
 
-	//0000++++PML_OpenPageFile(gvar);
+	//0000+=+=PML_OpenPageFile(gvar);
 
-	if (!noems)
+	if (!noems && MML_CheckForEMS())
 		PML_StartupEMS(gvar);
-	if (!noxms)
-		//++++PML_StartupXMS(gvar);	//TODO: convert
+	if (!noxms && MML_CheckForXMS())
+		PML_StartupXMS(gvar);
+	if(!nomain)
+		PML_StartupMainMem(gvar);
 
-	if (!nomain && !gvar->pm.emm.EMSPresent)
+	if (!gvar->pm.mm.MainPresent && !gvar->pm.emm.EMSPresent && !gvar->pm.xmm.XMSPresent)
 	{
-		Quit("PM_Startup: No main or EMS\n");
+		Quit (gvar, "PM_Startup: No main or EMS\n");
 		//return;
 	}
-	PML_StartupMainMem(gvar);
 
 	PM_Reset(gvar);
 
@@ -1427,13 +1551,13 @@ PM_Startup(global_game_variables_t *gvar)
 void
 PM_Shutdown(global_game_variables_t *gvar)
 {
-	PML_ShutdownXMS(gvar);
-	PML_ShutdownEMS(gvar);
+	if(MML_CheckForXMS()) PML_ShutdownXMS(gvar);
+	if(MML_CheckForEMS()) PML_ShutdownEMS(gvar);
 
 	if (!gvar->pm.PMStarted)
 		return;
 
-	PML_ClosePageFile(gvar);
+	//PML_ClosePageFile(gvar);
 
 	PML_ShutdownMainMem(gvar);
 }