X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_mm.c;h=b338e5910e3515bfa8a6722429595e00109de6df;hb=5d57fb1ad5b8342b68eda18973c2f45d81481a2e;hp=d1e2759d5b519e7c0ef9f7e59ef3553bf742204b;hpb=bf07126d8aad1c376d18d09b4cbb3cd52203ff4d;p=16.git diff --git a/src/lib/16_mm.c b/src/lib/16_mm.c index d1e2759d..b338e591 100755 --- a/src/lib/16_mm.c +++ b/src/lib/16_mm.c @@ -28,7 +28,7 @@ Primary coder: John Carmack RELIES ON --------- -Quit (char *error) function +Quit (global_game_variables_t *gvar, char *error) function WORK TO DO @@ -72,9 +72,9 @@ void (* XMSaddr) (void); // far pointer to XMS driver ============================================================================= */ - +#ifndef __16_PM__ static char *ParmStringsexmm[] = {"noems","noxms",""}; - +#endif /* ====================== = @@ -87,7 +87,7 @@ static char *ParmStringsexmm[] = {"noems","noxms",""}; boolean MML_CheckForEMS(void) { - boolean emmcfems; + boolean emmcfems=0; static char emmname[] = "EMMXXXX0"; //fix by andrius4669 __asm { mov dx,OFFSET emmname //fix by andrius4669 @@ -140,7 +140,7 @@ boolean MML_CheckForEMS(void) return(emmcfems); } - +#ifndef __16_PM__ /* ====================== = @@ -285,7 +285,7 @@ void MML_ShutdownEMS(global_game_variables_t *gvar) } #endif if(errorflag==true) - Quit("MML_ShutdownEMS: Error freeing EMS!\n"); //++++ add something + Quit (gvar, "MML_ShutdownEMS: Error freeing EMS!\n"); //++++ add something } /* @@ -424,7 +424,7 @@ byte MM_MapXEMS(global_game_variables_t *gvar) gvar->mmi.EMSmem = (i)*0x4000lu; return 0; } - +#endif //========================================================================== /* @@ -437,10 +437,10 @@ byte MM_MapXEMS(global_game_variables_t *gvar) ======================= */ -boolean MML_CheckForXMS(global_game_variables_t *gvar) +boolean MML_CheckForXMS(void) { + //numUMBs = 0; boolean errorflag=false; - gvar->mm.numUMBs = 0; __asm { mov ax,0x4300 @@ -459,7 +459,7 @@ boolean MML_CheckForXMS(global_game_variables_t *gvar) else return true; } - +#ifndef __16_PM__ /* ====================== = @@ -546,7 +546,7 @@ void MML_ShutdownXMS(global_game_variables_t *gvar) } } } - +#endif //========================================================================== /* @@ -563,7 +563,7 @@ void MML_ShutdownXMS(global_game_variables_t *gvar) /*void MML_UseSpace(word segstart, dword seglength, global_game_variables_t *gvar) { - //huge mmblocktype huge *scan,huge *last; + mmblocktype far *scan,far *last; word segm=1; word oldend; dword segmlen; @@ -716,8 +716,7 @@ void MML_UseSpace(word segstart, dword seglength, global_game_variables_t *gvar) void MML_ClearBlock(global_game_variables_t *gvar) { - //huge mmblocktype huge *scan,huge *last; - mmblocktype far *scan,far *last; + mmblocktype far *scan;//,far *last; scan = gvar->mm.mmhead->next; @@ -753,10 +752,8 @@ void MM_Startup(global_game_variables_t *gvar) int i; //dword length,seglength; dword length; word seglength; - //huge void huge *start; void far *start; word segstart;//,endfree; - //memptr *peeonself; if(gvar->mm.mmstarted) MM_Shutdown(gvar); @@ -770,9 +767,7 @@ void MM_Startup(global_game_variables_t *gvar) gvar->mm.mmhead = NULL; gvar->mm.mmfree = &(gvar->mm.mmblocks[0]); for(i=0;imm.mmblocks[i].next = &(gvar->mm.mmblocks[i+1]); - } gvar->mm.mmblocks[i].next = NULL; // @@ -784,23 +779,18 @@ void MM_Startup(global_game_variables_t *gvar) gvar->mm.mmnew->length = 0xffff; gvar->mm.mmnew->attributes = LOCKBIT; gvar->mm.mmnew->next = NULL; - //gvar->mm.mmnew->useptr = peeonself; gvar->mm.mmrover = gvar->mm.mmhead; - //printf(" %x\n", peeonself); - //printf(" %x\n", *peeonself); // // get all available near conventional memory segments // #ifdef __WATCOMC__ _nheapgrow(); length=(dword)_memavl();//(dword)GetFreeSize(); - //huge start = (void huge *)(gvar->mm.nearheap = _nmalloc(length)); start = (void far *)(gvar->mm.nearheap = _nmalloc(length)); #endif #ifdef __BORLANDC__ length=coreleft(); - //huge start = (void huge *)(gvar->mm.nearheap = malloc(length)); start = (void far *)(gvar->mm.nearheap = malloc(length)); #endif length -= 16-(FP_OFF(start)&15); @@ -817,12 +807,13 @@ void MM_Startup(global_game_variables_t *gvar) //printf("_FARCORELEFT %lu\n", _FCORELEFT); #ifdef __WATCOMC__ _fheapgrow(); + length=_FCORELEFT;//_fcoreleft();//(dword)GetFarFreeSize();//0xffffUL*4UL; #endif #ifdef __BORLANDC__ printf("farcoreleft() %lu\n", farcoreleft()); printf("(farcoreleft()+32)-_FCORELEFT %d\n", (sword)((farcoreleft()+32)-_FCORELEFT)); + length=farcoreleft();//_fcoreleft();//(dword)GetFarFreeSize();//0xffffUL*4UL; #endif - length=_FCORELEFT;//_fcoreleft();//(dword)GetFarFreeSize();//0xffffUL*4UL; start = gvar->mm.farheap = _fmalloc(length); //start = gvar->mm.farheap = halloc(length, 1); length -= 16-(FP_OFF(start)&15); @@ -836,35 +827,21 @@ void MM_Startup(global_game_variables_t *gvar) gvar->mmi.mainmem = gvar->mmi.nearheap + gvar->mmi.farheap; #ifndef __16_PM__ - if(!debugpm) { + if(!dbg_debugpm) { // // detect EMS and allocate up to 64K at page frame // gvar->mmi.EMSmem = 0; //goto emsskip; //0000 - for(i = 1;i < -#ifdef __WATCOMC__ - __argc -#endif -#ifdef __BORLANDC__ - _argc -#endif - ;i++) + for(i = 1;i < _argc;i++) { - if(US_CheckParm( -#ifdef __WATCOMC__ - __argv[i] -#endif -#ifdef __BORLANDC__ - _argv[i] -#endif - ,ParmStringsexmm) == 0) + if(US_CheckParm(_argv[i],ParmStringsexmm) == 0) goto emsskip; // param NOEMS } if(MML_CheckForEMS()) { MML_SetupEMS(gvar); // allocate space - //TODO: EMS4! AND EMS 3.2 MASSIVE DATA HANDLMENT! + //16_PM: EMS4! AND EMS 3.2 MASSIVE DATA HANDLMENT! MML_UseSpace(gvar->mm.EMSPageFrame,(MAPPAGES)*0x4000lu, gvar); //if(gvar->pm.emm.EMSVer<0x40) MM_MapEMS(gvar); // map in used pages @@ -878,36 +855,22 @@ void MM_Startup(global_game_variables_t *gvar) emsskip: gvar->mmi.XMSmem = 0; goto xmsskip;//0000 - for(i = 1;i < -#ifdef __WATCOMC__ - __argc -#endif -#ifdef __BORLANDC__ - _argc -#endif - ;i++) + for(i = 1;i < _argc;i++) { - if(US_CheckParm( -#ifdef __WATCOMC__ - __argv[i] -#endif -#ifdef __BORLANDC__ - _argv[i] -#endif - ,ParmStringsexmm) == 0) + if(US_CheckParm( _argv[i],ParmStringsexmm) == 0) goto xmsskip; // param NOXMS } - if(MML_CheckForXMS(gvar)) + if(MML_CheckForXMS()) { MML_SetupXMS(gvar); // allocate as many UMBs as possible } } +xmsskip: #endif // // allocate the misc buffer // -xmsskip: gvar->mm.mmrover = gvar->mm.mmhead; // start looking for space after low block MM_GetPtr(&(gvar->mm.bufferseg),BUFFERSIZE, gvar); @@ -937,14 +900,16 @@ void MM_Shutdown(global_game_variables_t *gvar) #ifdef __BORLANDC__ free(gvar->mm.nearheap);// printf(" near freed\n"); #endif +#ifndef __16_PM__ #ifdef __DEBUG__ - if(!debugpm) { + if(!dbg_debugpm) { #endif if(MML_CheckForEMS()){ MML_ShutdownEMS(gvar); }//printf(" EMS freed\n"); } - if(MML_CheckForXMS(gvar)){ MML_ShutdownXMS(gvar); }//printf(" XMS freed\n"); } + if(MML_CheckForXMS()){ MML_ShutdownXMS(gvar); }//printf(" XMS freed\n"); } #ifdef __DEBUG__ } #endif +#endif } //========================================================================== @@ -961,7 +926,6 @@ void MM_Shutdown(global_game_variables_t *gvar) void MM_GetPtr (memptr *baseptr, dword size, global_game_variables_t *gvar) { - //huge mmblocktype huge *scan,huge *lastscan,huge *endscan,huge *purge,huge *next; mmblocktype far *scan,far *lastscan,far *endscan,far *purge,far *next; int search; unsigned needed,startseg; @@ -979,7 +943,7 @@ void MM_GetPtr (memptr *baseptr, dword size, global_game_variables_t *gvar) printf(" *baseptr=%Fp ", *baseptr); printf("*useptr=%Fp\n", *(gvar->mm.mmnew->useptr)); printf(" &baseptr=%Fp ", &baseptr); printf("&useptr=%Fp\n", &(gvar->mm.mmnew->useptr)); #endif - //exit(-5); } + //Quit(gvar, "gvar->mm.mmnew->useptr==NULL"); } gvar->mm.mmnew->attributes = BASEATTRIBUTES; //tryagain: @@ -1058,9 +1022,7 @@ void MM_GetPtr (memptr *baseptr, dword size, global_game_variables_t *gvar) //heapdump(); #endif printf(OUT_OF_MEM_MSG,(size-gvar->mmi.nearheap)); - printf("for stability reasons the program will shut down! wwww\n"); - MM_Shutdown(gvar); - exit(-1); + Quit(gvar, "for stability reasons the program will shut down! wwww\n"); } else gvar->mm.mmerror = true; @@ -1080,7 +1042,6 @@ void MM_GetPtr (memptr *baseptr, dword size, global_game_variables_t *gvar) void MM_FreePtr(memptr *baseptr, global_game_variables_t *gvar) { - //huge mmblocktype huge *scan,huge *last; mmblocktype far *scan,far *last; last = gvar->mm.mmhead; @@ -1120,7 +1081,6 @@ void MM_FreePtr(memptr *baseptr, global_game_variables_t *gvar) void MM_SetPurge(memptr *baseptr, int purge, global_game_variables_t *gvar) { - //huge mmblocktype huge *start; mmblocktype far *start; start = gvar->mm.mmrover; @@ -1136,7 +1096,7 @@ void MM_SetPurge(memptr *baseptr, int purge, global_game_variables_t *gvar) gvar->mm.mmrover = gvar->mm.mmhead; else if(gvar->mm.mmrover == start) { - Quit("MM_SetPurge: Block not found!"); + Quit (gvar, "MM_SetPurge: Block not found!"); //return; } @@ -1160,7 +1120,6 @@ void MM_SetPurge(memptr *baseptr, int purge, global_game_variables_t *gvar) void MM_SetLock(memptr *baseptr, boolean locked, global_game_variables_t *gvar) { - //huge mmblocktype huge *start; mmblocktype far *start; start = gvar->mm.mmrover; @@ -1176,7 +1135,7 @@ void MM_SetLock(memptr *baseptr, boolean locked, global_game_variables_t *gvar) gvar->mm.mmrover = gvar->mm.mmhead; else if(gvar->mm.mmrover == start) { - Quit("MM_SetLock: Block not found!"); + Quit (gvar, "MM_SetLock: Block not found!"); //return; } @@ -1200,10 +1159,9 @@ void MM_SetLock(memptr *baseptr, boolean locked, global_game_variables_t *gvar) void MM_SortMem(global_game_variables_t *gvar) { - //huge mmblocktype huge *scan,huge *last,huge *next; mmblocktype far *scan,far *last,far *next; - unsigned start,length,source,dest,oldborder; - int playing; + unsigned start,length,source,dest;//++++,oldborder; + //++++int playing; // // lock down a currently playing sound @@ -1311,20 +1269,19 @@ void MM_SortMem(global_game_variables_t *gvar) void MM_ShowMemory(global_game_variables_t *gvar) { - //huge mmblocktype huge *scan; mmblocktype far *scan; - word temp; + //word temp; sdword end,owner; //word chx,chy; word w; //dword wwww; - byte scratch[160],scratch0[4096],scratch1[160],str[16]; + byte scratch[160],scratch0[4096],str[16];//[[[[scratch1[160], //byte d = '#'; -//**** VW_SetDefaultColors(); -//**** VW_SetLineWidth(40); +//[[[[ VW_SetDefaultColors(); +//[[[[ VW_SetLineWidth(40); //++++mh temp = bufferofs; //++++mh bufferofs = 0; -//**** VW_SetScreen (0,0); +//[[[[ VW_SetScreen (0,0); scan = gvar->mm.mmhead; end = -1; @@ -1474,7 +1431,6 @@ void MM_ShowMemory(global_game_variables_t *gvar) void MM_DumpData(global_game_variables_t *gvar) { - //huge mmblocktype huge *scan,huge *best; mmblocktype far *scan,far *best; long lowest,oldlowest; word owner; @@ -1549,7 +1505,6 @@ void MM_DumpData(global_game_variables_t *gvar) dword MM_UnusedMemory(global_game_variables_t *gvar) { dword free; - //huge mmblocktype huge *scan; mmblocktype far *scan; free = 0; @@ -1581,7 +1536,6 @@ dword MM_UnusedMemory(global_game_variables_t *gvar) dword MM_TotalFree(global_game_variables_t *gvar) { dword free; - //huge mmblocktype huge *scan; mmblocktype far *scan; free = 0; @@ -1616,21 +1570,25 @@ void MM_Report_(global_game_variables_t *gvar) printf("========================================\n"); if(MML_CheckForEMS()) { - printf(" LIMEMS\n"); - printf(" EMM v%x.%x available\n", gvar->pm.emm.EMSVer>>4,gvar->pm.emm.EMSVer&0x0F); - printf(" totalEMSpages: %u ", gvar->pm.emm.totalEMSpages); printf("freeEMSpages: %u\n", gvar->pm.emm.freeEMSpages); - printf(" EMSPageFrame: %x\n", gvar->pm.emm.EMSPageFrame); + printf(" %cLIMEMS %u\n", 0xC9, gvar->pm.emm.EMSPresent); + printf(" %c%cEMM v%x.%x available\n", 0xC7, 0xC4, gvar->pm.emm.EMSVer>>4,gvar->pm.emm.EMSVer&0x0F); + printf(" %c%ctotalEMSpages: %u ", 0xC7, 0xC4, gvar->pm.emm.totalEMSpages); printf("freeEMSpages: %u\n", gvar->pm.emm.freeEMSpages); + printf(" %c%cEMSPageFrame: %04x\n", 0xC7, 0xC4, gvar->pm.emm.EMSPageFrame); + printf(" %c%cEMSmem: %lu\n", 0xD3, 0xC4, gvar->mmi.EMSmem); } - if(MML_CheckForXMS(gvar)) + if(MML_CheckForXMS()) { - printf(" XMS\n"); - printf(" XMSaddr: %X\n", *XMSaddr); + printf(" %cXMS %u\n", 0xC9, gvar->pm.xmm.XMSPresent); + printf(" %c%cXMS v%x.%x available\n", 0xC7, 0xC4, XMSVer>>8,XMSVer&0x0F); + printf(" %c%cXMSDriver: %Fp\n", 0xC7, 0xC4, XMSDriver); + printf(" %c%cXMSHandle: %04x\n", 0xC7, 0xC4, gvar->pm.xmm.XMSHandle); + printf(" %c%cXMSmem: %lu\n", 0xD3, 0xC4, gvar->mmi.XMSmem); } - printf("near: %lu ", gvar->mmi.nearheap); printf("far: %lu\n", gvar->mmi.farheap); if(MML_CheckForEMS()) - printf("EMSmem: %lu ", gvar->mmi.EMSmem); if(MML_CheckForXMS(gvar)) printf("XMSmem: %lu", gvar->mmi.XMSmem); printf("\n"); + printf(" %cConv. %u\n", 0xC9, gvar->pm.mm.MainPresent); DebugMemory_(gvar, 0); //printf("mainmem: %lu\n", gvar->mmi.mainmem); - printf("Total convmem: %lu ", gvar->mmi.mainmem); printf("TotalFree: %lu ", MM_TotalFree(gvar)+gvar->mmi.EMSmem+gvar->mmi.XMSmem+gvar->mmi.XMSmem); printf("TotalUsed: %lu\n", gvar->mmi.mainmem); - printf(" UnusedMemory: %lu\n", MM_UnusedMemory(gvar)); + //printf("Total convmem: %lu ", gvar->mmi.mainmem); printf("TotalFree: %lu ", MM_TotalFree(gvar)+gvar->mmi.EMSmem+gvar->mmi.XMSmem+gvar->mmi.XMSmem); printf("TotalUsed: %lu\n", gvar->mmi.mainmem); + //printf(" UnusedMemory: %lu\n", MM_UnusedMemory(gvar)); + printf("nearheap: %lu ", gvar->mmi.nearheap); printf("farheap: %lu\n", gvar->mmi.farheap); } //========================================================================== @@ -1800,6 +1758,15 @@ void MM_FreeBlock(mmblocktype *x, global_game_variables_t *gvar) gvar->mm.mmfree=x; }*/ +void xms_call(byte v, global_game_variables_t *gvar) +{ + dword XMSDriver = gvar->pm.xmm.XMSDriver; + __asm { + mov ah,[v] + call [DWORD PTR XMSDriver] + } +} + /*void MM_seguin(void) { __asm {