X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_pm.c;h=03df02377c4c8e6c20d801e6b12ccfcefc5f811d;hb=c9ea53d56f793c6abcf528c20590c02804dde275;hp=3a125111d1068557dd8fc20f53b5169d73cb206b;hpb=fb733fa9f63c8922ed3fcaeb48f11938becf94c8;p=16.git diff --git a/src/lib/16_pm.c b/src/lib/16_pm.c index 3a125111..03df0237 100755 --- a/src/lib/16_pm.c +++ b/src/lib/16_pm.c @@ -1,5 +1,5 @@ /* Project 16 Source Code~ - * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover + * Copyright (C) 2012-2017 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover * * This file is part of Project 16. * @@ -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("PML_MapEMS: Page mapping failed\n"); + Quit (gvar, "PML_MapEMS: Page mapping failed\n"); return err; } return 0; @@ -165,6 +165,9 @@ PML_StartupEMS(global_game_variables_t *gvar) static char emmname[] = "EMMXXXX0"; //fix by andrius4669 unsigned int EMSVer = 0; unsigned totalEMSpages,freeEMSpages,EMSPageFrame,EMSHandle=0,EMSAvail=0; +#ifdef __DEBUG_PM__ + word e=0; +#endif totalEMSpages = freeEMSpages = EMSPageFrame = 0; gvar->pm.emm.EMSPresent = false; // Assume that we'll fail gvar->pm.emm.EMSAvail = 0; @@ -175,27 +178,37 @@ PML_StartupEMS(global_game_variables_t *gvar) mov ax,0x3d00 int EMM_INT // try to open EMMXXXX0 device jc error1 - +#ifdef __DEBUG_PM__ + add e,1 +#endif mov bx,ax mov ax,0x4400 int EMM_INT // get device info jc error1 - +#ifdef __DEBUG_PM__ + add e,1 +#endif and dx,0x80 jz error1 - +#ifdef __DEBUG_PM__ + add e,1 +#endif mov ax,0x4407 int EMM_INT // get status jc error1 or al,al jz error1 - +#ifdef __DEBUG_PM__ + add e,1 +#endif mov ah,0x3e int EMM_INT // close handle jc error1 - +#ifdef __DEBUG_PM__ + add e,1 +#endif mov ah,EMS_STATUS int EMS_INT jc error1 // make sure EMS hardware is present @@ -232,6 +245,9 @@ PML_StartupEMS(global_game_variables_t *gvar) error1: #ifdef __BORLANDC__ __asm { +#endif +#ifdef __DEBUG_PM__ + mov e,1 #endif mov err,ah mov errorflag,1 @@ -270,6 +286,9 @@ End1: error2: #ifdef __BORLANDC__ __asm { +#endif +#ifdef __DEBUG_PM__ + mov e,1 #endif mov err,ah mov errorflag,1 @@ -296,6 +315,10 @@ End2: strcpy(str,"PML_StartupEMS: EMS error "); MM_EMSerr(str, err); printf("%s\n",str); +#ifdef __DEBUG_PM__ + printf("e=%u\n", e); + getch(); +#endif return(gvar->pm.emm.EMSPresent); } @@ -352,7 +375,7 @@ PML_ShutdownEMS(global_game_variables_t *gvar) strcpy(str,"PML_ShutdownEMS: Error freeing EMS "); MM_EMSerr(str, err); printf("%s\n",str); - Quit("PML_ShutdownEMS: Error freeing EMS\n"); + Quit (gvar, "PML_ShutdownEMS: Error freeing EMS\n"); //return; } } @@ -532,7 +555,7 @@ PML_XMSCopy(boolean toxms,byte far *addr,word xmspage,word length, global_game_v if (!addr) { - Quit("PML_XMSCopy: zero address\n"); + Quit (gvar, "PML_XMSCopy: zero address\n"); //return; } @@ -554,7 +577,7 @@ PML_XMSCopy(boolean toxms,byte far *addr,word xmspage,word length, global_game_v } if (!_AX) { - Quit("PML_XMSCopy: Error on copy"); + Quit (gvar, "PML_XMSCopy: Error on copy"); //return; } } @@ -621,7 +644,7 @@ PML_ShutdownXMS(global_game_variables_t *gvar) #endif if(errorflag==true) { - Quit("PML_ShutdownXMS: Error freeing XMS"); + Quit (gvar, "PML_ShutdownXMS: Error freeing XMS"); //return; } } @@ -656,7 +679,7 @@ PM_SetMainMemPurge(int level, global_game_variables_t *gvar) else { - Quit("MainPresent IS NULL\n"); + Quit (gvar, "MainPresent IS NULL\n"); } } @@ -765,7 +788,7 @@ PML_StartupMainMem(global_game_variables_t *gvar) gvar->mm.mmerror = false; if (gvar->pm.mm.MainPagesAvail < PMMinMainMem) { - Quit("PM_SetupMainMem: Not enough main memory"); + Quit (gvar, "PM_SetupMainMem: Not enough main memory"); //return; } gvar->pm.mm.MainPresent = true; @@ -801,22 +824,22 @@ PML_ReadFromFile(byte far *buf,long offset,word length, global_game_variables_t { if (!buf) { - Quit("PML_ReadFromFile: Null pointer"); + Quit (gvar, "PML_ReadFromFile: Null pointer"); //return; } if (!offset) { - Quit("PML_ReadFromFile: Zero offset"); + Quit (gvar, "PML_ReadFromFile: Zero offset"); //return; } if (lseek(gvar->pm.fi.PageFile,offset,SEEK_SET) != offset) { - Quit("PML_ReadFromFile: Seek failed"); + Quit (gvar, "PML_ReadFromFile: Seek failed"); //return; } if (!CA_FarRead(gvar->pm.fi.PageFile,buf,length, gvar)) { - Quit("PML_ReadFromFile: Read failed"); + Quit (gvar, "PML_ReadFromFile: Read failed"); //return; } } @@ -838,7 +861,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("PML_OpenPageFile: Unable to open page file"); + Quit (gvar, "PML_OpenPageFile: Unable to open page file"); //return; } @@ -859,7 +882,7 @@ PML_OpenPageFile(global_game_variables_t *gvar) MM_GetPtr(&buf, size, gvar); if (!CA_FarRead(gvar->pm.fi.PageFile,(byte far *)buf,size, gvar)) { - Quit("PML_OpenPageFile: Offset read failed"); + Quit (gvar, "PML_OpenPageFile: Offset read failed"); //return; } offsetptr = (dword far *)buf; @@ -872,7 +895,7 @@ PML_OpenPageFile(global_game_variables_t *gvar) MM_GetPtr(&buf,size, gvar); if (!CA_FarRead(gvar->pm.fi.PageFile,(byte far *)buf,size, gvar)) { - Quit("PML_OpenPageFile: Length read failed"); + Quit (gvar, "PML_OpenPageFile: Length read failed"); //return; } lengthptr = (word far *)buf; @@ -949,7 +972,7 @@ PML_GetEMSAddress(int page,PMLockType lock, global_game_variables_t *gvar) } if (emspage == -1) - Quit("PML_GetEMSAddress: EMS find failed"); + Quit (gvar, "PML_GetEMSAddress: EMS find failed"); gvar->pm.emm.EMSList[emspage].lastHit = gvar->pm.PMFrameCount; offset = emspage * EMSPageSizeSeg; @@ -1018,7 +1041,7 @@ PML_GiveLRUPage(boolean mainonly, global_game_variables_t *gvar) } if (lru == -1) - Quit("PML_GiveLRUPage: LRU Search failed"); + Quit (gvar, "PML_GiveLRUPage: LRU Search failed"); return(lru); } @@ -1073,7 +1096,7 @@ PML_PutPageInXMS(int pagenum, global_game_variables_t *gvar) { usexms = PML_GiveLRUXMSPage(gvar); if (usexms == -1) - Quit("PML_PutPageInXMS: No XMS LRU"); + Quit (gvar, "PML_PutPageInXMS: No XMS LRU"); page->xmsPage = gvar->pm.PMPages[usexms].xmsPage; gvar->pm.PMPages[usexms].xmsPage = -1; } @@ -1091,16 +1114,16 @@ PML_TransferPageSpace(int orig,int new, global_game_variables_t *gvar) PageListStruct far *origpage,far *newpage; if (orig == new) - Quit("PML_TransferPageSpace: Identity replacement"); + Quit (gvar, "PML_TransferPageSpace: Identity replacement"); origpage = &gvar->pm.PMPages[orig]; newpage = &gvar->pm.PMPages[new]; if (origpage->locked != pml_Unlocked) - Quit("PML_TransferPageSpace: Killing locked page"); + Quit (gvar, "PML_TransferPageSpace: Killing locked page"); if ((origpage->emsPage == -1) && (origpage->mainPage == -1)) - Quit("PML_TransferPageSpace: Reusing non-existent page"); + Quit (gvar, "PML_TransferPageSpace: Reusing non-existent page"); // Copy page that's about to be purged into XMS PML_PutPageInXMS(orig, gvar); @@ -1116,7 +1139,7 @@ PML_TransferPageSpace(int orig,int new, global_game_variables_t *gvar) origpage->mainPage = origpage->emsPage = -1; if (!addr) - Quit("PML_TransferPageSpace: Zero replacement"); + Quit (gvar, "PML_TransferPageSpace: Zero replacement"); return(addr); } @@ -1157,10 +1180,10 @@ PML_GetAPageBuffer(int pagenum,boolean mainonly, global_game_variables_t *gvar) } } if (n == -1) - Quit("PML_GetPageBuffer: MainPagesAvail lied"); + Quit (gvar, "PML_GetPageBuffer: MainPagesAvail lied"); addr = gvar->pm.mm.MainMemPages[n]; if (!addr) - Quit("PML_GetPageBuffer: Purged main block"); + Quit (gvar, "PML_GetPageBuffer: Purged main block"); page->mainPage = n; gvar->pm.MainPagesUsed++; } @@ -1168,7 +1191,7 @@ PML_GetAPageBuffer(int pagenum,boolean mainonly, global_game_variables_t *gvar) addr = PML_TransferPageSpace(PML_GiveLRUPage(mainonly, gvar),pagenum, gvar); if (!addr) - Quit("PML_GetPageBuffer: Search failed"); + Quit (gvar, "PML_GetPageBuffer: Search failed"); return(addr); } @@ -1194,7 +1217,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("PML_GetPageFromXMS: Non segment pointer"); + Quit (gvar, "PML_GetPageFromXMS: Non segment pointer"); addr = (memptr)FP_SEG(checkaddr); PML_CopyFromXMS(addr,page->xmsPage,page->length, gvar); gvar->pm.xmm.XMSProtectPage = -1; @@ -1232,7 +1255,7 @@ PM_GetPage(int pagenum, global_game_variables_t *gvar) memptr result; if (pagenum >= gvar->pm.fi.ChunksInFile) - Quit("PM_GetPage: Invalid page request"); + Quit (gvar, "PM_GetPage: Invalid page request"); #ifdef __DEBUG_2__ // for debugging __asm { @@ -1250,7 +1273,7 @@ PM_GetPage(int pagenum, global_game_variables_t *gvar) { boolean mainonly = (pagenum >= gvar->pm.fi.PMSoundStart); if (!gvar->pm.PMPages[pagenum].offset) // JDC: sparse page - Quit ("Tried to load a sparse page!"); + Quit (gvar, "Tried to load a sparse page!"); if (!(result = PML_GetPageFromXMS(pagenum,mainonly, gvar))) { if (gvar->pm.PMPages[pagenum].lastHit == gvar->pm.PMFrameCount) @@ -1290,7 +1313,7 @@ void PM_SetPageLock(int pagenum,PMLockType lock, global_game_variables_t *gvar) { if (pagenum < gvar->pm.fi.PMSoundStart) - Quit("PM_SetPageLock: Locking/unlocking non-sound page"); + Quit (gvar, "PM_SetPageLock: Locking/unlocking non-sound page"); gvar->pm.PMPages[pagenum].locked = lock; } @@ -1357,7 +1380,7 @@ PM_Preload(boolean (*update)(word current,word total), global_game_variables_t * page++; if (page >= gvar->pm.fi.ChunksInFile) - Quit ("PM_Preload: Pages>=gvar->pm.fi.ChunksInFile"); + Quit (gvar, "PM_Preload: Pages>=gvar->pm.fi.ChunksInFile"); PM_GetPage(page, gvar); @@ -1376,7 +1399,7 @@ PM_Preload(boolean (*update)(word current,word total), global_game_variables_t * ; addr = PM_GetPage(oogypage, gvar); if (!addr) - Quit("PM_Preload: XMS buffer failed"); + Quit (gvar, "PM_Preload: XMS buffer failed"); while (xmstotal) { @@ -1384,15 +1407,15 @@ PM_Preload(boolean (*update)(word current,word total), global_game_variables_t * page++; if (page >= gvar->pm.fi.ChunksInFile) - Quit ("PM_Preload: Pages>=gvar->pm.fi.ChunksInFile"); + Quit (gvar, "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("PM_Preload: Exceeded XMS pages"); + Quit (gvar, "PM_Preload: Exceeded XMS pages"); if (p->length > PMPageSize) - Quit("PM_Preload: Page too long"); + Quit (gvar, "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 +1468,7 @@ PM_NextFrame(global_game_variables_t *gvar) { char buf[40]; sprintf(buf,"PM_NextFrame: Page %d is locked",i); - Quit(buf); + Quit(gvar, buf); } } //#endif @@ -1536,7 +1559,7 @@ PM_Startup(global_game_variables_t *gvar) if (!gvar->pm.mm.MainPresent && !gvar->pm.emm.EMSPresent && !gvar->pm.xmm.XMSPresent) { - Quit("PM_Startup: No main or EMS\n"); + Quit (gvar, "PM_Startup: No main or EMS\n"); //return; }