X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_pm.c;h=55a7d3710e96933296e417961cfa348c72b30aac;hb=050d28da3358d5c1434fda542ec11adbee182ea5;hp=53eb86036314b5696f84feaaf348008283ebe9dd;hpb=08aceab528da25f5d37a2c7df034337d2e131e3c;p=16.git diff --git a/src/lib/16_pm.c b/src/lib/16_pm.c index 53eb8603..55a7d371 100755 --- a/src/lib/16_pm.c +++ b/src/lib/16_pm.c @@ -139,7 +139,7 @@ PML_MapEMS(word logical, byte physical, global_game_variables_t *gvar) strcpy(str,"MM_MapEMS: EMS error "); MM_EMSerr(str, err); printf("%s\n",str); - Quit (gvar, "PML_MapEMS: Page mapping failed\n"); + Quit ("PML_MapEMS: Page mapping failed\n"); return err; } return 0; @@ -153,49 +153,28 @@ PML_MapEMS(word logical, byte physical, global_game_variables_t *gvar) // If there's more than our minimum (2 pages) available, allocate it (up // to the maximum we need) // +// Please call MML_CheckForEMS() before calling this function. +// MML_CheckForEMS is not local despite the name wwww. +// boolean PML_StartupEMS(global_game_variables_t *gvar) { int i; +#ifdef __PM__NOHOGEMS__ long size; +#endif 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; + unsigned EMSVer; + unsigned totalEMSpages,freeEMSpages,EMSPageFrame,EMSHandle,EMSAvail; + totalEMSpages = freeEMSpages = EMSPageFrame = EMSHandle = EMSAvail = EMSVer = 0; // set all to 0~ gvar->pm.emm.EMSPresent = false; // Assume that we'll fail - gvar->pm.emm.EMSAvail = 0; - gvar->mmi.EMSmem = 0; + gvar->pm.emm.EMSAvail = gvar->mmi.EMSmem = 0; __asm { - mov dx,OFFSET emmname //fix by andrius4669 - mov ax,0x3d00 - 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 - + //MML_CheckForEMS() takes care of what the code did here mov ah,EMS_STATUS int EMS_INT jc error1 // make sure EMS hardware is present @@ -204,7 +183,7 @@ PML_StartupEMS(global_game_variables_t *gvar) int EMS_INT // only work on EMS 3.2 or greater (silly, but...) or ah,ah jnz error1 - mov [EMSVer],ax // set EMSVer + mov [EMSVer],ax // set EMSVer cmp al,0x32 // only work on ems 3.2 or greater jb error1 @@ -225,7 +204,7 @@ PML_StartupEMS(global_game_variables_t *gvar) mov [totalEMSpages],dx mov [freeEMSpages],bx mov [EMSAvail],bx - jmp End1 + jmp End1 #ifdef __BORLANDC__ } #endif @@ -235,7 +214,7 @@ PML_StartupEMS(global_game_variables_t *gvar) #endif mov err,ah mov errorflag,1 - jmp End1 + jmp End1 #ifdef __BORLANDC__ } #endif @@ -244,7 +223,7 @@ End1: #ifdef __WATCOMC__ } #endif -//* +#ifdef __PM__NOHOGEMS__ if(errorflag==false) { // Don't hog all available EMS @@ -255,7 +234,7 @@ End1: gvar->pm.emm.EMSAvail = size / EMSPageSize; } } -//*/ +#endif __asm { mov ah,EMS_ALLOCPAGES mov bx,[EMSAvail]; @@ -273,31 +252,26 @@ End1: #endif mov err,ah mov errorflag,1 - jmp End2 + jmp End2 #ifdef __BORLANDC__ - } + }//end of assembly #endif End2: #ifdef __WATCOMC__ - } + }//end of assembly #endif - - 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 + if(errorflag==true) { strcpy(str,"PML_StartupEMS: EMS error "); MM_EMSerr(str, err); printf("%s\n",str); return(gvar->pm.emm.EMSPresent); } + gvar->mmi.EMSmem = EMSAvail * (dword)EMSPageSize; + + // Initialize EMS mapping cache + for (i = 0;i < EMSFrameCount;i++) + gvar->pm.emm.EMSList[i].baseEMSPage = -1; gvar->pm.emm.EMSPresent = true; // We have EMS gvar->pm.emm.EMSPageFrame = EMSPageFrame; @@ -352,7 +326,7 @@ PML_ShutdownEMS(global_game_variables_t *gvar) strcpy(str,"PML_ShutdownEMS: Error freeing EMS "); MM_EMSerr(str, err); printf("%s\n",str); - Quit (gvar, "PML_ShutdownEMS: Error freeing EMS\n"); + Quit ("PML_ShutdownEMS: Error freeing EMS\n"); //return; } } @@ -532,8 +506,7 @@ PML_XMSCopy(boolean toxms,byte far *addr,word xmspage,word length, global_game_v if (!addr) { - Quit (gvar, "PML_XMSCopy: zero address\n"); - //return; + Quit ("PML_XMSCopy: zero address\n"); } xoffset = (dword)xmspage * PMPageSize; @@ -554,7 +527,7 @@ PML_XMSCopy(boolean toxms,byte far *addr,word xmspage,word length, global_game_v } if (!_AX) { - Quit (gvar, "PML_XMSCopy: Error on copy"); + Quit ("PML_XMSCopy: Error on copy"); //return; } } @@ -621,7 +594,7 @@ PML_ShutdownXMS(global_game_variables_t *gvar) #endif if(errorflag==true) { - Quit (gvar, "PML_ShutdownXMS: Error freeing XMS"); + Quit ("PML_ShutdownXMS: Error freeing XMS"); //return; } } @@ -647,8 +620,10 @@ PM_SetMainMemPurge(int level, global_game_variables_t *gvar) for (i = 0;i < PMMaxMainMem;i++) { #ifdef __DEBUG_PM__ +#ifdef __DEBUG_PM_MAIN__ 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 #endif if (gvar->pm.mm.MainMemPages[i]) MM_SetPurge(&(gvar->pm.mm.MainMemPages[i]),level, gvar); @@ -656,7 +631,7 @@ PM_SetMainMemPurge(int level, global_game_variables_t *gvar) else { - Quit (gvar, "MainPresent IS NULL\n"); + Quit ("MainPresent IS NULL\n"); } } @@ -765,7 +740,7 @@ PML_StartupMainMem(global_game_variables_t *gvar) gvar->mm.mmerror = false; if (gvar->pm.mm.MainPagesAvail < PMMinMainMem) { - Quit (gvar, "PM_SetupMainMem: Not enough main memory"); + Quit ("PM_SetupMainMem: Not enough main memory"); //return; } gvar->pm.mm.MainPresent = true; @@ -801,22 +776,22 @@ PML_ReadFromFile(byte far *buf,long offset,word length, global_game_variables_t { if (!buf) { - Quit (gvar, "PML_ReadFromFile: Null pointer"); + Quit ("PML_ReadFromFile: Null pointer"); //return; } if (!offset) { - Quit (gvar, "PML_ReadFromFile: Zero offset"); + Quit ("PML_ReadFromFile: Zero offset"); //return; } if (lseek(gvar->pm.fi.PageFile,offset,SEEK_SET) != offset) { - Quit (gvar, "PML_ReadFromFile: Seek failed"); + Quit ("PML_ReadFromFile: Seek failed"); //return; } if (!CA_FarRead(gvar->pm.fi.PageFile,buf,length, gvar)) { - Quit (gvar, "PML_ReadFromFile: Read failed"); + Quit ("PML_ReadFromFile: Read failed"); //return; } } @@ -829,8 +804,7 @@ PML_OpenPageFile(global_game_variables_t *gvar) { int i; long size; - //__SEGA buf; - memptr buf; + void _seg *buf; dword far *offsetptr; word far *lengthptr; PageListStruct far *page; @@ -838,7 +812,7 @@ PML_OpenPageFile(global_game_variables_t *gvar) gvar->pm.fi.PageFile = open(gvar->pm.fi.PageFileName,O_RDONLY + O_BINARY); if (gvar->pm.fi.PageFile == -1) { - Quit (gvar, "PML_OpenPageFile: Unable to open page file"); + Quit ("PML_OpenPageFile: Unable to open page file"); //return; } @@ -849,36 +823,36 @@ PML_OpenPageFile(global_game_variables_t *gvar) // Allocate and clear the page list gvar->pm.PMNumBlocks = gvar->pm.fi.ChunksInFile; - MM_GetPtr((memptr *)gvar->pm.PMSegPages, sizeof(PageListStruct) * (gvar->pm.PMNumBlocks), gvar); - MM_SetLock((memptr *)gvar->pm.PMSegPages,true, gvar); + MM_GetPtr((memptr *)&gvar->pm.PMSegPages, sizeof(PageListStruct) * (gvar->pm.PMNumBlocks), gvar); + MM_SetLock((memptr *)&gvar->pm.PMSegPages,true, gvar); gvar->pm.PMPages = (PageListStruct far *)gvar->pm.PMSegPages; _fmemset(gvar->pm.PMPages,0,sizeof(PageListStruct) * gvar->pm.PMNumBlocks); // Read in the chunk offsets size = sizeof(dword) * gvar->pm.fi.ChunksInFile; - MM_GetPtr(&buf, size, gvar); + MM_GetPtr((memptr *)&buf, size, gvar); if (!CA_FarRead(gvar->pm.fi.PageFile,(byte far *)buf,size, gvar)) { - Quit (gvar, "PML_OpenPageFile: Offset read failed"); + Quit ("PML_OpenPageFile: Offset read failed"); //return; } offsetptr = (dword far *)buf; for (i = 0,page = gvar->pm.PMPages;i < gvar->pm.fi.ChunksInFile;i++,page++) page->offset = *offsetptr++; - MM_FreePtr(&buf, gvar); + MM_FreePtr((memptr *)&buf, gvar); // Read in the chunk lengths size = sizeof(word) * gvar->pm.fi.ChunksInFile; MM_GetPtr(&buf,size, gvar); if (!CA_FarRead(gvar->pm.fi.PageFile,(byte far *)buf,size, gvar)) { - Quit (gvar, "PML_OpenPageFile: Length read failed"); + Quit ("PML_OpenPageFile: Length read failed"); //return; } lengthptr = (word far *)buf; for (i = 0,page = gvar->pm.PMPages;i < gvar->pm.fi.ChunksInFile;i++,page++) page->length = *lengthptr++; - MM_FreePtr(&buf, gvar); + MM_FreePtr((memptr *)&buf, gvar); } // @@ -891,8 +865,8 @@ PML_ClosePageFile(global_game_variables_t *gvar) close(gvar->pm.fi.PageFile); if (gvar->pm.PMSegPages) { - MM_SetLock((memptr)gvar->pm.PMSegPages,false, gvar); - MM_FreePtr((memptr)gvar->pm.PMSegPages, gvar); + MM_SetLock((memptr *)&gvar->pm.PMSegPages,false, gvar); + MM_FreePtr((void _seg *)&gvar->pm.PMSegPages, gvar); } } @@ -949,7 +923,7 @@ PML_GetEMSAddress(int page,PMLockType lock, global_game_variables_t *gvar) } if (emspage == -1) - Quit (gvar, "PML_GetEMSAddress: EMS find failed"); + Quit ("PML_GetEMSAddress: EMS find failed"); gvar->pm.emm.EMSList[emspage].lastHit = gvar->pm.PMFrameCount; offset = emspage * EMSPageSizeSeg; @@ -1018,7 +992,7 @@ PML_GiveLRUPage(boolean mainonly, global_game_variables_t *gvar) } if (lru == -1) - Quit (gvar, "PML_GiveLRUPage: LRU Search failed"); + Quit ("PML_GiveLRUPage: LRU Search failed"); return(lru); } @@ -1073,7 +1047,7 @@ PML_PutPageInXMS(int pagenum, global_game_variables_t *gvar) { usexms = PML_GiveLRUXMSPage(gvar); if (usexms == -1) - Quit (gvar, "PML_PutPageInXMS: No XMS LRU"); + Quit ("PML_PutPageInXMS: No XMS LRU"); page->xmsPage = gvar->pm.PMPages[usexms].xmsPage; gvar->pm.PMPages[usexms].xmsPage = -1; } @@ -1091,16 +1065,16 @@ PML_TransferPageSpace(int orig,int new, global_game_variables_t *gvar) PageListStruct far *origpage,far *newpage; if (orig == new) - Quit (gvar, "PML_TransferPageSpace: Identity replacement"); + Quit ("PML_TransferPageSpace: Identity replacement"); origpage = &gvar->pm.PMPages[orig]; newpage = &gvar->pm.PMPages[new]; if (origpage->locked != pml_Unlocked) - Quit (gvar, "PML_TransferPageSpace: Killing locked page"); + Quit ("PML_TransferPageSpace: Killing locked page"); if ((origpage->emsPage == -1) && (origpage->mainPage == -1)) - Quit (gvar, "PML_TransferPageSpace: Reusing non-existent page"); + Quit ("PML_TransferPageSpace: Reusing non-existent page"); // Copy page that's about to be purged into XMS PML_PutPageInXMS(orig, gvar); @@ -1116,7 +1090,7 @@ PML_TransferPageSpace(int orig,int new, global_game_variables_t *gvar) origpage->mainPage = origpage->emsPage = -1; if (!addr) - Quit (gvar, "PML_TransferPageSpace: Zero replacement"); + Quit ("PML_TransferPageSpace: Zero replacement"); return(addr); } @@ -1157,10 +1131,10 @@ PML_GetAPageBuffer(int pagenum,boolean mainonly, global_game_variables_t *gvar) } } if (n == -1) - Quit (gvar, "PML_GetPageBuffer: MainPagesAvail lied"); + Quit ("PML_GetPageBuffer: MainPagesAvail lied"); addr = gvar->pm.mm.MainMemPages[n]; if (!addr) - Quit (gvar, "PML_GetPageBuffer: Purged main block"); + Quit ("PML_GetPageBuffer: Purged main block"); page->mainPage = n; gvar->pm.MainPagesUsed++; } @@ -1168,7 +1142,7 @@ PML_GetAPageBuffer(int pagenum,boolean mainonly, global_game_variables_t *gvar) addr = PML_TransferPageSpace(PML_GiveLRUPage(mainonly, gvar),pagenum, gvar); if (!addr) - Quit (gvar, "PML_GetPageBuffer: Search failed"); + Quit ("PML_GetPageBuffer: Search failed"); return(addr); } @@ -1194,7 +1168,7 @@ PML_GetPageFromXMS(int pagenum,boolean mainonly, global_game_variables_t *gvar) gvar->pm.xmm.XMSProtectPage = pagenum; checkaddr = PML_GetAPageBuffer(pagenum,mainonly, gvar); if (FP_OFF(checkaddr)) - Quit (gvar, "PML_GetPageFromXMS: Non segment pointer"); + Quit ("PML_GetPageFromXMS: Non segment pointer"); addr = (memptr)FP_SEG(checkaddr); PML_CopyFromXMS(addr,page->xmsPage,page->length, gvar); gvar->pm.xmm.XMSProtectPage = -1; @@ -1232,9 +1206,9 @@ PM_GetPage(int pagenum, global_game_variables_t *gvar) memptr result; if (pagenum >= gvar->pm.fi.ChunksInFile) - Quit (gvar, "PM_GetPage: Invalid page request"); + Quit ("PM_GetPage: Invalid page request"); -#ifdef __DEBUG_2__ // for debugging +//#ifdef __DEBUG_2__ // for debugging __asm { mov dx,STATUS_REGISTER_1 in al,dx @@ -1244,13 +1218,13 @@ PM_GetPage(int pagenum, global_game_variables_t *gvar) mov al,10 // bright green out dx,al } -#endif +//#endif if (!(result = PM_GetPageAddress(pagenum, gvar))) { boolean mainonly = (pagenum >= gvar->pm.fi.PMSoundStart); if (!gvar->pm.PMPages[pagenum].offset) // JDC: sparse page - Quit (gvar, "Tried to load a sparse page!"); + Quit ("Tried to load a sparse page!"); if (!(result = PML_GetPageFromXMS(pagenum,mainonly, gvar))) { if (gvar->pm.PMPages[pagenum].lastHit == gvar->pm.PMFrameCount) @@ -1262,7 +1236,7 @@ if (!gvar->pm.PMPages[pagenum].offset) // JDC: sparse page } gvar->pm.PMPages[pagenum].lastHit = gvar->pm.PMFrameCount; -#ifdef __DEBUG_2__ // for debugging +//#ifdef __DEBUG_2__ // for debugging __asm{ mov dx,STATUS_REGISTER_1 in al,dx @@ -1273,7 +1247,8 @@ if (!gvar->pm.PMPages[pagenum].offset) // JDC: sparse page out dx,al mov al,0x20 // normal out dx,al -#endif + } +//#endif return(result); } @@ -1290,7 +1265,7 @@ void PM_SetPageLock(int pagenum,PMLockType lock, global_game_variables_t *gvar) { if (pagenum < gvar->pm.fi.PMSoundStart) - Quit (gvar, "PM_SetPageLock: Locking/unlocking non-sound page"); + Quit ("PM_SetPageLock: Locking/unlocking non-sound page"); gvar->pm.PMPages[pagenum].locked = lock; } @@ -1357,7 +1332,7 @@ PM_Preload(boolean (*update)(word current,word total), global_game_variables_t * page++; if (page >= gvar->pm.fi.ChunksInFile) - Quit (gvar, "PM_Preload: Pages>=gvar->pm.fi.ChunksInFile"); + Quit ("PM_Preload: Pages>=gvar->pm.fi.ChunksInFile"); PM_GetPage(page, gvar); @@ -1376,7 +1351,7 @@ PM_Preload(boolean (*update)(word current,word total), global_game_variables_t * ; addr = PM_GetPage(oogypage, gvar); if (!addr) - Quit (gvar, "PM_Preload: XMS buffer failed"); + Quit ("PM_Preload: XMS buffer failed"); while (xmstotal) { @@ -1384,15 +1359,15 @@ PM_Preload(boolean (*update)(word current,word total), global_game_variables_t * page++; if (page >= gvar->pm.fi.ChunksInFile) - Quit (gvar, "PM_Preload: Pages>=gvar->pm.fi.ChunksInFile"); + Quit ("PM_Preload: Pages>=gvar->pm.fi.ChunksInFile"); p = &gvar->pm.PMPages[page]; p->xmsPage = gvar->pm.XMSPagesUsed++; if (gvar->pm.XMSPagesUsed > gvar->pm.xmm.XMSPagesAvail) - Quit (gvar, "PM_Preload: Exceeded XMS pages"); + Quit ("PM_Preload: Exceeded XMS pages"); if (p->length > PMPageSize) - Quit (gvar, "PM_Preload: Page too long"); + Quit ("PM_Preload: Page too long"); PML_ReadFromFile((byte far *)addr,p->offset,p->length, gvar); PML_CopyToXMS((byte far *)addr,p->xmsPage,p->length, gvar); @@ -1445,7 +1420,7 @@ PM_NextFrame(global_game_variables_t *gvar) { char buf[40]; sprintf(buf,"PM_NextFrame: Page %d is locked",i); - Quit(gvar, buf); + Quit (buf); } } //#endif @@ -1536,7 +1511,7 @@ PM_Startup(global_game_variables_t *gvar) if (!gvar->pm.mm.MainPresent && !gvar->pm.emm.EMSPresent && !gvar->pm.xmm.XMSPresent) { - Quit (gvar, "PM_Startup: No main or EMS\n"); + Quit ("PM_Startup: No main or EMS\n"); //return; } @@ -1557,7 +1532,7 @@ PM_Shutdown(global_game_variables_t *gvar) if (!gvar->pm.PMStarted) return; - //PML_ClosePageFile(gvar); + //0000+=+=PML_ClosePageFile(gvar); PML_ShutdownMainMem(gvar); }