/* Project 16 Source Code~\r
- * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover\r
+ * Copyright (C) 2012-2017 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover\r
*\r
* This file is part of Project 16.\r
*\r
#include "src/lib/16_pm.h"\r
#pragma hdrstop\r
\r
-#ifdef __DEBUG__\r
-boolean dbg_debugpm=0;\r
-#endif\r
-\r
// Main Mem specific variables\r
//boolean MainPresent;\r
/* memptr MainMemPages[PMMaxMainMem];\r
// XMS specific variables\r
//boolean XMSPresent;\r
//word gvar->pm.xmm.XMSAvail,gvar->pm.xmm.XMSPagesAvail,gvar->pm.xmm.XMSHandle;\r
- dword XMSDriver;\r
+ dword XMSDriver; //hard to put in gvar\r
+ word XMSVer; //hard to put in gvar\r
/* int gvar->pm.xmm.XMSProtectPage = -1;\r
\r
// File specific variables\r
PageListStruct far *gvar->pm.PMPages,\r
_seg *gvar->pm.PMSegPages;*/\r
\r
+static union REGS CPURegs;\r
+\r
+#define _AX CPURegs.x.ax\r
+#define _BX CPURegs.x.bx\r
+#define _CX CPURegs.x.cx\r
+#define _DX CPURegs.x.dx\r
+\r
+#define _SI CPURegs.x.si\r
+\r
+#define _AH CPURegs.h.ah\r
+#define _AL CPURegs.h.al\r
+#define _BH CPURegs.h.bh\r
+#define _BL CPURegs.h.bl\r
+#define _CH CPURegs.h.ch\r
+#define _CL CPURegs.h.cl\r
+#define _DH CPURegs.h.dh\r
+#define _DL CPURegs.h.dl\r
+\r
+#ifdef __WATCOMC__\r
+#define geninterrupt(n) int86(n,&CPURegs,&CPURegs);\r
+#endif\r
+\r
static char *ParmStrings[] = {"nomain","noems","noxms",nil};\r
\r
/////////////////////////////////////////////////////////////////////////////\r
byte\r
PML_MapEMS(word logical, byte physical, global_game_variables_t *gvar)\r
{\r
- byte err, str[160];\r
+ byte err=0, str[160];\r
unsigned EMShandle;\r
- int i;\r
+ //int i;\r
\r
boolean errorflag=false;\r
EMShandle=gvar->pm.emm.EMSHandle;\r
strcpy(str,"MM_MapEMS: EMS error ");\r
MM_EMSerr(str, err);\r
printf("%s\n",str);\r
- Quit("PML_MapEMS: Page mapping failed\n");\r
+ Quit ("PML_MapEMS: Page mapping failed\n");\r
return err;\r
}\r
return 0;\r
// If there's more than our minimum (2 pages) available, allocate it (up\r
// to the maximum we need)\r
//\r
+// Please call MML_CheckForEMS() before calling this function.\r
+// MML_CheckForEMS is not local despite the name wwww.\r
+//\r
\r
boolean\r
PML_StartupEMS(global_game_variables_t *gvar)\r
{\r
int i;\r
- //long size;\r
- byte err, str[64];\r
+#ifdef __PM__NOHOGEMS__\r
+ long size;\r
+#endif\r
+ byte err=0, str[64];\r
\r
boolean errorflag=false;\r
- static char emmname[] = "EMMXXXX0"; //fix by andrius4669\r
- unsigned int EMSVer = 0;\r
+ unsigned EMSVer;\r
unsigned totalEMSpages,freeEMSpages,EMSPageFrame,EMSHandle,EMSAvail;\r
- totalEMSpages = freeEMSpages = EMSPageFrame = 0;\r
+ totalEMSpages = freeEMSpages = EMSPageFrame = EMSHandle = EMSAvail = EMSVer = 0; // set all to 0~\r
gvar->pm.emm.EMSPresent = false; // Assume that we'll fail\r
- gvar->pm.emm.EMSAvail = 0;\r
- gvar->mmi.EMSmem = 0;\r
+ gvar->pm.emm.EMSAvail = 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
-\r
- mov bx,ax\r
- mov ax,0x4400\r
-\r
- int EMS_INT // get device info\r
- jc error1\r
-\r
- and dx,0x80\r
- jz error1\r
-\r
- mov ax,0x4407\r
-\r
- int EMS_INT // get status\r
- jc error1\r
- or al,al\r
- jz error1\r
-\r
- mov ah,0x3e\r
- int EMS_INT // close handle\r
- jc error1\r
-\r
+ //MML_CheckForEMS() takes care of what the code did here\r
mov ah,EMS_STATUS\r
int EMS_INT\r
jc error1 // make sure EMS hardware is present\r
int EMS_INT // only work on EMS 3.2 or greater (silly, but...)\r
or ah,ah\r
jnz error1\r
- mov [EMSVer],ax // set EMSVer\r
+ mov [EMSVer],ax // set EMSVer\r
cmp al,0x32 // only work on ems 3.2 or greater\r
jb error1\r
\r
mov [totalEMSpages],dx\r
mov [freeEMSpages],bx\r
mov [EMSAvail],bx\r
- jmp End1\r
+ jmp End1\r
#ifdef __BORLANDC__\r
}\r
#endif\r
#endif\r
mov err,ah\r
mov errorflag,1\r
- jmp End1\r
+ jmp End1\r
#ifdef __BORLANDC__\r
}\r
#endif\r
#ifdef __WATCOMC__\r
}\r
#endif\r
-/*\r
+#ifdef __PM__NOHOGEMS__\r
if(errorflag==false)\r
{\r
// Don't hog all available EMS\r
gvar->pm.emm.EMSAvail = size / EMSPageSize;\r
}\r
}\r
-*/\r
+#endif\r
__asm {\r
mov ah,EMS_ALLOCPAGES\r
mov bx,[EMSAvail];\r
#endif\r
mov err,ah\r
mov errorflag,1\r
- jmp End2\r
+ jmp End2\r
#ifdef __BORLANDC__\r
- }\r
+ }//end of assembly\r
#endif\r
End2:\r
#ifdef __WATCOMC__\r
- }\r
+ }//end of assembly\r
#endif\r
-\r
- if(errorflag==false)\r
- {\r
- gvar->mmi.EMSmem = EMSAvail * (dword)EMSPageSize;\r
-\r
- // Initialize EMS mapping cache\r
- for (i = 0;i < EMSFrameCount;i++)\r
- gvar->pm.emm.EMSList[i].baseEMSPage = -1;\r
-\r
- }\r
- else\r
+ if(errorflag==true)\r
{\r
strcpy(str,"PML_StartupEMS: EMS error ");\r
MM_EMSerr(str, err);\r
printf("%s\n",str);\r
return(gvar->pm.emm.EMSPresent);\r
}\r
+ gvar->mmi.EMSmem = EMSAvail * (dword)EMSPageSize;\r
+\r
+ // Initialize EMS mapping cache\r
+ for (i = 0;i < EMSFrameCount;i++)\r
+ gvar->pm.emm.EMSList[i].baseEMSPage = -1;\r
\r
gvar->pm.emm.EMSPresent = true; // We have EMS\r
gvar->pm.emm.EMSPageFrame = EMSPageFrame;\r
PML_ShutdownEMS(global_game_variables_t *gvar)\r
{\r
word EMSHandle;\r
- byte err,str[64];\r
+ byte err=0, str[64];\r
\r
boolean errorflag=false;\r
EMSHandle=gvar->pm.emm.EMSHandle;\r
strcpy(str,"PML_ShutdownEMS: Error freeing EMS ");\r
MM_EMSerr(str, err);\r
printf("%s\n",str);\r
- Quit("PML_ShutdownEMS: Error freeing EMS\n");\r
+ Quit ("PML_ShutdownEMS: Error freeing EMS\n");\r
//return;\r
}\r
}\r
boolean\r
PML_StartupXMS(global_game_variables_t *gvar)\r
{\r
- boolean errorflag;\r
+//TODO: translate the _REG into working assembly\r
+//#define STARTUPXMSASM\r
byte err;\r
- word /*XMSAvail,*/ XMSHandle;\r
-\r
- word XMSAvail1, XMSAvail2, XMSAvail3, XMSAvail4;\r
-\r
+ word XMSAvail, XMSHandle;//, XMSVer;\r
+ boolean errorflag=false;\r
word e=0;\r
- errorflag=gvar->pm.xmm.XMSPresent = false; // Assume failure\r
- gvar->pm.xmm.XMSAvail = gvar->mmi.XMSmem = 0;\r
+ gvar->pm.xmm.XMSPresent = false; // Assume failure\r
+ XMSAvail = gvar->mmi.XMSmem = 0;\r
\r
__asm {\r
mov ax,0x4300\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
+ mov ah,XMS_VERSION\r
+ call [DWORD PTR XMSDriver] //; Get XMS Version Number\r
+ mov [XMSVer],ax\r
mov e,2\r
\r
- //XMS_CALL(XMS_QUERYFREE); // Find out how much XMS is available\r
+#ifdef STARTUPXMSASM\r
mov ah,XMS_QUERYFREE // Find out how much XMS is available\r
call [DWORD PTR XMSDriver]\r
- //mov [XMSAvail],ax\r
- //mov XMSAvail1,ax\r
- //mov ax,XMSAvail2\r
- //mov [XMSAvail3],ax\r
- mov ax,[XMSAvail4]\r
- mov err,bl\r
- cmp ax,0 // AJR: bugfix 10/8/92\r
- je error1\r
+ mov XMSAvail,ax\r
+ or ax,ax // AJR: bugfix 10/8/92\r
+ jz error1\r
mov e,3\r
+#endif\r
jmp End1\r
#ifdef __BORLANDC__\r
}\r
#ifdef __WATCOMC__\r
}\r
#endif\r
-\r
-// XMS_CALL(XMS_QUERYFREE); // Find out how much XMS is available\r
-// XMSAvail = _AX;\r
-// if (!_AX) // AJR: bugfix 10/8/92\r
-// goto error;\r
-\r
- printf(" XMSAvail=%u e=%u\n", XMSAvail4, e);\r
- //printf(" %u %u %u %u\n", XMSAvail1, XMSAvail2, XMSAvail3, XMSAvail4);\r
- XMSAvail4 &= ~(PMPageSizeKB - 1); // Round off to nearest page size\r
- if (XMSAvail4 < (PMPageSizeKB * 2)){ // Need at least 2 pages\r
- printf("PISS! %u\n", XMSAvail4);\r
+ if(errorflag==true) goto error;\r
+#ifndef STARTUPXMSASM\r
+ XMS_CALL(XMS_QUERYFREE); // Find out how much XMS is available\r
+ XMSAvail = _AX;\r
+ if (!_AX) // AJR: bugfix 10/8/92\r
+ {\r
+ errorflag = true;\r
+ err = _BL;\r
goto error;\r
}\r
+ e++;\r
+#endif\r
\r
+#ifdef __DEBUG_PM__\r
+ printf("XMSVer=%02X ", XMSVer);\r
+ printf("XMSAvail=%u\n", XMSAvail);\r
+ getch();\r
+#endif\r
+ XMSAvail &= ~(PMPageSizeKB - 1); // Round off to nearest page size\r
+ if (XMSAvail < (PMPageSizeKB * 2)) // Need at least 2 pages\r
+ {\r
+ errorflag=true;\r
+ goto error;\r
+ }\r
+#ifdef STARTUPXMSASM\r
__asm {\r
- mov dx,XMSAvail4\r
- //XMS_CALL(XMS_ALLOC); // And do the allocation\r
- mov ah,XMS_ALLOC\r
+ mov dx,XMSAvail\r
+ mov ah,XMS_ALLOC // And do the allocation\r
call [DWORD PTR XMSDriver]\r
mov XMSHandle,dx\r
or ax,ax // AJR: bugfix 10/8/92\r
#ifdef __WATCOMC__\r
}\r
#endif\r
-\r
- if(errorflag==false)\r
- {\r
- gvar->mmi.XMSmem = XMSAvail4 * (dword)1024;\r
- gvar->pm.xmm.XMSAvail = XMSAvail4;\r
- gvar->pm.xmm.XMSHandle = XMSHandle;\r
-\r
- gvar->pm.xmm.XMSPresent = true;\r
- printf(" %u %u %u\n", gvar->mmi.XMSmem, gvar->pm.xmm.XMSAvail, XMSAvail4);\r
- getch();\r
- }else printf(" %u errorflag=%02X\n", XMSAvail4, err);\r
-error:\r
- return(gvar->pm.xmm.XMSPresent);\r
-/*\r
- gvar->pm.xmm.XMSPresent = false; // Assume failure\r
- gvar->pm.xmm.XMSAvail = 0;\r
-\r
-__asm mov ax,0x4300\r
-__asm int XMS_INT // Check for presence of XMS driver\r
- if (_AL != 0x80)\r
- goto error;\r
-\r
-\r
-__asm mov ax,0x4310\r
-__asm int XMS_INT // Get address of XMS driver\r
-__asm mov [WORD PTR XMSDriver],bx\r
-__asm mov [WORD PTR XMSDriver+2],es // function pointer to XMS driver\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
- 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
+#else\r
+ _DX = XMSAvail;\r
XMS_CALL(XMS_ALLOC); // And do the allocation\r
- gvar->pm.xmm.XMSHandle = _DX;\r
-\r
+ XMSHandle = _DX;\r
if (!_AX) // AJR: bugfix 10/8/92\r
{\r
- gvar->pm.xmm.XMSAvail = 0;\r
+ errorflag=true;\r
+ err = _BL;\r
goto error;\r
}\r
-\r
- gvar->mmi.XMSmem = gvar->pm.xmm.XMSAvail * 1024;\r
-\r
- gvar->pm.xmm.XMSPresent = true;\r
+ e++;\r
+#endif\r
error:\r
- printf("XMSstart %u %u\n", gvar->mmi.XMSmem, gvar->pm.xmm.XMSAvail);\r
- return(gvar->pm.xmm.XMSPresent);*/\r
+ if(errorflag==false)\r
+ {\r
+ gvar->mmi.XMSmem = (dword)(XMSAvail) * 1024;\r
+ gvar->pm.xmm.XMSAvail = XMSAvail;\r
+ gvar->pm.xmm.XMSHandle = XMSHandle;\r
+ //gvar->pm.xmm.XMSVer = XMSVer;\r
+ gvar->pm.xmm.XMSPresent = true;\r
+#ifdef __DEBUG_PM__\r
+ printf(" XMSmem=%lu XMSAvail=%u\n", gvar->mmi.XMSmem, XMSAvail);\r
+#endif\r
+ }\r
+ else\r
+ {\r
+#ifdef __DEBUG_PM__\r
+ //printf("XMSHandle\n");\r
+ //printf(" 1=%u 2=%u 3=%u 4=%u\n", XMSHandle1, XMSHandle2, XMSHandle3, XMSHandle4);\r
+ //printf(" 2=%u ", XMSHandle);\r
+ //printf(" %u", gvar->pm.xmm.XMSHandle);\r
+ printf(" err=%02X e=%u\n", err, e);\r
+#endif\r
+ }\r
+ return(gvar->pm.xmm.XMSPresent);\r
}\r
\r
//\r
\r
if (!addr)\r
{\r
- Quit("PML_XMSCopy: zero address\n");\r
- //return;\r
+ Quit ("PML_XMSCopy: zero address\n");\r
}\r
\r
xoffset = (dword)xmspage * PMPageSize;\r
}\r
if (!_AX)\r
{\r
- Quit("PML_XMSCopy: Error on copy");\r
+ Quit ("PML_XMSCopy: Error on copy");\r
//return;\r
}\r
}\r
#endif\r
if(errorflag==true)\r
{\r
- Quit("PML_ShutdownXMS: Error freeing XMS");\r
+ Quit ("PML_ShutdownXMS: Error freeing XMS");\r
//return;\r
}\r
}\r
for (i = 0;i < PMMaxMainMem;i++)\r
{\r
#ifdef __DEBUG_PM__\r
+#ifdef __DEBUG_PM_MAIN__\r
printf("PM_SetMainMemPurge() info of gvar->pm.mm.MainMemPages[i]\n");\r
printf("& %Fp, %Fp\n", &gvar->pm.mm.MainMemPages[i], &(gvar->pm.mm.MainMemPages[i]));\r
+#endif\r
#endif\r
if (gvar->pm.mm.MainMemPages[i])\r
MM_SetPurge(&(gvar->pm.mm.MainMemPages[i]),level, gvar);\r
\r
else\r
{\r
- Quit("MainPresent IS NULL\n");\r
+ Quit ("MainPresent IS NULL\n");\r
}\r
}\r
\r
void\r
PML_StartupMainMem(global_game_variables_t *gvar)\r
{\r
- int i,n;\r
+ int i;//,n;\r
memptr *p;\r
\r
gvar->pm.mm.MainPagesAvail = 0;\r
gvar->mm.mmerror = false;\r
if (gvar->pm.mm.MainPagesAvail < PMMinMainMem)\r
{\r
- Quit("PM_SetupMainMem: Not enough main memory");\r
+ Quit ("PM_SetupMainMem: Not enough main memory");\r
//return;\r
}\r
gvar->pm.mm.MainPresent = true;\r
{\r
if (!buf)\r
{\r
- Quit("PML_ReadFromFile: Null pointer");\r
+ Quit ("PML_ReadFromFile: Null pointer");\r
//return;\r
}\r
if (!offset)\r
{\r
- Quit("PML_ReadFromFile: Zero offset");\r
+ Quit ("PML_ReadFromFile: Zero offset");\r
//return;\r
}\r
if (lseek(gvar->pm.fi.PageFile,offset,SEEK_SET) != offset)\r
{\r
- Quit("PML_ReadFromFile: Seek failed");\r
+ Quit ("PML_ReadFromFile: Seek failed");\r
//return;\r
}\r
if (!CA_FarRead(gvar->pm.fi.PageFile,buf,length, gvar))\r
{\r
- Quit("PML_ReadFromFile: Read failed");\r
+ Quit ("PML_ReadFromFile: Read failed");\r
//return;\r
}\r
}\r
{\r
int i;\r
long size;\r
- //__SEGA buf;\r
- memptr buf;\r
+ void _seg *buf;\r
dword far *offsetptr;\r
word far *lengthptr;\r
PageListStruct far *page;\r
gvar->pm.fi.PageFile = open(gvar->pm.fi.PageFileName,O_RDONLY + O_BINARY);\r
if (gvar->pm.fi.PageFile == -1)\r
{\r
- Quit("PML_OpenPageFile: Unable to open page file");\r
+ Quit ("PML_OpenPageFile: Unable to open page file");\r
//return;\r
}\r
\r
\r
// Allocate and clear the page list\r
gvar->pm.PMNumBlocks = gvar->pm.fi.ChunksInFile;\r
- MM_GetPtr((memptr *)gvar->pm.PMSegPages, sizeof(PageListStruct) * (gvar->pm.PMNumBlocks), gvar);\r
- MM_SetLock((memptr *)gvar->pm.PMSegPages,true, gvar);\r
+ MM_GetPtr((memptr *)&gvar->pm.PMSegPages, sizeof(PageListStruct) * (gvar->pm.PMNumBlocks), gvar);\r
+ MM_SetLock((memptr *)&gvar->pm.PMSegPages,true, gvar);\r
gvar->pm.PMPages = (PageListStruct far *)gvar->pm.PMSegPages;\r
_fmemset(gvar->pm.PMPages,0,sizeof(PageListStruct) * gvar->pm.PMNumBlocks);\r
\r
// Read in the chunk offsets\r
size = sizeof(dword) * gvar->pm.fi.ChunksInFile;\r
- MM_GetPtr(&buf, size, gvar);\r
+ MM_GetPtr((memptr *)&buf, size, gvar);\r
if (!CA_FarRead(gvar->pm.fi.PageFile,(byte far *)buf,size, gvar))\r
{\r
- Quit("PML_OpenPageFile: Offset read failed");\r
+ Quit ("PML_OpenPageFile: Offset read failed");\r
//return;\r
}\r
offsetptr = (dword far *)buf;\r
for (i = 0,page = gvar->pm.PMPages;i < gvar->pm.fi.ChunksInFile;i++,page++)\r
page->offset = *offsetptr++;\r
- MM_FreePtr(&buf, gvar);\r
+ MM_FreePtr((memptr *)&buf, gvar);\r
\r
// Read in the chunk lengths\r
size = sizeof(word) * gvar->pm.fi.ChunksInFile;\r
MM_GetPtr(&buf,size, gvar);\r
if (!CA_FarRead(gvar->pm.fi.PageFile,(byte far *)buf,size, gvar))\r
{\r
- Quit("PML_OpenPageFile: Length read failed");\r
+ Quit ("PML_OpenPageFile: Length read failed");\r
//return;\r
}\r
lengthptr = (word far *)buf;\r
for (i = 0,page = gvar->pm.PMPages;i < gvar->pm.fi.ChunksInFile;i++,page++)\r
page->length = *lengthptr++;\r
- MM_FreePtr(&buf, gvar);\r
+ MM_FreePtr((memptr *)&buf, gvar);\r
}\r
\r
//\r
close(gvar->pm.fi.PageFile);\r
if (gvar->pm.PMSegPages)\r
{\r
- MM_SetLock((memptr)gvar->pm.PMSegPages,false, gvar);\r
- MM_FreePtr((memptr)gvar->pm.PMSegPages, gvar);\r
+ MM_SetLock((memptr *)&gvar->pm.PMSegPages,false, gvar);\r
+ MM_FreePtr((void _seg *)&gvar->pm.PMSegPages, gvar);\r
}\r
}\r
\r
}\r
\r
if (emspage == -1)\r
- Quit("PML_GetEMSAddress: EMS find failed");\r
+ Quit ("PML_GetEMSAddress: EMS find failed");\r
\r
gvar->pm.emm.EMSList[emspage].lastHit = gvar->pm.PMFrameCount;\r
offset = emspage * EMSPageSizeSeg;\r
}\r
\r
if (lru == -1)\r
- Quit("PML_GiveLRUPage: LRU Search failed");\r
+ Quit ("PML_GiveLRUPage: LRU Search failed");\r
return(lru);\r
}\r
\r
{\r
usexms = PML_GiveLRUXMSPage(gvar);\r
if (usexms == -1)\r
- Quit("PML_PutPageInXMS: No XMS LRU");\r
+ Quit ("PML_PutPageInXMS: No XMS LRU");\r
page->xmsPage = gvar->pm.PMPages[usexms].xmsPage;\r
gvar->pm.PMPages[usexms].xmsPage = -1;\r
}\r
PageListStruct far *origpage,far *newpage;\r
\r
if (orig == new)\r
- Quit("PML_TransferPageSpace: Identity replacement");\r
+ Quit ("PML_TransferPageSpace: Identity replacement");\r
\r
origpage = &gvar->pm.PMPages[orig];\r
newpage = &gvar->pm.PMPages[new];\r
\r
if (origpage->locked != pml_Unlocked)\r
- Quit("PML_TransferPageSpace: Killing locked page");\r
+ Quit ("PML_TransferPageSpace: Killing locked page");\r
\r
if ((origpage->emsPage == -1) && (origpage->mainPage == -1))\r
- Quit("PML_TransferPageSpace: Reusing non-existent page");\r
+ Quit ("PML_TransferPageSpace: Reusing non-existent page");\r
\r
// Copy page that's about to be purged into XMS\r
PML_PutPageInXMS(orig, gvar);\r
origpage->mainPage = origpage->emsPage = -1;\r
\r
if (!addr)\r
- Quit("PML_TransferPageSpace: Zero replacement");\r
+ Quit ("PML_TransferPageSpace: Zero replacement");\r
\r
return(addr);\r
}\r
}\r
}\r
if (n == -1)\r
- Quit("PML_GetPageBuffer: MainPagesAvail lied");\r
+ Quit ("PML_GetPageBuffer: MainPagesAvail lied");\r
addr = gvar->pm.mm.MainMemPages[n];\r
if (!addr)\r
- Quit("PML_GetPageBuffer: Purged main block");\r
+ Quit ("PML_GetPageBuffer: Purged main block");\r
page->mainPage = n;\r
gvar->pm.MainPagesUsed++;\r
}\r
addr = PML_TransferPageSpace(PML_GiveLRUPage(mainonly, gvar),pagenum, gvar);\r
\r
if (!addr)\r
- Quit("PML_GetPageBuffer: Search failed");\r
+ Quit ("PML_GetPageBuffer: Search failed");\r
return(addr);\r
}\r
\r
gvar->pm.xmm.XMSProtectPage = pagenum;\r
checkaddr = PML_GetAPageBuffer(pagenum,mainonly, gvar);\r
if (FP_OFF(checkaddr))\r
- Quit("PML_GetPageFromXMS: Non segment pointer");\r
+ Quit ("PML_GetPageFromXMS: Non segment pointer");\r
addr = (memptr)FP_SEG(checkaddr);\r
PML_CopyFromXMS(addr,page->xmsPage,page->length, gvar);\r
gvar->pm.xmm.XMSProtectPage = -1;\r
memptr result;\r
\r
if (pagenum >= gvar->pm.fi.ChunksInFile)\r
- Quit("PM_GetPage: Invalid page request");\r
+ Quit ("PM_GetPage: Invalid page request");\r
\r
-#ifdef __DEBUG_2__ // for debugging\r
+//#ifdef __DEBUG_2__ // for debugging\r
__asm {\r
mov dx,STATUS_REGISTER_1\r
in al,dx\r
mov al,10 // bright green\r
out dx,al\r
}\r
-#endif\r
+//#endif\r
\r
if (!(result = PM_GetPageAddress(pagenum, gvar)))\r
{\r
}\r
gvar->pm.PMPages[pagenum].lastHit = gvar->pm.PMFrameCount;\r
\r
-#ifdef __DEBUG_2__ // for debugging\r
+//#ifdef __DEBUG_2__ // for debugging\r
__asm{\r
mov dx,STATUS_REGISTER_1\r
in al,dx\r
out dx,al\r
mov al,0x20 // normal\r
out dx,al\r
-#endif\r
+ }\r
+//#endif\r
\r
return(result);\r
}\r
PM_SetPageLock(int pagenum,PMLockType lock, global_game_variables_t *gvar)\r
{\r
if (pagenum < gvar->pm.fi.PMSoundStart)\r
- Quit("PM_SetPageLock: Locking/unlocking non-sound page");\r
+ Quit ("PM_SetPageLock: Locking/unlocking non-sound page");\r
\r
gvar->pm.PMPages[pagenum].locked = lock;\r
}\r
void\r
PM_Preload(boolean (*update)(word current,word total), global_game_variables_t *gvar)\r
{\r
- int i,j,\r
+ int i,//j,\r
page,oogypage;\r
word current,total,\r
- totalnonxms,totalxms,\r
+ //totalnonxms,totalxms,\r
mainfree,maintotal,\r
- emsfree,emstotal,\r
+ //emstotal,emsfree,\r
xmsfree,xmstotal;\r
memptr addr;\r
- PageListStruct far *p;\r
+ PageListStruct __far *p;\r
\r
mainfree = (gvar->pm.mm.MainPagesAvail - gvar->pm.MainPagesUsed) + (gvar->pm.emm.EMSPagesAvail - gvar->pm.EMSPagesUsed);\r
xmsfree = (gvar->pm.xmm.XMSPagesAvail - gvar->pm.XMSPagesUsed);\r
;\r
addr = PM_GetPage(oogypage, gvar);\r
if (!addr)\r
- Quit("PM_Preload: XMS buffer failed");\r
+ Quit ("PM_Preload: XMS buffer failed");\r
\r
while (xmstotal)\r
{\r
\r
p->xmsPage = gvar->pm.XMSPagesUsed++;\r
if (gvar->pm.XMSPagesUsed > gvar->pm.xmm.XMSPagesAvail)\r
- Quit("PM_Preload: Exceeded XMS pages");\r
+ Quit ("PM_Preload: Exceeded XMS pages");\r
if (p->length > PMPageSize)\r
- Quit("PM_Preload: Page too long");\r
+ Quit ("PM_Preload: Page too long");\r
\r
PML_ReadFromFile((byte far *)addr,p->offset,p->length, gvar);\r
PML_CopyToXMS((byte far *)addr,p->xmsPage,p->length, gvar);\r
{\r
char buf[40];\r
sprintf(buf,"PM_NextFrame: Page %d is locked",i);\r
- Quit(buf);\r
+ Quit (buf);\r
}\r
}\r
//#endif\r
if (gvar->pm.PMStarted)\r
return;\r
\r
- //strcpy(&(gvar->pm.fi.PageFileName), "VSWAP.");\r
+ //0000+=+=strcpy(&(gvar->pm.fi.PageFileName), "VSWAP.");\r
\r
nomain = noems = noxms = false;\r
- for (i = 1;i <\r
-#ifdef __WATCOMC__\r
- __argc\r
-#endif\r
-#ifdef __BORLANDC__\r
- _argc\r
-#endif\r
- ;i++)\r
+ for (i = 1;i < _argc;i++)\r
{\r
- switch (US_CheckParm(\r
-#ifdef __WATCOMC__\r
- __argv[i]\r
-#endif\r
-#ifdef __BORLANDC__\r
- _argv[i]\r
-#endif\r
- ,ParmStrings))\r
+ switch (US_CheckParm(_argv[i],ParmStrings))\r
{\r
case 0:\r
nomain = true;\r
PML_StartupEMS(gvar);\r
if (!noxms && MML_CheckForXMS())\r
PML_StartupXMS(gvar);\r
+ if(!nomain)\r
+ PML_StartupMainMem(gvar);\r
\r
- if (!nomain && !gvar->pm.emm.EMSPresent)\r
+ if (!gvar->pm.mm.MainPresent && !gvar->pm.emm.EMSPresent && !gvar->pm.xmm.XMSPresent)\r
{\r
- printf("PM_Startup: No main or EMS\n");\r
- exit(-5);\r
+ Quit ("PM_Startup: No main or EMS\n");\r
//return;\r
}\r
- PML_StartupMainMem(gvar);\r
\r
PM_Reset(gvar);\r
\r
if (!gvar->pm.PMStarted)\r
return;\r
\r
- PML_ClosePageFile(gvar);\r
+ //0000+=+=PML_ClosePageFile(gvar);\r
\r
PML_ShutdownMainMem(gvar);\r
}\r
projects / 16.git / blobdiff