X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_pm.c;h=03df02377c4c8e6c20d801e6b12ccfcefc5f811d;hb=c9ea53d56f793c6abcf528c20590c02804dde275;hp=bb08180da0aee934305632ae907157d58b8503ca;hpb=2aed15ed3fd65130ae260d4ecd020a4f870f6442;p=16.git

diff --git a/src/lib/16_pm.c b/src/lib/16_pm.c
index bb08180d..03df0237 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];
@@ -48,7 +44,8 @@ boolean dbg_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 dbg_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,16 @@ 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;
+#ifdef __DEBUG_PM__
+	word e=0;
+#endif
 	totalEMSpages = freeEMSpages = EMSPageFrame = 0;
 	gvar->pm.emm.EMSPresent = false;			// Assume that we'll fail
 	gvar->pm.emm.EMSAvail = 0;
@@ -155,51 +176,61 @@ 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
-		jc	erroreu
-
+		int	EMM_INT		// try to open EMMXXXX0 device
+		jc	error1
+#ifdef __DEBUG_PM__
+		add	e,1
+#endif
 		mov	bx,ax
 		mov	ax,0x4400
 
-		int	EMS_INT		// get device info
-		jc	erroreu
-
+		int	EMM_INT		// get device info
+		jc	error1
+#ifdef __DEBUG_PM__
+		add	e,1
+#endif
 		and	dx,0x80
-		jz	erroreu
-
+		jz	error1
+#ifdef __DEBUG_PM__
+		add	e,1
+#endif
 		mov	ax,0x4407
 
-		int	EMS_INT		// get status
-		jc	erroreu
+		int	EMM_INT		// get status
+		jc	error1
 		or	al,al
-		jz	erroreu
-
+		jz	error1
+#ifdef __DEBUG_PM__
+		add	e,1
+#endif
 		mov	ah,0x3e
-		int	EMS_INT		// close handle
-		jc	erroreu
-
+		int	EMM_INT		// close handle
+		jc	error1
+#ifdef __DEBUG_PM__
+		add	e,1
+#endif
 		mov	ah,EMS_STATUS
 		int	EMS_INT
-		jc	erroreu			// make sure EMS hardware is present
+		jc	error1			// make sure EMS hardware is present
 
 		mov	ah,EMS_VERSION
 		int	EMS_INT			// only work on EMS 3.2 or greater (silly, but...)
 		or	ah,ah
-		jnz	erroreu
+		jnz	error1
 		mov	[EMSVer],ax		//	set EMSVer
 		cmp	al,0x32			// only work on ems 3.2 or greater
-		jb	erroreu
+		jb	error1
 
 		mov	ah,EMS_GETFRAME
 		int	EMS_INT			// find the page frame address
 		or	ah,ah
-		jnz	erroreu
+		jnz	error1
 		mov	[EMSPageFrame],bx
 
 		mov	ah,EMS_GETPAGES
 		int	EMS_INT			// find out how much EMS is there
 		or	ah,ah
-		jnz	erroreu
+		jnz	error1
 		or	bx,bx
 		jz	noEMS			// no EMS at all to allocate
 		cmp	bx,2
@@ -207,22 +238,25 @@ PML_StartupEMS(global_game_variables_t *gvar)
 		mov	[totalEMSpages],dx
 		mov	[freeEMSpages],bx
 		mov	[EMSAvail],bx
-		jmp	Endeu
+		jmp End1
 #ifdef __BORLANDC__
 	}
 #endif
-		erroreu:
+	error1:
 #ifdef __BORLANDC__
 	__asm {
+#endif
+#ifdef __DEBUG_PM__
+		mov	e,1
 #endif
 		mov	err,ah
 		mov	errorflag,1
-		jmp	Endeu
+		jmp End1
 #ifdef __BORLANDC__
 	}
 #endif
-		noEMS:
-		Endeu:
+noEMS:
+End1:
 #ifdef __WATCOMC__
 	}
 #endif
@@ -243,31 +277,33 @@ PML_StartupEMS(global_game_variables_t *gvar)
 		mov	bx,[EMSAvail];
 		int	EMS_INT
 		or	ah,ah
-		jnz	erroreuu
+		jnz	error2
 		mov	[EMSHandle],dx
-		jmp	Endeuu
+		jmp	End2
 #ifdef __BORLANDC__
 	}
 #endif
-		erroreuu:
+	error2:
 #ifdef __BORLANDC__
 	__asm {
+#endif
+#ifdef __DEBUG_PM__
+		mov	e,1
 #endif
 		mov	err,ah
 		mov	errorflag,1
-		jmp Endeuu
+		jmp End2
 #ifdef __BORLANDC__
 	}
 #endif
-		Endeuu:
+End2:
 #ifdef __WATCOMC__
 	}
 #endif
 
 	if(errorflag==false)
 	{
-	gvar->pm.emm.EMSAvail = EMSAvail;
-	gvar->mmi.EMSmem = gvar->pm.emm.EMSAvail * (dword)EMSPageSize;
+	gvar->mmi.EMSmem = EMSAvail * (dword)EMSPageSize;
 
 	// Initialize EMS mapping cache
 	for (i = 0;i < EMSFrameCount;i++)
@@ -279,11 +315,16 @@ PML_StartupEMS(global_game_variables_t *gvar)
 		strcpy(str,"PML_StartupEMS: EMS error ");
 		MM_EMSerr(str, err);
 		printf("%s\n",str);
+#ifdef __DEBUG_PM__
+		printf("e=%u\n", e);
+		getch();
+#endif
 		return(gvar->pm.emm.EMSPresent);
 	}
 
 	gvar->pm.emm.EMSPresent = true;			// We have EMS
 	gvar->pm.emm.EMSPageFrame = EMSPageFrame;
+	gvar->pm.emm.EMSAvail = EMSAvail;
 	gvar->pm.emm.EMSVer = EMSVer;
 	gvar->pm.emm.EMSHandle = EMSHandle;
 	gvar->pm.emm.freeEMSpages = freeEMSpages;
@@ -299,10 +340,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)
@@ -335,7 +375,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,87 +396,143 @@ PML_ShutdownEMS(global_game_variables_t *gvar)
 boolean
 PML_StartupXMS(global_game_variables_t *gvar)
 {
-	boolean errorflag;
-	word XMSAvail, XMSHandle;
-	errorflag=gvar->pm.xmm.XMSPresent = false;					// Assume failure
-	XMSAvail = gvar->pm.xmm.XMSAvail = 0;
+//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
+	XMSAvail = gvar->mmi.XMSmem = 0;
 
 	__asm {
 		mov	ax,0x4300
 		int	XMS_INT         				// Check for presence of XMS driver
 		cmp	al,0x80
-		jne	errorxu
+		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
 
-		//XMS_CALL(XMS_QUERYFREE);			// Find out how much XMS is available
-		mov	ah,XMS_QUERYFREE
-		call	[WORD PTR XMSDriver]
-		mov	[XMSAvail],ax
+		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	errorxu
-		jmp	Endxu
+		jz	error1
+		mov	e,3
+#endif
+		jmp	End1
 #ifdef __BORLANDC__
 	}
 #endif
-		errorxu:
+	error1:
 #ifdef __BORLANDC__
 	__asm {
 #endif
-		//mov	err,ah
+		mov	err,bl
 		mov	errorflag,1
-		jmp	Endxu
+		jmp End1
 #ifdef __BORLANDC__
 	}
 #endif
-		Endxu:
+End1:
 #ifdef __WATCOMC__
 	}
 #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
+	if(errorflag==true) goto error;
+#ifndef STARTUPXMSASM
+	XMS_CALL(XMS_QUERYFREE);			// Find out how much XMS is available
+	XMSAvail = _AX;
+	if (!_AX)				// AJR: bugfix 10/8/92
+	{
+		errorflag = true;
+		err = _BL;
 		goto error;
+	}
+	e++;
+#endif
 
+#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;
+	}
+#ifdef STARTUPXMSASM
 	__asm {
-		mov	dx,[XMSAvail]
-		//XMS_CALL(XMS_ALLOC);				// And do the allocation
-		mov	ah,XMS_ALLOC
-		call	[WORD PTR XMSDriver]
-		mov	[XMSHandle],dx
+		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	errorxuu
-		jmp	Endxuu
+		jz	error2
+		mov	e,4
+		jmp	End2
 #ifdef __BORLANDC__
-		}
+	}
 #endif
-		errorxuu:
+	error2:
 #ifdef __BORLANDC__
 	__asm {
 #endif
-		//mov	err,ah
-		mov	[XMSAvail],0
+		mov	err,bl
 		mov	errorflag,1
-		jmp	Endxuu
+		jmp End2
 #ifdef __BORLANDC__
 	}
 #endif
-		Endxuu:
+End2:
 #ifdef __WATCOMC__
 	}
 #endif
-
+#else
+	_DX = XMSAvail;
+	XMS_CALL(XMS_ALLOC);				// And do the allocation
+	XMSHandle = _DX;
+	if (!_AX)				// AJR: bugfix 10/8/92
+	{
+		errorflag=true;
+		err = _BL;
+		goto error;
+	}
+	e++;
+#endif
+error:
 	if(errorflag==false)
 	{
+		gvar->mmi.XMSmem = (dword)(XMSAvail) * 1024;
 		gvar->pm.xmm.XMSAvail = XMSAvail;
-		gvar->mmi.XMSmem += gvar->pm.xmm.XMSAvail * 1024;
 		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
 	}
-error:
 	return(gvar->pm.xmm.XMSPresent);
 }
 
@@ -459,7 +555,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;
 	}
 
@@ -481,7 +577,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;
 	}
 }
@@ -525,7 +621,7 @@ PML_ShutdownXMS(global_game_variables_t *gvar)
 			mov	dx,[XMSHandle]
 			//XMS_CALL(XMS_FREE);
 			mov	ah,XMS_FREE
-			call	[WORD PTR XMSDriver]
+			call	[DWORD PTR XMSDriver]
 			or	bl,bl
 			jz	errorxs
 			jmp	Endxs
@@ -548,7 +644,7 @@ PML_ShutdownXMS(global_game_variables_t *gvar)
 #endif
 		if(errorflag==true)
 		{
-			Quit("PML_ShutdownXMS: Error freeing XMS");
+			Quit (gvar, "PML_ShutdownXMS: Error freeing XMS");
 			//return;
 		}
 	}
@@ -583,7 +679,7 @@ PM_SetMainMemPurge(int level, global_game_variables_t *gvar)
 
 	else
 	{
-		Quit("MainPresent IS NULL\n");
+		Quit (gvar, "MainPresent IS NULL\n");
 	}
 }
 
@@ -672,7 +768,7 @@ 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;
@@ -692,7 +788,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;
@@ -728,22 +824,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;
 	}
 }
@@ -765,7 +861,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;
 	}
 
@@ -786,7 +882,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;
@@ -799,7 +895,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;
@@ -876,7 +972,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;
@@ -945,7 +1041,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);
 }
 
@@ -1000,7 +1096,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;
 	}
@@ -1018,16 +1114,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);
@@ -1043,7 +1139,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);
 }
@@ -1084,10 +1180,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++;
 	}
@@ -1095,7 +1191,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);
 }
 
@@ -1121,7 +1217,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;
@@ -1159,7 +1255,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 {
@@ -1177,7 +1273,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)
@@ -1217,7 +1313,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;
 }
@@ -1230,15 +1326,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);
@@ -1284,7 +1380,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);
 
@@ -1303,7 +1399,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)
 		{
@@ -1311,15 +1407,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);
@@ -1372,7 +1468,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
@@ -1433,26 +1529,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;
@@ -1468,22 +1550,18 @@ PM_Startup(global_game_variables_t *gvar)
 
 	//0000+=+=PML_OpenPageFile(gvar);
 
-	if (!noems)
+	if (!noems && MML_CheckForEMS())
 		PML_StartupEMS(gvar);
-	/*if (!noxms)
-	{
-		//++++
-		printf("PML_StartupXMS ");
-		PML_StartupXMS(gvar);	//TODO: convert
-		printf("ok!\n");
-	}*/
+	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);
 
@@ -1496,13 +1574,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);
 }