X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_pm.c;h=7ecab1eb418ee35fb6ef1d30a77ea3e6c53f51c0;hb=6abb6ddef2f5860213065998a305a574704f6296;hp=22cd7ea57bb276792f4aac787715c4c5f53dacc4;hpb=a85b9bbe1d5e346f24b40fa12c68b9487d6b4a71;p=16.git diff --git a/src/lib/16_pm.c b/src/lib/16_pm.c index 22cd7ea5..7ecab1eb 100755 --- a/src/lib/16_pm.c +++ b/src/lib/16_pm.c @@ -30,35 +30,36 @@ #pragma hdrstop #ifdef __DEBUG__ -boolean debugpm=0; +boolean dbg_debugpm=0; #endif // Main Mem specific variables -/* boolean MainPresent; - memptr MainMemPages[PMMaxMainMem]; + //boolean MainPresent; +/* memptr MainMemPages[PMMaxMainMem]; PMBlockAttr gvar->pm.mm.MainMemUsed[PMMaxMainMem]; - int gvar->pm.mm.MainPagesAvail; + int gvar->pm.mm.MainPagesAvail;*/ // EMS specific variables - boolean EMSPresent; - word gvar->pm.emm.EMSAvail,gvar->pm.emm.EMSPagesAvail,gvar->pm.emm.EMSHandle, + //boolean EMSPresent; +/* word gvar->pm.emm.EMSAvail,gvar->pm.emm.EMSPagesAvail,gvar->pm.emm.EMSHandle, gvar->pm.emm.EMSPageFrame,gvar->pm.emm.EMSPhysicalPage; - gvar->pm.emm.EMSListStruct gvar->pm.emm.EMSList[EMSFrameCount]; + gvar->pm.emm.EMSListStruct gvar->pm.emm.EMSList[EMSFrameCount];*/ // XMS specific variables - boolean XMSPresent; - word gvar->pm.xmm.XMSAvail,gvar->pm.xmm.XMSPagesAvail,gvar->pm.xmm.XMSHandle;*/ - word XMSDriver; + //boolean XMSPresent; + //word gvar->pm.xmm.XMSAvail,gvar->pm.xmm.XMSPagesAvail,gvar->pm.xmm.XMSHandle; + dword XMSDriver; //hard to put in gvar + word XMSVer; //hard to put in gvar /* int gvar->pm.xmm.XMSProtectPage = -1; // File specific variables char gvar->pm.fi.PageFileName[13] = {"VSWAP."}; int PageFile = -1; word gvar->pm.fi.ChunksInFile; - word PMSpriteStart,PMSoundStart; + word PMSpriteStart,PMSoundStart;*/ // General usage variables - boolean PMStarted, +/* boolean PMStarted, gvar->pm.PMPanicMode, gvar->pm.PMThrashing; word gvar->pm.XMSPagesUsed, @@ -67,9 +68,28 @@ boolean debugpm=0; gvar->pm.PMNumBlocks; long PMFrameCount; PageListStruct far *gvar->pm.PMPages, - _seg *gvar->pm.PMSegPages; -*/ -boolean PMStarted, MainPresent, EMSPresent, XMSPresent; + _seg *gvar->pm.PMSegPages;*/ + +static union REGS CPURegs; + +#define _AX CPURegs.x.ax +#define _BX CPURegs.x.bx +#define _CX CPURegs.x.cx +#define _DX CPURegs.x.dx + +#define _SI CPURegs.x.si + +#define _AH CPURegs.h.ah +#define _AL CPURegs.h.al +#define _BH CPURegs.h.bh +#define _BL CPURegs.h.bl +#define _CH CPURegs.h.ch +#define _CL CPURegs.h.cl +#define _DH CPURegs.h.dh +#define _DL CPURegs.h.dl + +#define geninterrupt(n) int86(n,&CPURegs,&CPURegs); + static char *ParmStrings[] = {"nomain","noems","noxms",nil}; ///////////////////////////////////////////////////////////////////////////// @@ -84,11 +104,11 @@ static char *ParmStrings[] = {"nomain","noems","noxms",nil}; byte PML_MapEMS(word logical, byte physical, global_game_variables_t *gvar) { - byte str[160]; + byte err=0, str[160]; unsigned EMShandle; - byte err; + //int i; + boolean errorflag=false; - int i; EMShandle=gvar->pm.emm.EMSHandle; __asm { @@ -98,12 +118,12 @@ PML_MapEMS(word logical, byte physical, global_game_variables_t *gvar) mov dx,EMShandle int EMS_INT or ah,ah - jnz error - jmp End + jnz errorme + jmp Endme #ifdef __BORLANDC__ } #endif - error: + errorme: #ifdef __BORLANDC__ __asm { #endif @@ -112,7 +132,7 @@ PML_MapEMS(word logical, byte physical, global_game_variables_t *gvar) #ifdef __BORLANDC__ } #endif - End: + Endme: #ifdef __WATCOMC__ } #endif @@ -140,28 +160,28 @@ boolean PML_StartupEMS(global_game_variables_t *gvar) { int i; - long size; - byte str[160]; - byte err; + //long size; + byte err=0, str[64]; - boolean errorflag=0; + boolean errorflag=false; static char emmname[] = "EMMXXXX0"; //fix by andrius4669 unsigned int EMSVer = 0; - unsigned totalEMSpages,freeEMSpages,EMSPageFrame,EMSHandle,EMSAvail; + unsigned totalEMSpages,freeEMSpages,EMSPageFrame,EMSHandle=0,EMSAvail=0; totalEMSpages = freeEMSpages = EMSPageFrame = 0; - EMSPresent = false; // Assume that we'll fail + gvar->pm.emm.EMSPresent = false; // Assume that we'll fail gvar->pm.emm.EMSAvail = 0; + gvar->mmi.EMSmem = 0; __asm { mov dx,OFFSET emmname //fix by andrius4669 mov ax,0x3d00 - int EMS_INT // try to open EMMXXXX0 device + int EMM_INT // try to open EMMXXXX0 device jc error1 mov bx,ax mov ax,0x4400 - int EMS_INT // get device info + int EMM_INT // get device info jc error1 and dx,0x80 @@ -169,13 +189,13 @@ PML_StartupEMS(global_game_variables_t *gvar) mov ax,0x4407 - int EMS_INT // get status + int EMM_INT // get status jc error1 or al,al jz error1 mov ah,0x3e - int EMS_INT // close handle + int EMM_INT // close handle jc error1 mov ah,EMS_STATUS @@ -226,6 +246,7 @@ End1: #ifdef __WATCOMC__ } #endif +/* if(errorflag==false) { // Don't hog all available EMS @@ -236,7 +257,7 @@ End1: gvar->pm.emm.EMSAvail = size / EMSPageSize; } } - +*/ __asm { mov ah,EMS_ALLOCPAGES mov bx,[EMSAvail]; @@ -265,7 +286,7 @@ End2: if(errorflag==false) { - gvar->mmi.EMSmem += gvar->pm.emm.EMSAvail * (long)EMSPageSize; + gvar->mmi.EMSmem = EMSAvail * (dword)EMSPageSize; // Initialize EMS mapping cache for (i = 0;i < EMSFrameCount;i++) @@ -277,16 +298,18 @@ End2: strcpy(str,"PML_StartupEMS: EMS error "); MM_EMSerr(str, err); printf("%s\n",str); - return(EMSPresent); + return(gvar->pm.emm.EMSPresent); } - EMSPresent = true; // We have EMS + gvar->pm.emm.EMSPresent = true; // We have EMS gvar->pm.emm.EMSPageFrame = EMSPageFrame; gvar->pm.emm.EMSAvail = EMSAvail; gvar->pm.emm.EMSVer = EMSVer; gvar->pm.emm.EMSHandle = EMSHandle; + gvar->pm.emm.freeEMSpages = freeEMSpages; + gvar->pm.emm.totalEMSpages = totalEMSpages; - return(EMSPresent); + return(gvar->pm.emm.EMSPresent); } // @@ -296,17 +319,41 @@ void PML_ShutdownEMS(global_game_variables_t *gvar) { word EMSHandle; + byte err=0, str[64]; + + boolean errorflag=false; EMSHandle=gvar->pm.emm.EMSHandle; - if (EMSPresent) + if (gvar->pm.emm.EMSPresent) { __asm { mov ah,EMS_FREEPAGES mov dx,[EMSHandle] int EMS_INT + jc errores + jmp Endes +#ifdef __BORLANDC__ + } +#endif + errores: +#ifdef __BORLANDC__ + __asm { +#endif + mov err,ah + mov errorflag,1 + jmp Endes +#ifdef __BORLANDC__ } - if (_AH) +#endif + Endes: +#ifdef __WATCOMC__ + } +#endif + if(errorflag==true) { + strcpy(str,"PML_ShutdownEMS: Error freeing EMS "); + MM_EMSerr(str, err); + printf("%s\n",str); Quit("PML_ShutdownEMS: Error freeing EMS\n"); //return; } @@ -328,46 +375,144 @@ PML_ShutdownEMS(global_game_variables_t *gvar) boolean PML_StartupXMS(global_game_variables_t *gvar) { - XMSPresent = false; // Assume failure - gvar->pm.xmm.XMSAvail = 0; - - _AX=0x4300; - geninterrupt(XMS_INT); // Check for presence of XMS driver - if (_AL != 0x80) - goto error; - +//TODO: translate the _REG into working assembly +//#define STARTUPXMSASM + byte err; + word XMSAvail, XMSHandle;//, XMSVer; + boolean errorflag=false; + word e=0; + gvar->pm.xmm.XMSPresent = false; // Assume failure + XMSAvail = gvar->mmi.XMSmem = 0; __asm { + mov ax,0x4300 + int XMS_INT // Check for presence of XMS driver + cmp al,0x80 + jne error1 + mov e,1 + mov ax,0x4310 int XMS_INT // Get address of XMS driver mov [WORD PTR XMSDriver],bx mov [WORD PTR XMSDriver+2],es // function pointer to XMS driver - } + mov ah,XMS_VERSION + call [DWORD PTR XMSDriver] //; Get XMS Version Number + mov [XMSVer],ax + mov e,2 + +#ifdef STARTUPXMSASM + mov ah,XMS_QUERYFREE // Find out how much XMS is available + call [DWORD PTR XMSDriver] + mov XMSAvail,ax + or ax,ax // AJR: bugfix 10/8/92 + jz error1 + mov e,3 +#endif + jmp End1 +#ifdef __BORLANDC__ + } +#endif + error1: +#ifdef __BORLANDC__ + __asm { +#endif + mov err,bl + mov errorflag,1 + jmp End1 +#ifdef __BORLANDC__ + } +#endif +End1: +#ifdef __WATCOMC__ + } +#endif + if(errorflag==true) goto error; +#ifndef STARTUPXMSASM XMS_CALL(XMS_QUERYFREE); // Find out how much XMS is available - gvar->pm.xmm.XMSAvail = _AX; + XMSAvail = _AX; if (!_AX) // AJR: bugfix 10/8/92 + { + errorflag = true; + err = _BL; goto error; + } + e++; +#endif - gvar->pm.xmm.XMSAvail &= ~(PMPageSizeKB - 1); // Round off to nearest page size - if (gvar->pm.xmm.XMSAvail < (PMPageSizeKB * 2)) // Need at least 2 pages +#ifdef __DEBUG_PM__ + printf("XMSVer=%02X ", XMSVer); + printf("XMSAvail=%u\n", XMSAvail); + getch(); +#endif + XMSAvail &= ~(PMPageSizeKB - 1); // Round off to nearest page size + if (XMSAvail < (PMPageSizeKB * 2)) // Need at least 2 pages + { + errorflag=true; goto error; - - _DX = gvar->pm.xmm.XMSAvail; + } +#ifdef STARTUPXMSASM + __asm { + mov dx,XMSAvail + mov ah,XMS_ALLOC // And do the allocation + call [DWORD PTR XMSDriver] + mov XMSHandle,dx + or ax,ax // AJR: bugfix 10/8/92 + jz error2 + mov e,4 + jmp End2 +#ifdef __BORLANDC__ + } +#endif + error2: +#ifdef __BORLANDC__ + __asm { +#endif + mov err,bl + mov errorflag,1 + jmp End2 +#ifdef __BORLANDC__ + } +#endif +End2: +#ifdef __WATCOMC__ + } +#endif +#else + _DX = XMSAvail; XMS_CALL(XMS_ALLOC); // And do the allocation - gvar->pm.xmm.XMSHandle = _DX; - + XMSHandle = _DX; if (!_AX) // AJR: bugfix 10/8/92 { - gvar->pm.xmm.XMSAvail = 0; + errorflag=true; + err = _BL; goto error; } - - gvar->mmi.XMSmem += gvar->pm.xmm.XMSAvail * 1024; - - XMSPresent = true; + e++; +#endif error: - return(XMSPresent); + if(errorflag==false) + { + gvar->mmi.XMSmem = (dword)(XMSAvail) * 1024; + gvar->pm.xmm.XMSAvail = XMSAvail; + gvar->pm.xmm.XMSHandle = XMSHandle; + //gvar->pm.xmm.XMSVer = XMSVer; + gvar->pm.xmm.XMSPresent = true; +#ifdef __DEBUG_PM__ + printf(" XMSmem=%lu XMSAvail=%u\n", gvar->mmi.XMSmem, XMSAvail); +#endif + } + else + { +#ifdef __DEBUG_PM__ + //printf("XMSHandle\n"); + //printf(" 1=%u 2=%u 3=%u 4=%u\n", XMSHandle1, XMSHandle2, XMSHandle3, XMSHandle4); + //printf(" 2=%u ", XMSHandle); + //printf(" %u", gvar->pm.xmm.XMSHandle); + printf(" err=%02X e=%u\n", err, e); +#endif + } + return(gvar->pm.xmm.XMSPresent); } // @@ -447,11 +592,36 @@ PML_CopyFromXMS(byte far *target,int sourcepage,word length, global_game_variabl void PML_ShutdownXMS(global_game_variables_t *gvar) { - if (XMSPresent) + boolean errorflag=false; + word XMSHandle = gvar->pm.xmm.XMSHandle; + if (gvar->pm.xmm.XMSPresent) { - _DX = gvar->pm.xmm.XMSHandle; - XMS_CALL(XMS_FREE); - if (_BL) + __asm { + mov dx,[XMSHandle] + //XMS_CALL(XMS_FREE); + mov ah,XMS_FREE + call [DWORD PTR XMSDriver] + or bl,bl + jz errorxs + jmp Endxs +#ifdef __BORLANDC__ + } +#endif + errorxs: +#ifdef __BORLANDC__ + __asm { +#endif + //mov err,ah + mov errorflag,1 + jmp Endxs +#ifdef __BORLANDC__ + } +#endif + Endxs: +#ifdef __WATCOMC__ + } +#endif + if(errorflag==true) { Quit("PML_ShutdownXMS: Error freeing XMS"); //return; @@ -475,16 +645,12 @@ PM_SetMainMemPurge(int level, global_game_variables_t *gvar) { int i; - if(MainPresent) + if(gvar->pm.mm.MainPresent) for (i = 0;i < PMMaxMainMem;i++) { #ifdef __DEBUG_PM__ 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])); printf("& %Fp, %Fp\n", &gvar->pm.mm.MainMemPages[i], &(gvar->pm.mm.MainMemPages[i])); - //MM_ShowMemory(gvar); - //MM_DumpData(gvar); - //MM_Report_(gvar); #endif if (gvar->pm.mm.MainMemPages[i]) MM_SetPurge(&(gvar->pm.mm.MainMemPages[i]),level, gvar); @@ -492,9 +658,7 @@ PM_SetMainMemPurge(int level, global_game_variables_t *gvar) else { - printf("MainPresent IS NULL\n"); - printf("%x ", MainPresent); - exit(-4); + Quit("MainPresent IS NULL\n"); } } @@ -520,7 +684,7 @@ PM_CheckMainMem(global_game_variables_t *gvar) PMBlockAttr *used; PageListStruct far *page; - if (!MainPresent) + if (!gvar->pm.mm.MainPresent) return; for (i = 0,page = gvar->pm.PMPages;i < gvar->pm.fi.ChunksInFile;i++,page++) @@ -583,15 +747,12 @@ PM_CheckMainMem(global_game_variables_t *gvar) void PML_StartupMainMem(global_game_variables_t *gvar) { - int i,n; + int i;//,n; memptr *p; gvar->pm.mm.MainPagesAvail = 0; - MainPresent = false; + gvar->pm.mm.MainPresent = false; MM_BombOnError(false, gvar); - printf("PML_StartupMainMem()\n"); - printf(" p=%04x MainMemPages=%04x\n", p, gvar->pm.mm.MainMemPages); - printf(" p=%Fp MainMemPages=%Fp\n", p, gvar->pm.mm.MainMemPages); for (i = 0,p = gvar->pm.mm.MainMemPages;i < PMMaxMainMem;i++,p++) { MM_GetPtr(p,PMPageSize, gvar); @@ -609,7 +770,7 @@ PML_StartupMainMem(global_game_variables_t *gvar) Quit("PM_SetupMainMem: Not enough main memory"); //return; } - MainPresent = true; + gvar->pm.mm.MainPresent = true; } // @@ -679,10 +840,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"); - printf("PML_OpenPageFile: Unable to open page file"); - printf(": %s\n", gvar->pm.fi.PageFileName); - exit(-1); + Quit("PML_OpenPageFile: Unable to open page file"); //return; } @@ -904,7 +1062,7 @@ PML_PutPageInXMS(int pagenum, global_game_variables_t *gvar) int usexms; PageListStruct far *page; - if (!XMSPresent) + if (!gvar->pm.xmm.XMSPresent) return; page = &gvar->pm.PMPages[pagenum]; @@ -1033,7 +1191,7 @@ PML_GetPageFromXMS(int pagenum,boolean mainonly, global_game_variables_t *gvar) PageListStruct far *page; page = &gvar->pm.PMPages[pagenum]; - if (XMSPresent && (page->xmsPage != -1)) + if (gvar->pm.xmm.XMSPresent && (page->xmsPage != -1)) { gvar->pm.xmm.XMSProtectPage = pagenum; checkaddr = PML_GetAPageBuffer(pagenum,mainonly, gvar); @@ -1147,15 +1305,15 @@ PM_SetPageLock(int pagenum,PMLockType lock, global_game_variables_t *gvar) void PM_Preload(boolean (*update)(word current,word total), global_game_variables_t *gvar) { - int i,j, + int i,//j, page,oogypage; word current,total, - totalnonxms,totalxms, + //totalnonxms,totalxms, mainfree,maintotal, - emsfree,emstotal, + //emstotal,emsfree, xmsfree,xmstotal; memptr addr; - PageListStruct far *p; + PageListStruct __far *p; mainfree = (gvar->pm.mm.MainPagesAvail - gvar->pm.MainPagesUsed) + (gvar->pm.emm.EMSPagesAvail - gvar->pm.EMSPagesUsed); xmsfree = (gvar->pm.xmm.XMSPagesAvail - gvar->pm.XMSPagesUsed); @@ -1347,29 +1505,15 @@ PM_Startup(global_game_variables_t *gvar) boolean nomain,noems,noxms; int i; - if (PMStarted) + if (gvar->pm.PMStarted) return; - strcpy(&(gvar->pm.fi.PageFileName), "VSWAP."); + //strcpy(&(gvar->pm.fi.PageFileName), "VSWAP."); nomain = noems = noxms = false; - for (i = 1;i < -#ifdef __WATCOMC__ - __argc -#endif -#ifdef __BORLANDC__ - _argc -#endif - ;i++) + for (i = 1;i < _argc;i++) { - switch (US_CheckParm( -#ifdef __WATCOMC__ - __argv[i] -#endif -#ifdef __BORLANDC__ - _argv[i] -#endif - ,ParmStrings)) + switch (US_CheckParm(_argv[i],ParmStrings)) { case 0: nomain = true; @@ -1383,24 +1527,24 @@ PM_Startup(global_game_variables_t *gvar) } } - PML_OpenPageFile(gvar); + //0000+=+=PML_OpenPageFile(gvar); - if (!noems) + if (!noems && MML_CheckForEMS()) PML_StartupEMS(gvar); - if (!noxms) + if (!noxms && MML_CheckForXMS()) PML_StartupXMS(gvar); + if(!nomain) + PML_StartupMainMem(gvar); - if (nomain && !EMSPresent) + if (!gvar->pm.mm.MainPresent && !gvar->pm.emm.EMSPresent && !gvar->pm.xmm.XMSPresent) { Quit("PM_Startup: No main or EMS\n"); //return; } - printf("PML_StartupMainMem\n"); - PML_StartupMainMem(gvar); PM_Reset(gvar); - PMStarted = true; + gvar->pm.PMStarted = true; } // @@ -1409,13 +1553,13 @@ PM_Startup(global_game_variables_t *gvar) void PM_Shutdown(global_game_variables_t *gvar) { - PML_ShutdownXMS(gvar); - PML_ShutdownEMS(gvar); + if(MML_CheckForXMS()) PML_ShutdownXMS(gvar); + if(MML_CheckForEMS()) PML_ShutdownEMS(gvar); - if (!PMStarted) + if (!gvar->pm.PMStarted) return; - PML_ClosePageFile(gvar); + //PML_ClosePageFile(gvar); PML_ShutdownMainMem(gvar); }