X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_mm.c;h=b6636ddff4aa36cda45bda35902667a50461c32a;hb=767a51ba929d4110350572d014665644fa2288d5;hp=f2392b6acd26f61825c1abda6d776870cbbfbf1e;hpb=aa074e927a76160b8a861471713931db2b5968d0;p=16.git diff --git a/src/lib/16_mm.c b/src/lib/16_mm.c index f2392b6a..b6636ddf 100755 --- a/src/lib/16_mm.c +++ b/src/lib/16_mm.c @@ -32,7 +32,7 @@ Primary coder: John Carmack RELIES ON --------- -Quit (global_game_variables_t *gvar, char *error) function +Quit (gvar, global_game_variables_t *gvar, char *error) function WORK TO DO @@ -58,7 +58,6 @@ Open Watcom port by sparky4 #pragma warn -pro #pragma warn -use - /* ============================================================================= @@ -67,10 +66,10 @@ Open Watcom port by sparky4 ============================================================================= */ -//#define LOCKBIT 0x80 // if set in attributes, block cannot be moved -//#define PURGEBITS 3 // 0-3 level, 0= unpurgable, 3= purge first -//#define PURGEMASK 0xfffc -//#define BASEATTRIBUTES 0 // unlocked, non purgable +#define LOCKBIT 0x80 // if set in attributes, block cannot be moved +#define PURGEBITS 3 // 0-3 level, 0= unpurgable, 3= purge first +#define PURGEMASK 0xfffc +#define BASEATTRIBUTES 0 // unlocked, non purgable //#define MAXUMBS 10 @@ -86,9 +85,9 @@ Open Watcom port by sparky4 //#define GETNEWBLOCK {if(!(mmnew=mmfree))Quit("MM_GETNEWBLOCK: No free blocks!") ;mmfree=mmfree->next;} // -//#define GETNEWBLOCK {if(!gvar->mm.mmfree)MML_ClearBlock(gvar);gvar->mm.mmnew=gvar->mm.mmfree;gvar->mm.mmfree=gvar->mm.mmfree->next;} +#define GETNEWBLOCK {if(!gvar->mm.mmfree)MML_ClearBlock(gvar);gvar->mm.mmnew=gvar->mm.mmfree;gvar->mm.mmfree=gvar->mm.mmfree->next;} -//#define FREEBLOCK(x) {*x->useptr=NULL;x->next=gvar->mm.mmfree;gvar->mm.mmfree=x;} +#define FREEBLOCK(x) {*x->useptr=NULL;x->next=gvar->mm.mmfree;gvar->mm.mmfree=x;} /* ============================================================================= @@ -621,7 +620,7 @@ getmemory: } #endif // printf("base=%u ", base); printf("size=%u\n", size); - MML_UseSpace (base,size, gvar); + MML_UseSpace(base,size, gvar); gvar->mmi.XMSmem += size*16; gvar->mm.UMBbase[gvar->mm.numUMBs] = base; gvar->mm.numUMBs++; @@ -680,7 +679,7 @@ void MML_ShutdownXMS(global_game_variables_t *gvar) { scan->blob=segm; - //MML_UseSpace (segstart, seglength, gvar); + //MML_UseSpace(segstart, seglength, gvar); printf("MML_UseSpace: Segment spans two blocks!\n"); //} @@ -695,10 +694,10 @@ void MML_ShutdownXMS(global_game_variables_t *gvar) } //++++todo: linked list of segment! */ -void MML_UseSpace (word segstart, word seglength, global_game_variables_t *gvar) +void MML_UseSpace (unsigned segstart, unsigned seglength, global_game_variables_t *gvar) { mmblocktype far *scan,far *last; - word oldend; + unsigned oldend; sdword extra; //word segm=1; @@ -744,7 +743,7 @@ void MML_UseSpace (word segstart, word seglength, global_game_variables_t *gvar) //return; } #else - Quit ("MML_UseSpace: Segment spans two blocks!"); + Quit (gvar, "MML_UseSpace: Segment spans two blocks!"); #endif if (segstart == scan->start) @@ -820,14 +819,13 @@ void MM_Startup (global_game_variables_t *gvar) int i; dword length; void far *start; - word segstart,seglength;//,endfree; + unsigned segstart,seglength;//,endfree; if(gvar->mm.mmstarted) MM_Shutdown (gvar); gvar->mm.mmstarted = true; gvar->mm.bombonerror = true; - // // set up the linked list (everything in the free list; // @@ -912,7 +910,7 @@ void MM_Startup (global_game_variables_t *gvar) { MML_SetupEMS(gvar); // allocate space //16_PM: EMS4! AND EMS 3.2 MASSIVE DATA HANDLMENT! - MML_UseSpace (gvar->mm.EMSPageFrame,(MAPPAGES)*0x4000lu, gvar); + MML_UseSpace(gvar->mm.EMSPageFrame,(MAPPAGES)*0x4000lu, gvar); //if(gvar->pm.emm.EMSVer<0x40) MM_MapEMS(gvar); // map in used pages //else @@ -1021,7 +1019,7 @@ void MM_GetPtr (memptr *baseptr,dword size, global_game_variables_t *gvar) } printf(" size is %lu\n", size); #endif - //Quit(gvar, "gvar->mm.mmnew->useptr==NULL"); } + //Quit (gvar, "gvar->mm.mmnew->useptr==NULL"); } //tryagain: for (search = 0; search<3; search++) @@ -1099,7 +1097,7 @@ void MM_GetPtr (memptr *baseptr,dword size, global_game_variables_t *gvar) //heapdump(); #endif printf(OUT_OF_MEM_MSG,(size-gvar->mmi.nearheap)); - Quit(gvar, "for stability reasons the program will shut down! wwww\n"); + Quit (gvar, "for stability reasons the program will shut down! wwww\n"); } else gvar->mm.mmerror = true; @@ -1127,13 +1125,13 @@ void MM_FreePtr (memptr *baseptr, global_game_variables_t *gvar) if (baseptr == gvar->mm.mmrover->useptr) // removed the last allocated block gvar->mm.mmrover = gvar->mm.mmhead; - while(scan->useptr != baseptr && scan) + while (scan->useptr != baseptr && scan) { last = scan; scan = scan->next; } - if(!scan) + if (!scan) Quit (gvar, "MM_FreePtr: Block not found!"); last->next = scan->next; @@ -1170,7 +1168,7 @@ void MM_SetPurge (memptr *baseptr, int purge, global_game_variables_t *gvar) else if (gvar->mm.mmrover == start) Quit (gvar, "MM_SetPurge: Block not found!"); - } while(1); + } while (1); gvar->mm.mmrover->attributes &= ~PURGEBITS; gvar->mm.mmrover->attributes |= purge; @@ -1245,7 +1243,7 @@ void MM_SortMem (global_game_variables_t *gvar) playing += STARTADLIBSOUNDS; break; } - MM_SetLock((memptr *)&audiosegs[playing],true); + MM_SetLock(MEMPTRCONV audiosegs[playing],true); } @@ -1253,16 +1251,16 @@ void MM_SortMem (global_game_variables_t *gvar) oldborder = gvar->video.bordercolor; gvar->video.bordercolor = modexPalOverscan(15); - if(beforesort) + if (beforesort) beforesort(); scan = gvar->mm.mmhead; last = NULL; // shut up compiler warning - while(scan) + while (scan) { - if(scan->attributes & LOCKBIT) + if (scan->attributes & LOCKBIT) { // // block is locked, so try to pile later blocks right after it @@ -1271,7 +1269,7 @@ void MM_SortMem (global_game_variables_t *gvar) } else { - if(scan->attributes & PURGEBITS) + if (scan->attributes & PURGEBITS) { // // throw out the purgable block @@ -1287,12 +1285,12 @@ void MM_SortMem (global_game_variables_t *gvar) // // push the non purgable block on top of the last moved block // - if(scan->start != start) + if (scan->start != start) { length = scan->length; source = scan->start; dest = start; - while(length > 0xf00) + while (length > 0xf00) { movedata(source,0,dest,0,0xf00*16); length -= 0xf00; @@ -1314,7 +1312,7 @@ void MM_SortMem (global_game_variables_t *gvar) gvar->mm.mmrover = gvar->mm.mmhead; - if(aftersort) + if (aftersort) aftersort(); VL_ColorBorder (oldborder, &gvar->video);