]> 4ch.mooo.com Git - 16.git/blobdiff - src/lib/16_pm.c
====XMS MOSTLY translated but crashes EXMMTEST.EXE ====
[16.git] / src / lib / 16_pm.c
index ea11ac488cca2b2dbc659ed4470f883268dd0763..10ee7b6ddee6969f88ae45e9cf92790ecaf8325e 100755 (executable)
 #include "src/lib/16_pm.h"\r
 #pragma hdrstop\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
+       //boolean                       MainPresent;\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 @@
                                        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
@@ -95,7 +98,7 @@ PML_MapEMS(word logical, byte physical, global_game_variables_t *gvar)
                int     EMS_INT\r
                or      ah,ah\r
                jnz     error\r
-               jmp End\r
+               jmp     End\r
 #ifdef __BORLANDC__\r
        }\r
 #endif\r
@@ -132,110 +135,160 @@ PML_MapEMS(word logical, byte 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
        int             i;\r
        long    size;\r
-       boolean errorflag;\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
        gvar->pm.emm.EMSPresent = false;                        // Assume that we'll fail\r
        gvar->pm.emm.EMSAvail = 0;\r
-       errorflag=0;\r
+       gvar->mmi.EMSmem = 0;\r
 \r
-       _DX = (word)EMMDriverName;\r
-       _AX = 0x3d00;\r
-       geninterrupt(0x21);                     // try to open EMMXXXX0 device\r
        __asm {\r
-               jnc     gothandle\r
-               mov     errorflag,1\r
-               gothandle:\r
-       }\r
-       if(errorflag)\r
-               goto error;\r
+               mov     dx,OFFSET emmname       //fix by andrius4669\r
+               mov     ax,0x3d00\r
+               int     EMS_INT         // try to open EMMXXXX0 device\r
+               jc      erroreu\r
 \r
-//gothandle:\r
-       _BX = _AX;\r
-       _AX = 0x4400;\r
-       geninterrupt(0x21);                     // get device info\r
-       __asm {\r
-               jnc     gotinfo\r
-               mov     errorflag,1\r
-               gotinfo:\r
-       }\r
-       if(errorflag)\r
-               goto error;\r
+               mov     bx,ax\r
+               mov     ax,0x4400\r
 \r
-//gotinfo:\r
-__asm  and     dx,0x80\r
-       if (!_DX)\r
-               goto error;\r
+               int     EMS_INT         // get device info\r
+               jc      erroreu\r
 \r
-       _AX = 0x4407;\r
-       geninterrupt(0x21);                     // get status\r
-       __asm {\r
-               jc      error\r
-               jmp     end\r
-               error:\r
-               mov     errorflag,1\r
-               end:\r
-       }\r
-       if (!_AL)\r
-               goto error;\r
+               and     dx,0x80\r
+               jz      erroreu\r
 \r
-       _AH = 0x3e;\r
-       geninterrupt(0x21);                     // close handle\r
+               mov     ax,0x4407\r
 \r
-       _AH = EMS_STATUS;\r
-       geninterrupt(EMS_INT);\r
-       if (_AH)\r
-               goto error;                             // make sure EMS hardware is present\r
+               int     EMS_INT         // get status\r
+               jc      erroreu\r
+               or      al,al\r
+               jz      erroreu\r
 \r
-       _AH = EMS_VERSION;\r
-       geninterrupt(EMS_INT);\r
-       if (_AH || (_AL < 0x32))        // only work on EMS 3.2 or greater (silly, but...)\r
-               goto error;\r
+               mov     ah,0x3e\r
+               int     EMS_INT         // close handle\r
+               jc      erroreu\r
 \r
-       _AH = EMS_GETFRAME;\r
-       geninterrupt(EMS_INT);\r
-       if (_AH)\r
-               goto error;                             // find the page frame address\r
-       gvar->pm.emm.EMSPageFrame = _BX;\r
+               mov     ah,EMS_STATUS\r
+               int     EMS_INT\r
+               jc      erroreu                 // make sure EMS hardware is present\r
 \r
-       _AH = EMS_GETPAGES;\r
-       geninterrupt(EMS_INT);\r
-       if (_AH)\r
-               goto error;\r
-       if (_BX < 2)\r
-               goto error;             // Require at least 2 pages (32k)\r
-       gvar->pm.emm.EMSAvail = _BX;\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     erroreu\r
+               mov     [EMSVer],ax             //      set EMSVer\r
+               cmp     al,0x32                 // only work on ems 3.2 or greater\r
+               jb      erroreu\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
+               mov     ah,EMS_GETFRAME\r
+               int     EMS_INT                 // find the page frame address\r
+               or      ah,ah\r
+               jnz     erroreu\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     erroreu\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     Endeu\r
+#ifdef __BORLANDC__\r
+       }\r
+#endif\r
+               erroreu:\r
+#ifdef __BORLANDC__\r
+       __asm {\r
+#endif\r
+               mov     err,ah\r
+               mov     errorflag,1\r
+               jmp     Endeu\r
+#ifdef __BORLANDC__\r
+       }\r
+#endif\r
+               noEMS:\r
+               Endeu:\r
+#ifdef __WATCOMC__\r
+       }\r
+#endif\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     erroreuu\r
+               mov     [EMSHandle],dx\r
+               jmp     Endeuu\r
+#ifdef __BORLANDC__\r
+       }\r
+#endif\r
+               erroreuu:\r
+#ifdef __BORLANDC__\r
+       __asm {\r
+#endif\r
+               mov     err,ah\r
+               mov     errorflag,1\r
+               jmp Endeuu\r
+#ifdef __BORLANDC__\r
+       }\r
+#endif\r
+               Endeuu:\r
+#ifdef __WATCOMC__\r
+       }\r
+#endif\r
 \r
-       _AH = EMS_ALLOCPAGES;\r
-       _BX = gvar->pm.emm.EMSAvail;\r
-       geninterrupt(EMS_INT);\r
-       if (_AH)\r
-               goto error;\r
-       gvar->pm.emm.EMSHandle = _DX;\r
-\r
-       gvar->mmi.EMSmem += gvar->pm.emm.EMSAvail * (long)EMSPageSize;\r
+       if(errorflag==false)\r
+       {\r
+       gvar->pm.emm.EMSAvail = EMSAvail;\r
+       gvar->mmi.EMSmem = gvar->pm.emm.EMSAvail * (dword)EMSPageSize;\r
 \r
        // Initialize EMS mapping cache\r
        for (i = 0;i < EMSFrameCount;i++)\r
                gvar->pm.emm.EMSList[i].baseEMSPage = -1;\r
 \r
+       }\r
+       else\r
+       {\r
+               strcpy(str,"PML_StartupEMS: EMS error ");\r
+               MM_EMSerr(str, err);\r
+               printf("%s\n",str);\r
+               return(gvar->pm.emm.EMSPresent);\r
+       }\r
+\r
        gvar->pm.emm.EMSPresent = true;                 // We have EMS\r
+       gvar->pm.emm.EMSPageFrame = EMSPageFrame;\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
-error:\r
        return(gvar->pm.emm.EMSPresent);\r
 }\r
 \r
@@ -246,6 +299,10 @@ void
 PML_ShutdownEMS(global_game_variables_t *gvar)\r
 {\r
        word EMSHandle;\r
+       byte err;\r
+       byte    str[64];\r
+       boolean errorflag=false;\r
+\r
        EMSHandle=gvar->pm.emm.EMSHandle;\r
 \r
        if (gvar->pm.emm.EMSPresent)\r
@@ -254,9 +311,30 @@ PML_ShutdownEMS(global_game_variables_t *gvar)
                        mov     ah,EMS_FREEPAGES\r
                        mov     dx,[EMSHandle]\r
                        int     EMS_INT\r
+                       jc      errores\r
+                       jmp     Endes\r
+#ifdef __BORLANDC__\r
+               }\r
+#endif\r
+                       errores:\r
+#ifdef __BORLANDC__\r
+               __asm {\r
+#endif\r
+                       mov     err,ah\r
+                       mov     errorflag,1\r
+                       jmp     Endes\r
+#ifdef __BORLANDC__\r
                }\r
-               if (_AH)\r
+#endif\r
+                       Endes:\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
@@ -278,45 +356,86 @@ PML_ShutdownEMS(global_game_variables_t *gvar)
 boolean\r
 PML_StartupXMS(global_game_variables_t *gvar)\r
 {\r
-       XMSD;\r
-       gvar->pm.xmm.XMSPresent = false;                                        // Assume failure\r
-       gvar->pm.xmm.XMSAvail = 0;\r
-\r
-       _AX=0x4300;\r
-       geninterrupt(XMS_INT);                                  // Check for presence of XMS driver\r
-       if (_AL != 0x80)\r
-               goto error;\r
-\r
+       boolean errorflag;\r
+       word XMSAvail, XMSHandle;\r
+       errorflag=gvar->pm.xmm.XMSPresent = false;                                      // Assume failure\r
+       XMSAvail = gvar->pm.xmm.XMSAvail = 0;\r
 \r
        __asm {\r
+               mov     ax,0x4300\r
+               int     XMS_INT                                         // Check for presence of XMS driver\r
+               cmp     al,0x80\r
+               jne     errorxu\r
+\r
                mov     ax,0x4310\r
                int     XMS_INT                                                 // Get address of XMS driver\r
                mov     [WORD PTR XMSDriver],bx\r
                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 = _AX;\r
-       if (!_AX)                               // AJR: bugfix 10/8/92\r
-               goto error;\r
 \r
+               //XMS_CALL(XMS_QUERYFREE);                      // Find out how much XMS is available\r
+               mov     ah,XMS_QUERYFREE\r
+               call    [WORD PTR XMSDriver]\r
+               mov     [XMSAvail],ax\r
+               or      ax,ax                           // AJR: bugfix 10/8/92\r
+               jz      errorxu\r
+               jmp     Endxu\r
+#ifdef __BORLANDC__\r
+       }\r
+#endif\r
+               errorxu:\r
+#ifdef __BORLANDC__\r
+       __asm {\r
+#endif\r
+               //mov   err,ah\r
+               mov     errorflag,1\r
+               jmp     Endxu\r
+#ifdef __BORLANDC__\r
+       }\r
+#endif\r
+               Endxu:\r
+#ifdef __WATCOMC__\r
+       }\r
+#endif\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
-       _DX = gvar->pm.xmm.XMSAvail;\r
-       XMS_CALL(XMS_ALLOC, gvar);                              // And do the allocation\r
-       gvar->pm.xmm.XMSHandle = _DX;\r
-\r
-       if (!_AX)                               // AJR: bugfix 10/8/92\r
-       {\r
-               gvar->pm.xmm.XMSAvail = 0;\r
-               goto error;\r
+       __asm {\r
+               mov     dx,[XMSAvail]\r
+               //XMS_CALL(XMS_ALLOC);                          // And do the allocation\r
+               mov     ah,XMS_ALLOC\r
+               call    [WORD PTR XMSDriver]\r
+               mov     [XMSHandle],dx\r
+               or      ax,ax                           // AJR: bugfix 10/8/92\r
+               jz      errorxuu\r
+               jmp     Endxuu\r
+#ifdef __BORLANDC__\r
+               }\r
+#endif\r
+               errorxuu:\r
+#ifdef __BORLANDC__\r
+       __asm {\r
+#endif\r
+               //mov   err,ah\r
+               mov     [XMSAvail],0\r
+               mov     errorflag,1\r
+               jmp     Endxuu\r
+#ifdef __BORLANDC__\r
+       }\r
+#endif\r
+               Endxuu:\r
+#ifdef __WATCOMC__\r
        }\r
+#endif\r
 \r
-       gvar->mmi.XMSmem += gvar->pm.xmm.XMSAvail * 1024;\r
+       if(errorflag==false)\r
+       {\r
+               gvar->pm.xmm.XMSAvail = XMSAvail;\r
+               gvar->mmi.XMSmem += gvar->pm.xmm.XMSAvail * 1024;\r
+               gvar->pm.xmm.XMSHandle = XMSHandle;\r
 \r
-       gvar->pm.xmm.XMSPresent = true;\r
+               gvar->pm.xmm.XMSPresent = true;\r
+       }\r
 error:\r
        return(gvar->pm.xmm.XMSPresent);\r
 }\r
@@ -328,7 +447,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
@@ -357,7 +475,7 @@ PML_XMSCopy(boolean toxms,byte far *addr,word xmspage,word length, global_game_v
                push si\r
        }\r
        _SI = (word)&copy;\r
-       XMS_CALL(XMS_MOVE, gvar);\r
+       XMS_CALL(XMS_MOVE);\r
        __asm {\r
                pop     si\r
        }\r
@@ -399,12 +517,36 @@ 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
+       boolean errorflag=false;\r
+       word XMSHandle = gvar->pm.xmm.XMSHandle;\r
        if (gvar->pm.xmm.XMSPresent)\r
        {\r
-               _DX = gvar->pm.xmm.XMSHandle;\r
-               XMS_CALL(XMS_FREE, gvar);\r
-               if (_BL)\r
+               __asm {\r
+                       mov     dx,[XMSHandle]\r
+                       //XMS_CALL(XMS_FREE);\r
+                       mov     ah,XMS_FREE\r
+                       call    [WORD PTR XMSDriver]\r
+                       or      bl,bl\r
+                       jz      errorxs\r
+                       jmp     Endxs\r
+#ifdef __BORLANDC__\r
+               }\r
+#endif\r
+                       errorxs:\r
+#ifdef __BORLANDC__\r
+               __asm {\r
+#endif\r
+                       //mov   err,ah\r
+                       mov     errorflag,1\r
+                       jmp     Endxs\r
+#ifdef __BORLANDC__\r
+               }\r
+#endif\r
+                       Endxs:\r
+#ifdef __WATCOMC__\r
+               }\r
+#endif\r
+               if(errorflag==true)\r
                {\r
                        Quit("PML_ShutdownXMS: Error freeing XMS");\r
                        //return;\r
@@ -428,15 +570,20 @@ PM_SetMainMemPurge(int level, global_game_variables_t *gvar)
 {\r
        int     i;\r
 \r
+       if(gvar->pm.mm.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
                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
@@ -529,6 +676,7 @@ PML_StartupMainMem(global_game_variables_t *gvar)
        memptr  *p;\r
 \r
        gvar->pm.mm.MainPagesAvail = 0;\r
+       gvar->pm.mm.MainPresent = false;\r
        MM_BombOnError(false, gvar);\r
        for (i = 0,p = gvar->pm.mm.MainMemPages;i < PMMaxMainMem;i++,p++)\r
        {\r
@@ -804,7 +952,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
@@ -1260,6 +1408,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
@@ -1282,9 +1433,7 @@ PM_Startup(global_game_variables_t *gvar)
        if (gvar->pm.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
@@ -1317,20 +1466,24 @@ 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
+       /*if (!noxms)\r
+       {\r
+               //++++\r
+               printf("PML_StartupXMS ");\r
+               PML_StartupXMS(gvar);   //TODO: convert\r
+               printf("ok!\n");\r
+       }*/\r
 \r
-       if (nomain && !gvar->pm.emm.EMSPresent)\r
+       if (!nomain && !gvar->pm.emm.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