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

diff --git a/src/lib/16_pm.c b/src/lib/16_pm.c
index 75ad2aae..7ecab1eb 100755
--- a/src/lib/16_pm.c
+++ b/src/lib/16_pm.c
@@ -30,7 +30,7 @@
 #pragma hdrstop
 
 #ifdef __DEBUG__
-boolean debugpm=0;
+boolean dbg_debugpm=0;
 #endif
 
 //	Main Mem specific variables
@@ -48,7 +48,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 +70,26 @@ 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
+
+#define geninterrupt(n) int86(n,&CPURegs,&CPURegs);
+
 static	char		*ParmStrings[] = {"nomain","noems","noxms",nil};
 
 /////////////////////////////////////////////////////////////////////////////
@@ -83,11 +104,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 +118,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 +132,7 @@ PML_MapEMS(word logical, byte physical, global_game_variables_t *gvar)
 #ifdef __BORLANDC__
 	}
 #endif
-		End:
+		Endme:
 #ifdef __WATCOMC__
 	}
 #endif
@@ -139,14 +160,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 +175,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 +189,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 +286,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 +319,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 +330,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
@@ -356,45 +375,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);
 }
 
@@ -475,11 +592,36 @@ 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");
 			//return;
@@ -605,15 +747,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);
@@ -1166,15 +1305,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);
@@ -1372,23 +1511,9 @@ PM_Startup(global_game_variables_t *gvar)
 	//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 +1527,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");
 		//return;
 	}
-	PML_StartupMainMem(gvar);
 
 	PM_Reset(gvar);
 
@@ -1427,13 +1553,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);
 }