X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_pm.c;h=7ecab1eb418ee35fb6ef1d30a77ea3e6c53f51c0;hb=6abb6ddef2f5860213065998a305a574704f6296;hp=9740195156dc584e7a15d26a248dbe76289c2028;hpb=1be58416e7fd292f729d6fe8e759ccd926431fd2;p=16.git diff --git a/src/lib/16_pm.c b/src/lib/16_pm.c index 97401951..7ecab1eb 100755 --- a/src/lib/16_pm.c +++ b/src/lib/16_pm.c @@ -28,34 +28,38 @@ #include "src/lib/16_pm.h" #pragma hdrstop -union REGS CPURegs; -/* + +#ifdef __DEBUG__ +boolean dbg_debugpm=0; +#endif + // Main Mem specific variables - boolean MainPresent; - memptr MainMemPages[PMMaxMainMem]; + //boolean MainPresent; +/* memptr MainMemPages[PMMaxMainMem]; PMBlockAttr gvar->pm.mm.MainMemUsed[PMMaxMainMem]; - int gvar->pm.mm.MainPagesAvail; + int gvar->pm.mm.MainPagesAvail;*/ // EMS specific variables - boolean gvar->pm.emm.EMSPresent; - word gvar->pm.emm.EMSAvail,gvar->pm.emm.EMSPagesAvail,gvar->pm.emm.EMSHandle, + //boolean EMSPresent; +/* word gvar->pm.emm.EMSAvail,gvar->pm.emm.EMSPagesAvail,gvar->pm.emm.EMSHandle, gvar->pm.emm.EMSPageFrame,gvar->pm.emm.EMSPhysicalPage; - gvar->pm.emm.EMSListStruct gvar->pm.emm.EMSList[EMSFrameCount]; + gvar->pm.emm.EMSListStruct gvar->pm.emm.EMSList[EMSFrameCount];*/ // XMS specific variables - boolean gvar->pm.xmm.XMSPresent; - word gvar->pm.xmm.XMSAvail,gvar->pm.xmm.XMSPagesAvail,gvar->pm.xmm.XMSHandle; - dword XMSDriver; - int gvar->pm.xmm.XMSProtectPage = -1; + //boolean XMSPresent; + //word gvar->pm.xmm.XMSAvail,gvar->pm.xmm.XMSPagesAvail,gvar->pm.xmm.XMSHandle; + dword XMSDriver; //hard to put in gvar + word XMSVer; //hard to put in gvar +/* int gvar->pm.xmm.XMSProtectPage = -1; // File specific variables char gvar->pm.fi.PageFileName[13] = {"VSWAP."}; int PageFile = -1; word gvar->pm.fi.ChunksInFile; - word PMSpriteStart,PMSoundStart; + word PMSpriteStart,PMSoundStart;*/ // General usage variables - boolean PMStarted, +/* boolean PMStarted, gvar->pm.PMPanicMode, gvar->pm.PMThrashing; word gvar->pm.XMSPagesUsed, @@ -64,8 +68,28 @@ union REGS CPURegs; gvar->pm.PMNumBlocks; long PMFrameCount; PageListStruct far *gvar->pm.PMPages, - _seg *gvar->pm.PMSegPages; -*/ + _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}; ///////////////////////////////////////////////////////////////////////////// @@ -77,23 +101,50 @@ static char *ParmStrings[] = {"nomain","noems","noxms",nil}; // // PML_MapEMS() - Maps a logical page to a physical page // -void -PML_MapEMS(word logical, word physical, global_game_variables_t *gvar) +byte +PML_MapEMS(word logical, byte physical, global_game_variables_t *gvar) { - union REGS CPURegs; - CPURegs.h.al = physical; - CPURegs.x.bx = logical; - CPURegs.x.dx = gvar->pm.emm.EMSHandle; - CPURegs.h.ah = EMS_MAPPAGE; + byte err=0, str[160]; + unsigned EMShandle; + //int i; + + boolean errorflag=false; + EMShandle=gvar->pm.emm.EMSHandle; + __asm { + mov ah,EMS_MAPPAGE + mov al,physical + mov bx,logical + mov dx,EMShandle int EMS_INT + or ah,ah + jnz errorme + jmp Endme +#ifdef __BORLANDC__ } - - if(CPURegs.h.ah) +#endif + errorme: +#ifdef __BORLANDC__ + __asm { +#endif + mov err,ah + mov errorflag,1 +#ifdef __BORLANDC__ + } +#endif + Endme: +#ifdef __WATCOMC__ + } +#endif + if(errorflag==true) { + strcpy(str,"MM_MapEMS: EMS error "); + MM_EMSerr(str, err); + printf("%s\n",str); Quit("PML_MapEMS: Page mapping failed\n"); - return; + return err; } + return 0; } // @@ -105,122 +156,159 @@ PML_MapEMS(word logical, word physical, global_game_variables_t *gvar) // to the maximum we need) // - char EMMDriverName[9] = "EMMXXXX0"; - boolean PML_StartupEMS(global_game_variables_t *gvar) { - boolean emmcfems; - union REGS CPURegs; - int i; - long size; - + //long size; + 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; gvar->pm.emm.EMSPresent = false; // Assume that we'll fail gvar->pm.emm.EMSAvail = 0; - emmcfems=0; + gvar->mmi.EMSmem = 0; __asm { - //CPURegs.x.dx = (word)EMMDriverName; - //CPURegs.x.ax = 0x3d00; - //geninterrupt(0x21); // try to open EMMXXXX0 device - mov dx,OFFSET EMMDriverName + mov dx,OFFSET emmname //fix by andrius4669 mov ax,0x3d00 - int 0x21 // try to open EMMXXXX0 device - jnc gothandle - //fail - mov emmcfems,1 - jmp Aend + 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 + + mov ah,EMS_STATUS + int EMS_INT + 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 error1 + mov [EMSVer],ax // set EMSVer + cmp al,0x32 // only work on ems 3.2 or greater + jb error1 + + mov ah,EMS_GETFRAME + int EMS_INT // find the page frame address + or ah,ah + jnz error1 + mov [EMSPageFrame],bx + + mov ah,EMS_GETPAGES + int EMS_INT // find out how much EMS is there + or ah,ah + jnz error1 + or bx,bx + jz noEMS // no EMS at all to allocate + cmp bx,2 + jl noEMS // Require at least 2 pages (32k) + mov [totalEMSpages],dx + mov [freeEMSpages],bx + mov [EMSAvail],bx + jmp End1 #ifdef __BORLANDC__ } #endif - -gothandle: + error1: #ifdef __BORLANDC__ __asm { #endif - //CPURegs.x.bx = CPURegs.x.ax; - //CPURegs.x.ax = 0x4400; - //geninterrupt(0x21); // get device info - mov bx,ax - mov ax,0x4400 - int 0x21 // get device info - jnc gotinfo - //fail - mov emmcfems,1 - jmp Aend + mov err,ah + mov errorflag,1 + jmp End1 #ifdef __BORLANDC__ } #endif -Aend: -gotinfo: -#ifndef __BORLANDC__ +noEMS: +End1: +#ifdef __WATCOMC__ } #endif - if(emmcfems!=0) goto error; - __asm and dx,0x80 - if (!CPURegs.x.dx) - goto error; - - CPURegs.x.ax = 0x4407; - geninterrupt(0x21); // get status - __asm mov emmcfems,1 - if(emmcfems!=0) goto error; - - if (!CPURegs.h.al) - goto error; - - CPURegs.h.ah = 0x3e; - geninterrupt(0x21); // close handle - - CPURegs.h.ah = EMS_STATUS; - geninterrupt(EMS_INT); - if (CPURegs.h.ah) - goto error; // make sure EMS hardware is present - - CPURegs.h.ah = EMS_VERSION; - geninterrupt(EMS_INT); - if (CPURegs.h.ah || (CPURegs.h.al < 0x32)) // only work on EMS 3.2 or greater (silly, but...) - goto error; - - CPURegs.h.ah = EMS_GETFRAME; - geninterrupt(EMS_INT); - if (CPURegs.h.ah) - goto error; // find the page frame address - gvar->pm.emm.EMSPageFrame = CPURegs.x.bx; - - CPURegs.h.ah = EMS_GETPAGES; - geninterrupt(EMS_INT); - if (CPURegs.h.ah) - goto error; - if (CPURegs.x.bx < 2) - goto error; // Require at least 2 pages (32k) - gvar->pm.emm.EMSAvail = CPURegs.x.bx; - - // Don't hog all available EMS - size = gvar->pm.emm.EMSAvail * (long)EMSPageSize; - if (size - (EMSPageSize * 2) > (gvar->pm.fi.ChunksInFile * (long)PMPageSize)) +/* + if(errorflag==false) { - size = (gvar->pm.fi.ChunksInFile * (long)PMPageSize) + EMSPageSize; - gvar->pm.emm.EMSAvail = size / EMSPageSize; + // Don't hog all available EMS + size = gvar->pm.emm.EMSAvail * (long)EMSPageSize; + if (size - (EMSPageSize * 2) > (gvar->pm.fi.ChunksInFile * (long)PMPageSize)) + { + size = (gvar->pm.fi.ChunksInFile * (long)PMPageSize) + EMSPageSize; + gvar->pm.emm.EMSAvail = size / EMSPageSize; + } } +*/ + __asm { + mov ah,EMS_ALLOCPAGES + mov bx,[EMSAvail]; + int EMS_INT + or ah,ah + jnz error2 + mov [EMSHandle],dx + jmp End2 +#ifdef __BORLANDC__ + } +#endif + error2: +#ifdef __BORLANDC__ + __asm { +#endif + mov err,ah + mov errorflag,1 + jmp End2 +#ifdef __BORLANDC__ + } +#endif +End2: +#ifdef __WATCOMC__ + } +#endif - CPURegs.h.ah = EMS_ALLOCPAGES; - CPURegs.x.bx = gvar->pm.emm.EMSAvail; - geninterrupt(EMS_INT); - if (CPURegs.h.ah) - goto error; - gvar->pm.emm.EMSHandle = CPURegs.x.dx; - - gvar->mmi.EMSmem += gvar->pm.emm.EMSAvail * (long)EMSPageSize; + 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 + { + strcpy(str,"PML_StartupEMS: EMS error "); + MM_EMSerr(str, err); + printf("%s\n",str); + 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; + gvar->pm.emm.totalEMSpages = totalEMSpages; -error: return(gvar->pm.emm.EMSPresent); } @@ -230,15 +318,42 @@ error: void PML_ShutdownEMS(global_game_variables_t *gvar) { - union REGS CPURegs; + word EMSHandle; + byte err=0, str[64]; + + boolean errorflag=false; + EMSHandle=gvar->pm.emm.EMSHandle; if (gvar->pm.emm.EMSPresent) { - CPURegs.h.ah=EMS_FREEPAGES; - CPURegs.x.ax=gvar->pm.emm.EMSHandle; - geninterrupt(EMS_INT); - if (CPURegs.h.ah) + __asm { + mov ah,EMS_FREEPAGES + mov dx,[EMSHandle] + int EMS_INT + jc errores + jmp Endes +#ifdef __BORLANDC__ + } +#endif + errores: +#ifdef __BORLANDC__ + __asm { +#endif + mov err,ah + mov errorflag,1 + jmp Endes +#ifdef __BORLANDC__ + } +#endif + Endes: +#ifdef __WATCOMC__ + } +#endif + if(errorflag==true) { + strcpy(str,"PML_ShutdownEMS: Error freeing EMS "); + MM_EMSerr(str, err); + printf("%s\n",str); Quit("PML_ShutdownEMS: Error freeing EMS\n"); //return; } @@ -260,48 +375,143 @@ PML_ShutdownEMS(global_game_variables_t *gvar) boolean PML_StartupXMS(global_game_variables_t *gvar) { - union REGS CPURegs; - - XMSD; +//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; - - CPURegs.x.ax=0x4300; - geninterrupt(XMS_INT); // Check for presence of XMS driver - if (CPURegs.h.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 - } - XMS_CALL(XMS_QUERYFREE, gvar); // Find out how much XMS is available - gvar->pm.xmm.XMSAvail = CPURegs.x.ax; - if (!CPURegs.x.ax) // AJR: bugfix 10/8/92 + 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 + 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; - - CPURegs.x.dx = gvar->pm.xmm.XMSAvail; - XMS_CALL(XMS_ALLOC, gvar); // And do the allocation - gvar->pm.xmm.XMSHandle = CPURegs.x.dx; - - if (!CPURegs.x.ax) // AJR: bugfix 10/8/92 + } +#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 + 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); } @@ -312,7 +522,6 @@ error: void PML_XMSCopy(boolean toxms,byte far *addr,word xmspage,word length, global_game_variables_t *gvar) { - XMSD; dword xoffset; struct { @@ -340,12 +549,12 @@ PML_XMSCopy(boolean toxms,byte far *addr,word xmspage,word length, global_game_v __asm { push si } - CPURegs.x.si = (word)© - XMS_CALL(XMS_MOVE, gvar); + _SI = (word)© + XMS_CALL(XMS_MOVE); __asm { pop si } - if (!CPURegs.x.ax) + if (!_AX) { Quit("PML_XMSCopy: Error on copy"); //return; @@ -383,12 +592,36 @@ PML_CopyFromXMS(byte far *target,int sourcepage,word length, global_game_variabl void PML_ShutdownXMS(global_game_variables_t *gvar) { - XMSD; + boolean errorflag=false; + word XMSHandle = gvar->pm.xmm.XMSHandle; if (gvar->pm.xmm.XMSPresent) { - CPURegs.x.dx = gvar->pm.xmm.XMSHandle; - XMS_CALL(XMS_FREE, gvar); - if (CPURegs.h.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; @@ -412,9 +645,21 @@ PM_SetMainMemPurge(int level, global_game_variables_t *gvar) { int i; + if(gvar->pm.mm.MainPresent) for (i = 0;i < PMMaxMainMem;i++) + { +#ifdef __DEBUG_PM__ + 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 if (gvar->pm.mm.MainMemPages[i]) - MM_SetPurge(&gvar->pm.mm.MainMemPages[i],level, gvar); + MM_SetPurge(&(gvar->pm.mm.MainMemPages[i]),level, gvar); + } + + else + { + Quit("MainPresent IS NULL\n"); + } } // @@ -502,10 +747,11 @@ 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); for (i = 0,p = gvar->pm.mm.MainMemPages;i < PMMaxMainMem;i++,p++) { @@ -781,7 +1027,7 @@ PML_GiveLRUPage(boolean mainonly, global_game_variables_t *gvar) // // PML_GiveLRUXMSPage() - Returns the page # of the least recently used // (and present) XMS page. -// This routine won't return the XMS page protected (by gvar->pm.xmm.XMSProtectPage) +// This routine won't return the XMS page protected (by XMSProtectPage) // int PML_GiveLRUXMSPage(global_game_variables_t *gvar) @@ -1059,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); @@ -1237,6 +1483,9 @@ PM_Reset(global_game_variables_t *gvar) gvar->pm.PMPanicMode = false; + gvar->pm.fi.PageFile = -1; + gvar->pm.xmm.XMSProtectPage = -1; + // Initialize page list for (i = 0,page = gvar->pm.PMPages;i < gvar->pm.PMNumBlocks;i++,page++) { @@ -1259,28 +1508,12 @@ PM_Startup(global_game_variables_t *gvar) if (gvar->pm.PMStarted) return; - strcat(&(gvar->pm.fi.PageFileName), "VSWAP."); - gvar->pm.fi.PageFile = -1; - gvar->pm.xmm.XMSProtectPage = -1; + //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; @@ -1294,20 +1527,20 @@ PM_Startup(global_game_variables_t *gvar) } } - PML_OpenPageFile(gvar); + //0000+=+=PML_OpenPageFile(gvar); - if (!noems) + if (!noems && MML_CheckForEMS()) PML_StartupEMS(gvar); - if (!noxms) + 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; } - else - PML_StartupMainMem(gvar); PM_Reset(gvar); @@ -1320,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); }