X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_pm.c;h=7ecab1eb418ee35fb6ef1d30a77ea3e6c53f51c0;hb=6abb6ddef2f5860213065998a305a574704f6296;hp=9cbed569789fe81f98190ab2eb152af924206064;hpb=2fd9b2ce1016f4774c1e21d7432e6b95c02ad378;p=16.git diff --git a/src/lib/16_pm.c b/src/lib/16_pm.c index 9cbed569..7ecab1eb 100755 --- a/src/lib/16_pm.c +++ b/src/lib/16_pm.c @@ -48,7 +48,8 @@ boolean dbg_debugpm=0; // XMS specific variables //boolean XMSPresent; //word gvar->pm.xmm.XMSAvail,gvar->pm.xmm.XMSPagesAvail,gvar->pm.xmm.XMSHandle; - dword XMSDriver; + dword XMSDriver; //hard to put in gvar + word XMSVer; //hard to put in gvar /* int gvar->pm.xmm.XMSProtectPage = -1; // File specific variables @@ -69,6 +70,26 @@ boolean dbg_debugpm=0; PageListStruct far *gvar->pm.PMPages, _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}; ///////////////////////////////////////////////////////////////////////////// @@ -83,9 +104,9 @@ static char *ParmStrings[] = {"nomain","noems","noxms",nil}; byte PML_MapEMS(word logical, byte physical, global_game_variables_t *gvar) { - byte err, str[160]; + byte err=0, str[160]; unsigned EMShandle; - int i; + //int i; boolean errorflag=false; EMShandle=gvar->pm.emm.EMSHandle; @@ -140,12 +161,12 @@ PML_StartupEMS(global_game_variables_t *gvar) { int i; //long size; - byte err, str[64]; + byte err=0, str[64]; 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; gvar->pm.emm.EMSPresent = false; // Assume that we'll fail gvar->pm.emm.EMSAvail = 0; @@ -154,13 +175,13 @@ PML_StartupEMS(global_game_variables_t *gvar) __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 @@ -168,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 @@ -298,7 +319,7 @@ void PML_ShutdownEMS(global_game_variables_t *gvar) { word EMSHandle; - byte err,str[64]; + byte err=0, str[64]; boolean errorflag=false; EMSHandle=gvar->pm.emm.EMSHandle; @@ -357,8 +378,7 @@ PML_StartupXMS(global_game_variables_t *gvar) //TODO: translate the _REG into working assembly //#define STARTUPXMSASM byte err; - word XMSAvail, XMSHandle; -//++++ word XMSVer; + word XMSAvail, XMSHandle;//, XMSVer; boolean errorflag=false; word e=0; gvar->pm.xmm.XMSPresent = false; // Assume failure @@ -375,14 +395,15 @@ PML_StartupXMS(global_game_variables_t *gvar) 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,0 -//++++ call [DWORD PTR XMSDriver] //; Get XMS Version Number -//++++ mov [XMSVer],ax + + 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]//DWORD PTR + call [DWORD PTR XMSDriver] mov XMSAvail,ax or ax,ax // AJR: bugfix 10/8/92 jz error1 @@ -420,8 +441,9 @@ End1: #endif #ifdef __DEBUG_PM__ -//++++ printf("XMSVer=%02X ", XMSVer); + 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 @@ -433,7 +455,7 @@ End1: __asm { mov dx,XMSAvail mov ah,XMS_ALLOC // And do the allocation - call [DWORD PTR XMSDriver]//DWORD PTR + call [DWORD PTR XMSDriver] mov XMSHandle,dx or ax,ax // AJR: bugfix 10/8/92 jz error2 @@ -474,7 +496,7 @@ error: gvar->mmi.XMSmem = (dword)(XMSAvail) * 1024; gvar->pm.xmm.XMSAvail = XMSAvail; gvar->pm.xmm.XMSHandle = XMSHandle; -//++++ gvar->pm.xmm.XMSVer = XMSVer; + //gvar->pm.xmm.XMSVer = XMSVer; gvar->pm.xmm.XMSPresent = true; #ifdef __DEBUG_PM__ printf(" XMSmem=%lu XMSAvail=%u\n", gvar->mmi.XMSmem, XMSAvail); @@ -725,7 +747,7 @@ 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; @@ -1283,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); @@ -1489,23 +1511,9 @@ PM_Startup(global_game_variables_t *gvar) //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;