X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_mm.c;h=7fe1110df998e96ff457d5f9151c402236623881;hb=ce3c236194323bcbc331bad4a059ea95fb6c7947;hp=f2392b6acd26f61825c1abda6d776870cbbfbf1e;hpb=aa074e927a76160b8a861471713931db2b5968d0;p=16.git diff --git a/src/lib/16_mm.c b/src/lib/16_mm.c index f2392b6a..7fe1110d 100755 --- a/src/lib/16_mm.c +++ b/src/lib/16_mm.c @@ -58,38 +58,6 @@ Open Watcom port by sparky4 #pragma warn -pro #pragma warn -use - -/* -============================================================================= - - LOCAL INFO - -============================================================================= -*/ - -//#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 - -/*typedef struct mmblockstruct -{ - unsigned start,length; - unsigned attributes; - memptr *useptr; // pointer to the segment start - struct mmblockstruct far *next; -} mmblocktype;*/ - - -//#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 FREEBLOCK(x) {*x->useptr=NULL;x->next=gvar->mm.mmfree;gvar->mm.mmfree=x;} - /* ============================================================================= @@ -98,12 +66,9 @@ Open Watcom port by sparky4 ============================================================================= */ -/*mminfotype mminfo; -memptr bufferseg; -boolean mmerror;*/ - void (* beforesort) (void); void (* aftersort) (void); +void (* XMSaddr) (void); // far pointer to XMS driver /* ============================================================================= @@ -112,38 +77,6 @@ void (* aftersort) (void); ============================================================================= */ - -/*boolean mmstarted; - -void far *farheap; -void *nearheap; - -mmblocktype far mmblocks[MAXBLOCKS] - ,far *mmhead,far *mmfree,far *mmrover,far *mmnew; - -boolean bombonerror;*/ - -//unsigned totalEMSpages,freeEMSpages,EMSpageframe,EMSpagesmapped,EMShandle; - -void (* XMSaddr) (void); // far pointer to XMS driver - -/*unsigned numUMBs,UMBbase[MAXUMBS];*/ - -//========================================================================== - -// -// local prototypes -// - -boolean MML_CheckForEMS (void); -void MML_ShutdownEMS (void); -void MM_MapEMS (void); -boolean MML_CheckForXMS (void); -void MML_ShutdownXMS (void); -//void MML_UseSpace (unsigned segstart, unsigned seglength); -//void MML_ClearBlock (void); - -//========================================================================== #ifndef __16_PM__ #if 0 static char *ParmStringsexmm[] = {"noems","noxms",""}; @@ -621,7 +554,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 +613,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,7 +628,7 @@ 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(word segstart, dword seglength, global_game_variables_t *gvar) { mmblocktype far *scan,far *last; word oldend; @@ -727,9 +660,8 @@ void MML_UseSpace (word segstart, word seglength, global_game_variables_t *gvar) // take the given range out of the block // oldend = scan->start + scan->length; - extra = oldend - (segstart+seglength); + extra = oldend - (segstart+((unsigned)seglength)); if (extra < 0) -#ifdef __DEBUG_MM__ { printf("========================================\n"); printf("start=%x ", scan->start); @@ -743,9 +675,6 @@ void MML_UseSpace (word segstart, word seglength, global_game_variables_t *gvar) printf("========================================\n"); //return; } -#else - Quit ("MML_UseSpace: Segment spans two blocks!"); -#endif if (segstart == scan->start) { @@ -782,7 +711,7 @@ void MML_UseSpace (word segstart, word seglength, global_game_variables_t *gvar) ==================== */ -void MML_ClearBlock (global_game_variables_t *gvar) +void MML_ClearBlock(global_game_variables_t *gvar) { mmblocktype far *scan;//,far *last; @@ -798,7 +727,7 @@ void MML_ClearBlock (global_game_variables_t *gvar) scan = scan->next; } - Quit (gvar, "MM_ClearBlock: No purgable blocks!\n"); + printf("MM_ClearBlock: No purgable blocks!\n"); } @@ -815,15 +744,16 @@ void MML_ClearBlock (global_game_variables_t *gvar) =================== */ -void MM_Startup (global_game_variables_t *gvar) +void MM_Startup(global_game_variables_t *gvar) { int i; - dword length; + //dword length,seglength; + dword length; word seglength; void far *start; - word segstart,seglength;//,endfree; + word segstart;//,endfree; if(gvar->mm.mmstarted) - MM_Shutdown (gvar); + MM_Shutdown(gvar); gvar->mm.mmstarted = true; gvar->mm.bombonerror = true; @@ -833,7 +763,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; @@ -848,7 +778,6 @@ void MM_Startup (global_game_variables_t *gvar) gvar->mm.mmnew->next = NULL; gvar->mm.mmrover = gvar->mm.mmhead; - // // get all available near conventional memory segments // @@ -868,7 +797,7 @@ void MM_Startup (global_game_variables_t *gvar) length -= SAVENEARHEAP; seglength = length / 16; // now in paragraphs segstart = FP_SEG(start)+(FP_OFF(start)+15)/16; - MML_UseSpace (segstart,seglength, gvar); + MML_UseSpace(segstart,seglength, gvar); gvar->mmi.nearheap = length; //0000printf("near: start=%Fp segstart=%x seglen=%lu len=%lu\n", start, segstart, (dword)seglength, length); @@ -889,7 +818,7 @@ void MM_Startup (global_game_variables_t *gvar) length -= SAVEFARHEAP; seglength = length / 16; // now in paragraphs segstart = FP_SEG(start)+(FP_OFF(start)+15)/16; - MML_UseSpace (segstart,seglength, gvar); + MML_UseSpace(segstart,seglength, gvar); gvar->mmi.farheap = length; //0000printf("far: start=%Fp segstart=%x seglen=%lu len=%lu\n", start, segstart, (dword)seglength, length); @@ -912,7 +841,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 @@ -944,7 +873,7 @@ xmsskip: // gvar->mm.mmrover = gvar->mm.mmhead; // start looking for space after low block - MM_GetPtr (&(gvar->mm.bufferseg),BUFFERSIZE, gvar); + MM_GetPtr(&(gvar->mm.bufferseg),BUFFERSIZE, gvar); } //========================================================================== @@ -959,7 +888,7 @@ xmsskip: ==================== */ -void MM_Shutdown (global_game_variables_t *gvar) +void MM_Shutdown(global_game_variables_t *gvar) { if(!(gvar->mm.mmstarted)) return; @@ -997,10 +926,10 @@ void MM_Shutdown (global_game_variables_t *gvar) ==================== */ -void MM_GetPtr (memptr *baseptr,dword size, global_game_variables_t *gvar) +void MM_GetPtr (memptr *baseptr, dword size, global_game_variables_t *gvar) { mmblocktype far *scan,far *lastscan,far *endscan - ,far *purge,far *next; + ,far *purge,far *next; int search; unsigned needed,startseg; @@ -1009,19 +938,18 @@ void MM_GetPtr (memptr *baseptr,dword size, global_game_variables_t *gvar) GETNEWBLOCK; // fill in start and next after a spot is found gvar->mm.mmnew->length = needed; gvar->mm.mmnew->useptr = baseptr; - gvar->mm.mmnew->attributes = BASEATTRIBUTES; //if(gvar->mm.mmnew->useptr==NULL){ #ifdef __DEBUG_MM__ - printf("MM_GetPtr\n"); 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)); } - printf(" size is %lu\n", size); #endif //Quit(gvar, "gvar->mm.mmnew->useptr==NULL"); } + gvar->mm.mmnew->attributes = BASEATTRIBUTES; //tryagain: for (search = 0; search<3; search++)