]> 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 82f45dbdc676f05563f67d177af760483ccc9b79..10ee7b6ddee6969f88ae45e9cf92790ecaf8325e 100755 (executable)
@@ -34,19 +34,19 @@ boolean debugpm=0;
 #endif\r
 \r
 //     Main Mem specific variables\r
-       boolean                 MainPresent;\r
+       //boolean                       MainPresent;\r
 /*     memptr                  MainMemPages[PMMaxMainMem];\r
        PMBlockAttr             gvar->pm.mm.MainMemUsed[PMMaxMainMem];\r
        int                             gvar->pm.mm.MainPagesAvail;*/\r
 \r
 //     EMS specific variables\r
-       boolean                 EMSPresent;\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
 \r
 //     XMS specific variables\r
-       boolean                 XMSPresent;\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
@@ -58,7 +58,7 @@ boolean debugpm=0;
        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
@@ -98,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
@@ -148,57 +148,58 @@ PML_StartupEMS(global_game_variables_t *gvar)
        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.EMSPresent = false;                        // Assume that we'll fail\r
        gvar->pm.emm.EMSAvail = 0;\r
+       gvar->mmi.EMSmem = 0;\r
 \r
        __asm {\r
                mov     dx,OFFSET emmname       //fix by andrius4669\r
                mov     ax,0x3d00\r
                int     EMS_INT         // try to open EMMXXXX0 device\r
-               jc      error1\r
+               jc      erroreu\r
 \r
                mov     bx,ax\r
                mov     ax,0x4400\r
 \r
                int     EMS_INT         // get device info\r
-               jc      error1\r
+               jc      erroreu\r
 \r
                and     dx,0x80\r
-               jz      error1\r
+               jz      erroreu\r
 \r
                mov     ax,0x4407\r
 \r
                int     EMS_INT         // get status\r
-               jc      error1\r
+               jc      erroreu\r
                or      al,al\r
-               jz      error1\r
+               jz      erroreu\r
 \r
                mov     ah,0x3e\r
                int     EMS_INT         // close handle\r
-               jc      error1\r
+               jc      erroreu\r
 \r
                mov     ah,EMS_STATUS\r
                int     EMS_INT\r
-               jc      error                 // make sure EMS hardware is present\r
+               jc      erroreu                 // 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
+               jnz     erroreu\r
                mov     [EMSVer],ax             //      set EMSVer\r
                cmp     al,0x32                 // only work on ems 3.2 or greater\r
-               jb      error1\r
+               jb      erroreu\r
 \r
                mov     ah,EMS_GETFRAME\r
                int     EMS_INT                 // find the page frame address\r
                or      ah,ah\r
-               jnz     error1\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     error1\r
+               jnz     erroreu\r
                or      bx,bx\r
                jz      noEMS                   // no EMS at all to allocate\r
                cmp     bx,2\r
@@ -206,22 +207,22 @@ PML_StartupEMS(global_game_variables_t *gvar)
                mov     [totalEMSpages],dx\r
                mov     [freeEMSpages],bx\r
                mov     [EMSAvail],bx\r
-               jmp End1\r
+               jmp     Endeu\r
 #ifdef __BORLANDC__\r
        }\r
 #endif\r
-       error1:\r
+               erroreu:\r
 #ifdef __BORLANDC__\r
        __asm {\r
 #endif\r
                mov     err,ah\r
                mov     errorflag,1\r
-               jmp End1\r
+               jmp     Endeu\r
 #ifdef __BORLANDC__\r
        }\r
 #endif\r
-noEMS:\r
-End1:\r
+               noEMS:\r
+               Endeu:\r
 #ifdef __WATCOMC__\r
        }\r
 #endif\r
@@ -242,30 +243,31 @@ End1:
                mov     bx,[EMSAvail];\r
                int     EMS_INT\r
                or      ah,ah\r
-               jnz     error2\r
+               jnz     erroreuu\r
                mov     [EMSHandle],dx\r
-               jmp     End2\r
+               jmp     Endeuu\r
 #ifdef __BORLANDC__\r
        }\r
 #endif\r
-       error2:\r
+               erroreuu:\r
 #ifdef __BORLANDC__\r
        __asm {\r
 #endif\r
                mov     err,ah\r
                mov     errorflag,1\r
-               jmp End2\r
+               jmp Endeuu\r
 #ifdef __BORLANDC__\r
        }\r
 #endif\r
-End2:\r
+               Endeuu:\r
 #ifdef __WATCOMC__\r
        }\r
 #endif\r
 \r
        if(errorflag==false)\r
        {\r
-       gvar->mmi.EMSmem += gvar->pm.emm.EMSAvail * (long)EMSPageSize;\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
@@ -277,18 +279,17 @@ End2:
                strcpy(str,"PML_StartupEMS: EMS error ");\r
                MM_EMSerr(str, err);\r
                printf("%s\n",str);\r
-               return(EMSPresent);\r
+               return(gvar->pm.emm.EMSPresent);\r
        }\r
 \r
-       EMSPresent = true;                      // We have EMS\r
+       gvar->pm.emm.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
+       return(gvar->pm.emm.EMSPresent);\r
 }\r
 \r
 //\r
@@ -304,28 +305,28 @@ PML_ShutdownEMS(global_game_variables_t *gvar)
 \r
        EMSHandle=gvar->pm.emm.EMSHandle;\r
 \r
-       if (EMSPresent)\r
+       if (gvar->pm.emm.EMSPresent)\r
        {\r
                __asm {\r
                        mov     ah,EMS_FREEPAGES\r
                        mov     dx,[EMSHandle]\r
                        int     EMS_INT\r
-                       jc      errors\r
-                       jmp     Ends\r
+                       jc      errores\r
+                       jmp     Endes\r
 #ifdef __BORLANDC__\r
                }\r
 #endif\r
-                       errors:\r
+                       errores:\r
 #ifdef __BORLANDC__\r
                __asm {\r
 #endif\r
                        mov     err,ah\r
                        mov     errorflag,1\r
-                       jmp Ends\r
+                       jmp     Endes\r
 #ifdef __BORLANDC__\r
                }\r
 #endif\r
-               Ends:\r
+                       Endes:\r
 #ifdef __WATCOMC__\r
                }\r
 #endif\r
@@ -355,46 +356,88 @@ PML_ShutdownEMS(global_game_variables_t *gvar)
 boolean\r
 PML_StartupXMS(global_game_variables_t *gvar)\r
 {\r
-       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);                        // 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);                            // 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
-       XMSPresent = true;\r
+               gvar->pm.xmm.XMSPresent = true;\r
+       }\r
 error:\r
-       return(XMSPresent);\r
+       return(gvar->pm.xmm.XMSPresent);\r
 }\r
 \r
 //\r
@@ -474,11 +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
-       if (XMSPresent)\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);\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
@@ -502,7 +570,7 @@ PM_SetMainMemPurge(int level, global_game_variables_t *gvar)
 {\r
        int     i;\r
 \r
-       if(MainPresent)\r
+       if(gvar->pm.mm.MainPresent)\r
        for (i = 0;i < PMMaxMainMem;i++)\r
        {\r
 #ifdef __DEBUG_PM__\r
@@ -541,7 +609,7 @@ PM_CheckMainMem(global_game_variables_t *gvar)
        PMBlockAttr             *used;\r
        PageListStruct  far *page;\r
 \r
-       if (!MainPresent)\r
+       if (!gvar->pm.mm.MainPresent)\r
                return;\r
 \r
        for (i = 0,page = gvar->pm.PMPages;i < gvar->pm.fi.ChunksInFile;i++,page++)\r
@@ -608,11 +676,8 @@ PML_StartupMainMem(global_game_variables_t *gvar)
        memptr  *p;\r
 \r
        gvar->pm.mm.MainPagesAvail = 0;\r
-       MainPresent = false;\r
+       gvar->pm.mm.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
@@ -630,7 +695,7 @@ PML_StartupMainMem(global_game_variables_t *gvar)
                Quit("PM_SetupMainMem: Not enough main memory");\r
                //return;\r
        }\r
-       MainPresent = true;\r
+       gvar->pm.mm.MainPresent = true;\r
 }\r
 \r
 //\r
@@ -922,7 +987,7 @@ PML_PutPageInXMS(int pagenum, global_game_variables_t *gvar)
        int                             usexms;\r
        PageListStruct  far *page;\r
 \r
-       if (!XMSPresent)\r
+       if (!gvar->pm.xmm.XMSPresent)\r
                return;\r
 \r
        page = &gvar->pm.PMPages[pagenum];\r
@@ -1051,7 +1116,7 @@ PML_GetPageFromXMS(int pagenum,boolean mainonly, global_game_variables_t *gvar)
        PageListStruct  far *page;\r
 \r
        page = &gvar->pm.PMPages[pagenum];\r
-       if (XMSPresent && (page->xmsPage != -1))\r
+       if (gvar->pm.xmm.XMSPresent && (page->xmsPage != -1))\r
        {\r
                gvar->pm.xmm.XMSProtectPage = pagenum;\r
                checkaddr = PML_GetAPageBuffer(pagenum,mainonly, gvar);\r
@@ -1365,7 +1430,7 @@ PM_Startup(global_game_variables_t *gvar)
        boolean nomain,noems,noxms;\r
        int             i;\r
 \r
-       if (PMStarted)\r
+       if (gvar->pm.PMStarted)\r
                return;\r
 \r
        //strcpy(&(gvar->pm.fi.PageFileName), "VSWAP.");\r
@@ -1401,14 +1466,19 @@ PM_Startup(global_game_variables_t *gvar)
                }\r
        }\r
 \r
-       //0000++++PML_OpenPageFile(gvar);\r
+       //0000+=+=PML_OpenPageFile(gvar);\r
 \r
        if (!noems)\r
                PML_StartupEMS(gvar);\r
-       if (!noxms)\r
-               //++++PML_StartupXMS(gvar);     //TODO: convert\r
+       /*if (!noxms)\r
+       {\r
+               //++++\r
+               printf("PML_StartupXMS ");\r
+               PML_StartupXMS(gvar);   //TODO: convert\r
+               printf("ok!\n");\r
+       }*/\r
 \r
-       if (!nomain && !EMSPresent)\r
+       if (!nomain && !gvar->pm.emm.EMSPresent)\r
        {\r
                Quit("PM_Startup: No main or EMS\n");\r
                //return;\r
@@ -1417,7 +1487,7 @@ PM_Startup(global_game_variables_t *gvar)
 \r
        PM_Reset(gvar);\r
 \r
-       PMStarted = true;\r
+       gvar->pm.PMStarted = true;\r
 }\r
 \r
 //\r
@@ -1429,7 +1499,7 @@ PM_Shutdown(global_game_variables_t *gvar)
        PML_ShutdownXMS(gvar);\r
        PML_ShutdownEMS(gvar);\r
 \r
-       if (!PMStarted)\r
+       if (!gvar->pm.PMStarted)\r
                return;\r
 \r
        PML_ClosePageFile(gvar);\r