]> 4ch.mooo.com Git - 16.git/blobdiff - src/lib/16_pm.c
====PM WORKS! XMS PORTING IS NEXT!====
[16.git] / src / lib / 16_pm.c
index 9740195156dc584e7a15d26a248dbe76289c2028..ef2d6d5ad38fbae46e632c3d35933adc24c65101 100755 (executable)
 \r
 #include "src/lib/16_pm.h"\r
 #pragma hdrstop\r
-union REGS CPURegs;\r
-/*\r
+\r
+#ifdef __DEBUG__\r
+boolean debugpm=0;\r
+#endif\r
+\r
 //     Main Mem specific variables\r
        boolean                 MainPresent;\r
-       memptr                  MainMemPages[PMMaxMainMem];\r
+/*     memptr                  MainMemPages[PMMaxMainMem];\r
        PMBlockAttr             gvar->pm.mm.MainMemUsed[PMMaxMainMem];\r
-       int                             gvar->pm.mm.MainPagesAvail;\r
+       int                             gvar->pm.mm.MainPagesAvail;*/\r
 \r
 //     EMS specific variables\r
-       boolean                 gvar->pm.emm.EMSPresent;\r
-       word                    gvar->pm.emm.EMSAvail,gvar->pm.emm.EMSPagesAvail,gvar->pm.emm.EMSHandle,\r
+       boolean                 EMSPresent;\r
+/*     word                    gvar->pm.emm.EMSAvail,gvar->pm.emm.EMSPagesAvail,gvar->pm.emm.EMSHandle,\r
                                        gvar->pm.emm.EMSPageFrame,gvar->pm.emm.EMSPhysicalPage;\r
-       gvar->pm.emm.EMSListStruct      gvar->pm.emm.EMSList[EMSFrameCount];\r
+       gvar->pm.emm.EMSListStruct      gvar->pm.emm.EMSList[EMSFrameCount];*/\r
 \r
 //     XMS specific variables\r
-       boolean                 gvar->pm.xmm.XMSPresent;\r
-       word                    gvar->pm.xmm.XMSAvail,gvar->pm.xmm.XMSPagesAvail,gvar->pm.xmm.XMSHandle;\r
-       dword           XMSDriver;\r
-       int                             gvar->pm.xmm.XMSProtectPage = -1;\r
+       boolean                 XMSPresent;\r
+       //word                  gvar->pm.xmm.XMSAvail,gvar->pm.xmm.XMSPagesAvail,gvar->pm.xmm.XMSHandle;\r
+       word            XMSDriver;\r
+/*     int                             gvar->pm.xmm.XMSProtectPage = -1;\r
 \r
 //     File specific variables\r
        char                    gvar->pm.fi.PageFileName[13] = {"VSWAP."};\r
        int                             PageFile = -1;\r
        word                    gvar->pm.fi.ChunksInFile;\r
-       word                    PMSpriteStart,PMSoundStart;\r
+       word                    PMSpriteStart,PMSoundStart;*/\r
 \r
 //     General usage variables\r
-       boolean                 PMStarted,\r
+       boolean                 PMStarted;/*,\r
                                        gvar->pm.PMPanicMode,\r
                                        gvar->pm.PMThrashing;\r
        word                    gvar->pm.XMSPagesUsed,\r
@@ -64,8 +67,8 @@ union REGS CPURegs;
                                        gvar->pm.PMNumBlocks;\r
        long                    PMFrameCount;\r
        PageListStruct  far *gvar->pm.PMPages,\r
-                                       _seg *gvar->pm.PMSegPages;\r
-*/\r
+                                       _seg *gvar->pm.PMSegPages;*/\r
+\r
 static char            *ParmStrings[] = {"nomain","noems","noxms",nil};\r
 \r
 /////////////////////////////////////////////////////////////////////////////\r
@@ -77,23 +80,50 @@ static      char            *ParmStrings[] = {"nomain","noems","noxms",nil};
 //\r
 //     PML_MapEMS() - Maps a logical page to a physical page\r
 //\r
-void\r
-PML_MapEMS(word logical, word physical, global_game_variables_t *gvar)\r
+byte\r
+PML_MapEMS(word logical, byte physical, global_game_variables_t *gvar)\r
 {\r
-       union REGS CPURegs;\r
-       CPURegs.h.al = physical;\r
-       CPURegs.x.bx = logical;\r
-       CPURegs.x.dx = gvar->pm.emm.EMSHandle;\r
-       CPURegs.h.ah = EMS_MAPPAGE;\r
+       byte    str[160];\r
+       unsigned        EMShandle;\r
+       byte err;\r
+       boolean errorflag=false;\r
+       int     i;\r
+       EMShandle=gvar->pm.emm.EMSHandle;\r
+\r
        __asm {\r
+               mov     ah,EMS_MAPPAGE\r
+               mov     al,physical\r
+               mov     bx,logical\r
+               mov     dx,EMShandle\r
                int     EMS_INT\r
+               or      ah,ah\r
+               jnz     error\r
+               jmp End\r
+#ifdef __BORLANDC__\r
        }\r
-\r
-       if(CPURegs.h.ah)\r
+#endif\r
+               error:\r
+#ifdef __BORLANDC__\r
+       __asm {\r
+#endif\r
+               mov     err,ah\r
+               mov     errorflag,1\r
+#ifdef __BORLANDC__\r
+       }\r
+#endif\r
+               End:\r
+#ifdef __WATCOMC__\r
+       }\r
+#endif\r
+       if(errorflag==true)\r
        {\r
+               strcpy(str,"MM_MapEMS: EMS error ");\r
+               MM_EMSerr(str, err);\r
+               printf("%s\n",str);\r
                Quit("PML_MapEMS: Page mapping failed\n");\r
-               return;\r
+               return err;\r
        }\r
+       return 0;\r
 }\r
 \r
 //\r
@@ -105,123 +135,160 @@ PML_MapEMS(word logical, word physical, global_game_variables_t *gvar)
 //                     to the maximum we need)\r
 //\r
 \r
-       char    EMMDriverName[9] = "EMMXXXX0";\r
-\r
 boolean\r
 PML_StartupEMS(global_game_variables_t *gvar)\r
 {\r
-       boolean emmcfems;\r
-       union REGS CPURegs;\r
-\r
        int             i;\r
        long    size;\r
-\r
-       gvar->pm.emm.EMSPresent = false;                        // Assume that we'll fail\r
+       byte    str[64];\r
+       byte err;\r
+\r
+       boolean errorflag=0;\r
+       static char     emmname[] = "EMMXXXX0"; //fix by andrius4669\r
+       unsigned int EMSVer = 0;\r
+       unsigned        totalEMSpages,freeEMSpages,EMSPageFrame,EMSHandle,EMSAvail;\r
+       totalEMSpages = freeEMSpages = EMSPageFrame = 0;\r
+       EMSPresent = false;                     // Assume that we'll fail\r
        gvar->pm.emm.EMSAvail = 0;\r
-       emmcfems=0;\r
 \r
        __asm {\r
-       //CPURegs.x.dx = (word)EMMDriverName;\r
-       //CPURegs.x.ax = 0x3d00;\r
-       //geninterrupt(0x21);                   // try to open EMMXXXX0 device\r
-               mov     dx,OFFSET EMMDriverName\r
+               mov     dx,OFFSET emmname       //fix by andrius4669\r
                mov     ax,0x3d00\r
-               int     0x21            // try to open EMMXXXX0 device\r
-               jnc     gothandle\r
-               //fail\r
-               mov     emmcfems,1\r
-               jmp             Aend\r
+               int     EMS_INT         // try to open EMMXXXX0 device\r
+               jc      error1\r
+\r
+               mov     bx,ax\r
+               mov     ax,0x4400\r
+\r
+               int     EMS_INT         // get device info\r
+               jc      error1\r
+\r
+               and     dx,0x80\r
+               jz      error1\r
+\r
+               mov     ax,0x4407\r
+\r
+               int     EMS_INT         // get status\r
+               jc      error1\r
+               or      al,al\r
+               jz      error1\r
+\r
+               mov     ah,0x3e\r
+               int     EMS_INT         // close handle\r
+               jc      error1\r
+\r
+               mov     ah,EMS_STATUS\r
+               int     EMS_INT\r
+               jc      error1                  // make sure EMS hardware is present\r
+\r
+               mov     ah,EMS_VERSION\r
+               int     EMS_INT                 // only work on EMS 3.2 or greater (silly, but...)\r
+               or      ah,ah\r
+               jnz     error1\r
+               mov     [EMSVer],ax             //      set EMSVer\r
+               cmp     al,0x32                 // only work on ems 3.2 or greater\r
+               jb      error1\r
+\r
+               mov     ah,EMS_GETFRAME\r
+               int     EMS_INT                 // find the page frame address\r
+               or      ah,ah\r
+               jnz     error1\r
+               mov     [EMSPageFrame],bx\r
+\r
+               mov     ah,EMS_GETPAGES\r
+               int     EMS_INT                 // find out how much EMS is there\r
+               or      ah,ah\r
+               jnz     error1\r
+               or      bx,bx\r
+               jz      noEMS                   // no EMS at all to allocate\r
+               cmp     bx,2\r
+               jl      noEMS                   // Require at least 2 pages (32k)\r
+               mov     [totalEMSpages],dx\r
+               mov     [freeEMSpages],bx\r
+               mov     [EMSAvail],bx\r
+               jmp End1\r
 #ifdef __BORLANDC__\r
        }\r
 #endif\r
-\r
-gothandle:\r
+       error1:\r
 #ifdef __BORLANDC__\r
        __asm {\r
 #endif\r
-       //CPURegs.x.bx = CPURegs.x.ax;\r
-       //CPURegs.x.ax = 0x4400;\r
-       //geninterrupt(0x21);                   // get device info\r
-               mov     bx,ax\r
-               mov     ax,0x4400\r
-               int     0x21                    // get device info\r
-               jnc     gotinfo\r
-               //fail\r
-               mov     emmcfems,1\r
-               jmp             Aend\r
+               mov     err,ah\r
+               mov     errorflag,1\r
+               jmp End1\r
 #ifdef __BORLANDC__\r
        }\r
 #endif\r
-Aend:\r
-gotinfo:\r
-#ifndef __BORLANDC__\r
+noEMS:\r
+End1:\r
+#ifdef __WATCOMC__\r
        }\r
 #endif\r
-       if(emmcfems!=0) goto error;\r
-       __asm and       dx,0x80\r
-       if (!CPURegs.x.dx)\r
-               goto error;\r
-\r
-       CPURegs.x.ax = 0x4407;\r
-       geninterrupt(0x21);                     // get status\r
-       __asm mov       emmcfems,1\r
-       if(emmcfems!=0) goto error;\r
-\r
-       if (!CPURegs.h.al)\r
-               goto error;\r
-\r
-       CPURegs.h.ah = 0x3e;\r
-       geninterrupt(0x21);                     // close handle\r
-\r
-       CPURegs.h.ah = EMS_STATUS;\r
-       geninterrupt(EMS_INT);\r
-       if (CPURegs.h.ah)\r
-               goto error;                             // make sure EMS hardware is present\r
-\r
-       CPURegs.h.ah = EMS_VERSION;\r
-       geninterrupt(EMS_INT);\r
-       if (CPURegs.h.ah || (CPURegs.h.al < 0x32))      // only work on EMS 3.2 or greater (silly, but...)\r
-               goto error;\r
-\r
-       CPURegs.h.ah = EMS_GETFRAME;\r
-       geninterrupt(EMS_INT);\r
-       if (CPURegs.h.ah)\r
-               goto error;                             // find the page frame address\r
-       gvar->pm.emm.EMSPageFrame = CPURegs.x.bx;\r
-\r
-       CPURegs.h.ah = EMS_GETPAGES;\r
-       geninterrupt(EMS_INT);\r
-       if (CPURegs.h.ah)\r
-               goto error;\r
-       if (CPURegs.x.bx < 2)\r
-               goto error;             // Require at least 2 pages (32k)\r
-       gvar->pm.emm.EMSAvail = CPURegs.x.bx;\r
-\r
-       // Don't hog all available EMS\r
-       size = gvar->pm.emm.EMSAvail * (long)EMSPageSize;\r
-       if (size - (EMSPageSize * 2) > (gvar->pm.fi.ChunksInFile * (long)PMPageSize))\r
+/*\r
+       if(errorflag==false)\r
        {\r
-               size = (gvar->pm.fi.ChunksInFile * (long)PMPageSize) + EMSPageSize;\r
-               gvar->pm.emm.EMSAvail = size / EMSPageSize;\r
+               // Don't hog all available EMS\r
+               size = gvar->pm.emm.EMSAvail * (long)EMSPageSize;\r
+               if (size - (EMSPageSize * 2) > (gvar->pm.fi.ChunksInFile * (long)PMPageSize))\r
+               {\r
+                       size = (gvar->pm.fi.ChunksInFile * (long)PMPageSize) + EMSPageSize;\r
+                       gvar->pm.emm.EMSAvail = size / EMSPageSize;\r
+               }\r
        }\r
+*/\r
+       __asm {\r
+               mov     ah,EMS_ALLOCPAGES\r
+               mov     bx,[EMSAvail];\r
+               int     EMS_INT\r
+               or      ah,ah\r
+               jnz     error2\r
+               mov     [EMSHandle],dx\r
+               jmp     End2\r
+#ifdef __BORLANDC__\r
+       }\r
+#endif\r
+       error2:\r
+#ifdef __BORLANDC__\r
+       __asm {\r
+#endif\r
+               mov     err,ah\r
+               mov     errorflag,1\r
+               jmp End2\r
+#ifdef __BORLANDC__\r
+       }\r
+#endif\r
+End2:\r
+#ifdef __WATCOMC__\r
+       }\r
+#endif\r
 \r
-       CPURegs.h.ah = EMS_ALLOCPAGES;\r
-       CPURegs.x.bx = gvar->pm.emm.EMSAvail;\r
-       geninterrupt(EMS_INT);\r
-       if (CPURegs.h.ah)\r
-               goto error;\r
-       gvar->pm.emm.EMSHandle = CPURegs.x.dx;\r
-\r
+       if(errorflag==false)\r
+       {\r
        gvar->mmi.EMSmem += gvar->pm.emm.EMSAvail * (long)EMSPageSize;\r
 \r
        // Initialize EMS mapping cache\r
        for (i = 0;i < EMSFrameCount;i++)\r
                gvar->pm.emm.EMSList[i].baseEMSPage = -1;\r
 \r
-       gvar->pm.emm.EMSPresent = true;                 // We have EMS\r
+       }\r
+       else\r
+       {\r
+               strcpy(str,"PML_StartupEMS: EMS error ");\r
+               MM_EMSerr(str, err);\r
+               printf("%s\n",str);\r
+               return(EMSPresent);\r
+       }\r
 \r
-error:\r
-       return(gvar->pm.emm.EMSPresent);\r
+       EMSPresent = true;                      // We have EMS\r
+       gvar->pm.emm.EMSPageFrame = EMSPageFrame;\r
+       gvar->pm.emm.EMSAvail = EMSAvail;\r
+       gvar->pm.emm.EMSVer = EMSVer;\r
+       gvar->pm.emm.EMSHandle = EMSHandle;\r
+       gvar->pm.emm.freeEMSpages = freeEMSpages;\r
+       gvar->pm.emm.totalEMSpages = totalEMSpages;\r
+\r
+       return(EMSPresent);\r
 }\r
 \r
 //\r
@@ -230,15 +297,43 @@ error:
 void\r
 PML_ShutdownEMS(global_game_variables_t *gvar)\r
 {\r
-       union REGS CPURegs;\r
+       word EMSHandle;\r
+       byte err;\r
+       byte    str[64];\r
+       boolean errorflag=false;\r
 \r
-       if (gvar->pm.emm.EMSPresent)\r
+       EMSHandle=gvar->pm.emm.EMSHandle;\r
+\r
+       if (EMSPresent)\r
        {\r
-                       CPURegs.h.ah=EMS_FREEPAGES;\r
-                       CPURegs.x.ax=gvar->pm.emm.EMSHandle;\r
-                       geninterrupt(EMS_INT);\r
-               if (CPURegs.h.ah)\r
+               __asm {\r
+                       mov     ah,EMS_FREEPAGES\r
+                       mov     dx,[EMSHandle]\r
+                       int     EMS_INT\r
+                       jc      errors\r
+                       jmp     Ends\r
+#ifdef __BORLANDC__\r
+               }\r
+#endif\r
+                       errors:\r
+#ifdef __BORLANDC__\r
+               __asm {\r
+#endif\r
+                       mov     err,ah\r
+                       mov     errorflag,1\r
+                       jmp Ends\r
+#ifdef __BORLANDC__\r
+               }\r
+#endif\r
+               Ends:\r
+#ifdef __WATCOMC__\r
+               }\r
+#endif\r
+               if(errorflag==true)\r
                {\r
+                       strcpy(str,"PML_ShutdownEMS: Error freeing EMS ");\r
+                       MM_EMSerr(str, err);\r
+                       printf("%s\n",str);\r
                        Quit("PML_ShutdownEMS: Error freeing EMS\n");\r
                        //return;\r
                }\r
@@ -260,15 +355,12 @@ PML_ShutdownEMS(global_game_variables_t *gvar)
 boolean\r
 PML_StartupXMS(global_game_variables_t *gvar)\r
 {\r
-       union REGS CPURegs;\r
-\r
-       XMSD;\r
-       gvar->pm.xmm.XMSPresent = false;                                        // Assume failure\r
+       XMSPresent = false;                                     // Assume failure\r
        gvar->pm.xmm.XMSAvail = 0;\r
 \r
-       CPURegs.x.ax=0x4300;\r
+       _AX=0x4300;\r
        geninterrupt(XMS_INT);                                  // Check for presence of XMS driver\r
-       if (CPURegs.h.al != 0x80)\r
+       if (_AL != 0x80)\r
                goto error;\r
 \r
 \r
@@ -279,20 +371,20 @@ PML_StartupXMS(global_game_variables_t *gvar)
                mov     [WORD PTR XMSDriver+2],es               // function pointer to XMS driver\r
        }\r
 \r
-       XMS_CALL(XMS_QUERYFREE, gvar);                  // Find out how much XMS is available\r
-       gvar->pm.xmm.XMSAvail = CPURegs.x.ax;\r
-       if (!CPURegs.x.ax)                              // AJR: bugfix 10/8/92\r
+       XMS_CALL(XMS_QUERYFREE);                        // Find out how much XMS is available\r
+       gvar->pm.xmm.XMSAvail = _AX;\r
+       if (!_AX)                               // AJR: bugfix 10/8/92\r
                goto error;\r
 \r
        gvar->pm.xmm.XMSAvail &= ~(PMPageSizeKB - 1);   // Round off to nearest page size\r
        if (gvar->pm.xmm.XMSAvail < (PMPageSizeKB * 2)) // Need at least 2 pages\r
                goto error;\r
 \r
-       CPURegs.x.dx = gvar->pm.xmm.XMSAvail;\r
-       XMS_CALL(XMS_ALLOC, gvar);                              // And do the allocation\r
-       gvar->pm.xmm.XMSHandle = CPURegs.x.dx;\r
+       _DX = gvar->pm.xmm.XMSAvail;\r
+       XMS_CALL(XMS_ALLOC);                            // And do the allocation\r
+       gvar->pm.xmm.XMSHandle = _DX;\r
 \r
-       if (!CPURegs.x.ax)                              // AJR: bugfix 10/8/92\r
+       if (!_AX)                               // AJR: bugfix 10/8/92\r
        {\r
                gvar->pm.xmm.XMSAvail = 0;\r
                goto error;\r
@@ -300,9 +392,9 @@ PML_StartupXMS(global_game_variables_t *gvar)
 \r
        gvar->mmi.XMSmem += gvar->pm.xmm.XMSAvail * 1024;\r
 \r
-       gvar->pm.xmm.XMSPresent = true;\r
+       XMSPresent = true;\r
 error:\r
-       return(gvar->pm.xmm.XMSPresent);\r
+       return(XMSPresent);\r
 }\r
 \r
 //\r
@@ -312,7 +404,6 @@ error:
 void\r
 PML_XMSCopy(boolean toxms,byte far *addr,word xmspage,word length, global_game_variables_t *gvar)\r
 {\r
-       XMSD;\r
        dword   xoffset;\r
        struct\r
        {\r
@@ -340,12 +431,12 @@ PML_XMSCopy(boolean toxms,byte far *addr,word xmspage,word length, global_game_v
        __asm {\r
                push si\r
        }\r
-       CPURegs.x.si = (word)&copy;\r
-       XMS_CALL(XMS_MOVE, gvar);\r
+       _SI = (word)&copy;\r
+       XMS_CALL(XMS_MOVE);\r
        __asm {\r
                pop     si\r
        }\r
-       if (!CPURegs.x.ax)\r
+       if (!_AX)\r
        {\r
                Quit("PML_XMSCopy: Error on copy");\r
                //return;\r
@@ -383,12 +474,11 @@ PML_CopyFromXMS(byte far *target,int sourcepage,word length, global_game_variabl
 void\r
 PML_ShutdownXMS(global_game_variables_t *gvar)\r
 {\r
-       XMSD;\r
-       if (gvar->pm.xmm.XMSPresent)\r
+       if (XMSPresent)\r
        {\r
-               CPURegs.x.dx = gvar->pm.xmm.XMSHandle;\r
-               XMS_CALL(XMS_FREE, gvar);\r
-               if (CPURegs.h.bl)\r
+               _DX = gvar->pm.xmm.XMSHandle;\r
+               XMS_CALL(XMS_FREE);\r
+               if (_BL)\r
                {\r
                        Quit("PML_ShutdownXMS: Error freeing XMS");\r
                        //return;\r
@@ -412,9 +502,21 @@ PM_SetMainMemPurge(int level, global_game_variables_t *gvar)
 {\r
        int     i;\r
 \r
+       if(MainPresent)\r
        for (i = 0;i < PMMaxMainMem;i++)\r
+       {\r
+#ifdef __DEBUG_PM__\r
+               printf("PM_SetMainMemPurge()    info of gvar->pm.mm.MainMemPages[i]\n");\r
+               printf("&       %Fp,    %Fp\n", &gvar->pm.mm.MainMemPages[i],   &(gvar->pm.mm.MainMemPages[i]));\r
+#endif\r
                if (gvar->pm.mm.MainMemPages[i])\r
-                       MM_SetPurge(&gvar->pm.mm.MainMemPages[i],level, gvar);\r
+                       MM_SetPurge(&(gvar->pm.mm.MainMemPages[i]),level, gvar);\r
+       }\r
+\r
+       else\r
+       {\r
+               Quit("MainPresent IS NULL\n");\r
+       }\r
 }\r
 \r
 //\r
@@ -439,7 +541,7 @@ PM_CheckMainMem(global_game_variables_t *gvar)
        PMBlockAttr             *used;\r
        PageListStruct  far *page;\r
 \r
-       if (!gvar->pm.mm.MainPresent)\r
+       if (!MainPresent)\r
                return;\r
 \r
        for (i = 0,page = gvar->pm.PMPages;i < gvar->pm.fi.ChunksInFile;i++,page++)\r
@@ -506,7 +608,11 @@ PML_StartupMainMem(global_game_variables_t *gvar)
        memptr  *p;\r
 \r
        gvar->pm.mm.MainPagesAvail = 0;\r
+       MainPresent = false;\r
        MM_BombOnError(false, gvar);\r
+       printf("PML_StartupMainMem()\n");\r
+       printf("        p=%04x  MainMemPages=%04x\n", p, gvar->pm.mm.MainMemPages);\r
+       printf("        p=%Fp   MainMemPages=%Fp\n", p, gvar->pm.mm.MainMemPages);\r
        for (i = 0,p = gvar->pm.mm.MainMemPages;i < PMMaxMainMem;i++,p++)\r
        {\r
                MM_GetPtr(p,PMPageSize, gvar);\r
@@ -524,7 +630,7 @@ PML_StartupMainMem(global_game_variables_t *gvar)
                Quit("PM_SetupMainMem: Not enough main memory");\r
                //return;\r
        }\r
-       gvar->pm.mm.MainPresent = true;\r
+       MainPresent = true;\r
 }\r
 \r
 //\r
@@ -781,7 +887,7 @@ PML_GiveLRUPage(boolean mainonly, global_game_variables_t *gvar)
 //\r
 //     PML_GiveLRUXMSPage() - Returns the page # of the least recently used\r
 //             (and present) XMS page.\r
-//     This routine won't return the XMS page protected (by gvar->pm.xmm.XMSProtectPage)\r
+//     This routine won't return the XMS page protected (by XMSProtectPage)\r
 //\r
 int\r
 PML_GiveLRUXMSPage(global_game_variables_t *gvar)\r
@@ -816,7 +922,7 @@ PML_PutPageInXMS(int pagenum, global_game_variables_t *gvar)
        int                             usexms;\r
        PageListStruct  far *page;\r
 \r
-       if (!gvar->pm.xmm.XMSPresent)\r
+       if (!XMSPresent)\r
                return;\r
 \r
        page = &gvar->pm.PMPages[pagenum];\r
@@ -945,7 +1051,7 @@ PML_GetPageFromXMS(int pagenum,boolean mainonly, global_game_variables_t *gvar)
        PageListStruct  far *page;\r
 \r
        page = &gvar->pm.PMPages[pagenum];\r
-       if (gvar->pm.xmm.XMSPresent && (page->xmsPage != -1))\r
+       if (XMSPresent && (page->xmsPage != -1))\r
        {\r
                gvar->pm.xmm.XMSProtectPage = pagenum;\r
                checkaddr = PML_GetAPageBuffer(pagenum,mainonly, gvar);\r
@@ -1237,6 +1343,9 @@ PM_Reset(global_game_variables_t *gvar)
 \r
        gvar->pm.PMPanicMode = false;\r
 \r
+       gvar->pm.fi.PageFile = -1;\r
+       gvar->pm.xmm.XMSProtectPage = -1;\r
+\r
        // Initialize page list\r
        for (i = 0,page = gvar->pm.PMPages;i < gvar->pm.PMNumBlocks;i++,page++)\r
        {\r
@@ -1256,12 +1365,10 @@ PM_Startup(global_game_variables_t *gvar)
        boolean nomain,noems,noxms;\r
        int             i;\r
 \r
-       if (gvar->pm.PMStarted)\r
+       if (PMStarted)\r
                return;\r
 \r
-       strcat(&(gvar->pm.fi.PageFileName), "VSWAP.");\r
-       gvar->pm.fi.PageFile = -1;\r
-       gvar->pm.xmm.XMSProtectPage = -1;\r
+       strcpy(&(gvar->pm.fi.PageFileName), "VSWAP.");\r
 \r
        nomain = noems = noxms = false;\r
        for (i = 1;i <\r
@@ -1294,24 +1401,23 @@ PM_Startup(global_game_variables_t *gvar)
                }\r
        }\r
 \r
-       PML_OpenPageFile(gvar);\r
+       //0000++++PML_OpenPageFile(gvar);\r
 \r
        if (!noems)\r
                PML_StartupEMS(gvar);\r
        if (!noxms)\r
-               PML_StartupXMS(gvar);\r
+               //++++PML_StartupXMS(gvar);     //TODO: convert\r
 \r
-       if (nomain && !gvar->pm.emm.EMSPresent)\r
+       if (!nomain && !EMSPresent)\r
        {\r
                Quit("PM_Startup: No main or EMS\n");\r
                //return;\r
        }\r
-       else\r
-               PML_StartupMainMem(gvar);\r
+       PML_StartupMainMem(gvar);\r
 \r
        PM_Reset(gvar);\r
 \r
-       gvar->pm.PMStarted = true;\r
+       PMStarted = true;\r
 }\r
 \r
 //\r
@@ -1323,7 +1429,7 @@ PM_Shutdown(global_game_variables_t *gvar)
        PML_ShutdownXMS(gvar);\r
        PML_ShutdownEMS(gvar);\r
 \r
-       if (!gvar->pm.PMStarted)\r
+       if (!PMStarted)\r
                return;\r
 \r
        PML_ClosePageFile(gvar);\r