X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_mm.c;h=5f8bb38e47aea4972ccb5a68bf77bdc68ea60d30;hb=71fff90bbd895c10c83e339f93b3a579b50e595b;hp=3422903323d7482c274e7dd0f71053fdb583334d;hpb=a4d644c938b7c09f23cdbee5b42a3b524f781a41;p=16.git diff --git a/src/lib/16_mm.c b/src/lib/16_mm.c index 34229033..5f8bb38e 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 @@ -48,6 +48,7 @@ Open Watcom port by sparky4 */ #include "src/lib/16_mm.h" #include "src/lib/16_ca.h" +#include #pragma hdrstop #pragma warn -pro @@ -72,9 +73,9 @@ void (* XMSaddr) (void); // far pointer to XMS driver ============================================================================= */ - +#ifndef __16_PM__ static char *ParmStringsexmm[] = {"noems","noxms",""}; - +#endif /* ====================== = @@ -87,7 +88,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 @@ -285,7 +286,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 } /* @@ -439,6 +440,7 @@ byte MM_MapXEMS(global_game_variables_t *gvar) boolean MML_CheckForXMS(void) { + //numUMBs = 0; boolean errorflag=false; __asm { @@ -560,30 +562,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; - word segm=1; - word oldend; - dword segmlen; - dword extra; - - scan = last = gvar->mm.mmhead; - gvar->mm.mmrover = gvar->mm.mmhead; // reset rover to start of memory - -// -// search for the block that contains the range of segments -// - while(scan->start+scan->length < segstart) - { - last = scan; - scan = scan->next; - } - -// -// take the given range out of the block -// - oldend = scan->start + scan->length; +/* extra = oldend - (segstart+seglength); segmlen=extra; @@ -608,28 +587,7 @@ void MML_ShutdownXMS(global_game_variables_t *gvar) printf("segmlen=%lu\n", segmlen); } //++++todo: linked list of segment! - if(segstart == scan->start) - { - last->next = scan->next; // unlink block - FREEBLOCK(scan); - scan = last; - } - else - scan->length = segstart-scan->start; // shorten block - - if(extra > 0) - { - GETNEWBLOCK; - gvar->mm.mmnew->useptr = NULL; - - gvar->mm.mmnew->next = scan->next; - scan->next = gvar->mm.mmnew; - gvar->mm.mmnew->start = segstart+seglength; - gvar->mm.mmnew->length = extra; - gvar->mm.mmnew->attributes = LOCKBIT; - }//else if(segm>0) goto segu; - -}*/ +*/ void MML_UseSpace(word segstart, dword seglength, global_game_variables_t *gvar) { mmblocktype far *scan,far *last; @@ -697,7 +655,7 @@ void MML_UseSpace(word segstart, dword seglength, global_game_variables_t *gvar) gvar->mm.mmnew->start = segstart+seglength; gvar->mm.mmnew->length = extra; gvar->mm.mmnew->attributes = LOCKBIT; - } + }//else if(segm>0) goto segu; } @@ -715,8 +673,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; @@ -752,10 +709,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); @@ -769,9 +724,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; // @@ -783,82 +736,64 @@ 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 + length=(word)_memavl();//(word)coreleft(); + //start = gvar->mm.nearheap = _fmalloc(length); +#ifdef __WATCOMC__ + 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); length -= SAVENEARHEAP; seglength = length / 16; // now in paragraphs segstart = FP_SEG(start)+(FP_OFF(start)+15)/16; MML_UseSpace(segstart,seglength, gvar); gvar->mmi.nearheap = length; - //printf("start=%Fp segstart=%x seglen=%lu len=%lu\n", start, segstart, seglength, length); + //0000printf("near: start=%Fp segstart=%x seglen=%lu len=%lu\n", start, segstart, (dword)seglength, length); // // get all available far conventional memory segments // - //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; +// printf("farcoreleft() %lu\n", farcoreleft()); +// printf("(farcoreleft()+32)-_FCORELEFT %d\n", (sword)((farcoreleft()+32)-_FCORELEFT)); #endif - start = gvar->mm.farheap = _fmalloc(length); - //start = gvar->mm.farheap = halloc(length, 1); + length=_FCORELEFT; + start = gvar->mm.farheap = _fmalloc(length);//start = gvar->mm.farheap = halloc(length, 1); + length -= 16-(FP_OFF(start)&15); length -= SAVEFARHEAP; seglength = length / 16; // now in paragraphs segstart = FP_SEG(start)+(FP_OFF(start)+15)/16; MML_UseSpace(segstart,seglength, gvar); gvar->mmi.farheap = length; - //printf("start=%Fp segstart=%x seglen=%lu len=%lu\n", start, segstart, seglength, length); + //0000printf("far: start=%Fp segstart=%x seglen=%lu len=%lu\n", start, segstart, (dword)seglength, length); gvar->mmi.mainmem = gvar->mmi.nearheap + gvar->mmi.farheap; -#ifndef __16_PM__ +#if !defined(__16_PM__)// && defined(__WATCOMC__) 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()) @@ -878,23 +813,9 @@ 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()) @@ -963,7 +884,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; @@ -975,13 +895,15 @@ void MM_GetPtr (memptr *baseptr, dword size, global_game_variables_t *gvar) gvar->mm.mmnew->useptr = baseptr; //if(gvar->mm.mmnew->useptr==NULL){ #ifdef __DEBUG_MM__ + if(dbg_debugmm>0){ printf("MM_GetPtr\n"); //%04x printf(" baseptr=%Fp ", baseptr); printf("useptr=%Fp\n", gvar->mm.mmnew->useptr); 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: @@ -1060,9 +982,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; @@ -1082,7 +1002,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; @@ -1099,8 +1018,8 @@ void MM_FreePtr(memptr *baseptr, global_game_variables_t *gvar) if(!scan) { - printf("MM_FreePtr: Block not found!\n"); - return; + Quit(gvar, "MM_FreePtr: Block not found!\n"); + //printf("MM_FreePtr: Block not found!\n"); return; } last->next = scan->next; @@ -1122,7 +1041,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; @@ -1138,7 +1056,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; } @@ -1162,7 +1080,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; @@ -1178,7 +1095,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; } @@ -1202,10 +1119,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 @@ -1313,20 +1229,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; @@ -1476,14 +1391,18 @@ 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; byte lock,purge; FILE *dumpfile; +#ifdef __WATCOMC__ + _nfree(gvar->mm.nearheap); +#endif +#ifdef __BORLANDC__ free(gvar->mm.nearheap); +#endif #ifdef __BORLANDC__ dumpfile = fopen ("mmdump.16b","w"); #endif @@ -1551,7 +1470,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; @@ -1583,7 +1501,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;