X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_mm.c;h=5f8bb38e47aea4972ccb5a68bf77bdc68ea60d30;hb=71fff90bbd895c10c83e339f93b3a579b50e595b;hp=add7707e00435baa7ec00aeff435932b5a90ef57;hpb=ecd709958227c333978aae2f21f7d96797bfd015;p=16.git diff --git a/src/lib/16_mm.c b/src/lib/16_mm.c index add7707e..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 @@ -140,7 +141,7 @@ boolean MML_CheckForEMS(void) return(emmcfems); } - +#ifndef __16_PM__ /* ====================== = @@ -149,7 +150,7 @@ boolean MML_CheckForEMS(void) ======================= */ -byte MML_SetupEMS(mminfo_t *mm) +byte MML_SetupEMS(global_game_variables_t *gvar) { byte str[160]; byte err; @@ -157,8 +158,8 @@ byte MML_SetupEMS(mminfo_t *mm) unsigned int EMSVer = 0; //byte EMS_status; - unsigned totalEMSpages,freeEMSpages,EMSpageframe,EMSpagesmapped,EMShandle; - totalEMSpages = freeEMSpages = EMSpageframe = EMSpagesmapped = 0; + unsigned totalEMSpages,freeEMSpages,EMSPageFrame,EMSpagesmapped,EMSHandle; + totalEMSpages = freeEMSpages = EMSPageFrame = EMSpagesmapped = 0; __asm { mov ah,EMS_STATUS @@ -179,7 +180,7 @@ byte MML_SetupEMS(mminfo_t *mm) int EMS_INT // find the page frame address or ah,ah jnz error - mov [EMSpageframe],bx + mov [EMSPageFrame],bx mov ah,EMS_GETPAGES int EMS_INT // find out how much EMS is there @@ -218,7 +219,7 @@ byte MML_SetupEMS(mminfo_t *mm) int EMS_INT or ah,ah jnz error - mov [EMShandle],dx + mov [EMSHandle],dx jmp End #ifdef __BORLANDC__ } @@ -245,12 +246,12 @@ End: printf("%s\n",str); return err; } - mm->totalEMSpages=totalEMSpages; - mm->freeEMSpages=freeEMSpages; - mm->EMSpageframe=EMSpageframe; - mm->EMSpagesmapped=EMSpagesmapped; - mm->EMShandle=EMShandle; - mm->EMSVer=EMSVer; + gvar->mm.totalEMSpages=totalEMSpages; + gvar->mm.freeEMSpages=freeEMSpages; + gvar->mm.EMSPageFrame=EMSPageFrame; + gvar->mm.EMSpagesmapped=EMSpagesmapped; + gvar->mm.EMSHandle=EMSHandle; + gvar->mm.EMSVer=EMSVer; return 0; } @@ -263,16 +264,16 @@ End: ======================= */ -void MML_ShutdownEMS(mminfo_t *mm) +void MML_ShutdownEMS(global_game_variables_t *gvar) { boolean errorflag=false; - unsigned EMShandle=mm->EMShandle; + unsigned EMSHandle=gvar->mm.EMSHandle; - if(!EMShandle) + if(!EMSHandle) return; __asm { mov ah,EMS_FREEPAGES - mov dx,[EMShandle] + mov dx,[EMSHandle] int EMS_INT or ah,ah jz ok @@ -284,7 +285,8 @@ void MML_ShutdownEMS(mminfo_t *mm) #ifdef __WATCOMC__ } #endif - if(errorflag==true) printf("MML_ShutdownEMS: Error freeing EMS!\n"); //++++ add something + if(errorflag==true) + Quit (gvar, "MML_ShutdownEMS: Error freeing EMS!\n"); //++++ add something } /* @@ -299,14 +301,14 @@ void MML_ShutdownEMS(mminfo_t *mm) ==================== */ -byte MM_MapEMS(mminfo_t *mm, mminfotype *mmi) +byte MM_MapEMS(global_game_variables_t *gvar) { byte str[160]; - unsigned EMShandle; + unsigned EMSHandle; byte err; boolean errorflag=false; int i; - EMShandle=mm->EMShandle; + EMSHandle=gvar->mm.EMSHandle; for (i=0;i<4/*MAPPAGES*/;i++) { @@ -314,7 +316,7 @@ byte MM_MapEMS(mminfo_t *mm, mminfotype *mmi) mov ah,EMS_MAPPAGE mov bx,[i] // logical page mov al,bl // physical page - mov dx,[EMShandle] // handle + mov dx,[EMSHandle] // handle int EMS_INT or ah,ah jnz error @@ -343,12 +345,11 @@ byte MM_MapEMS(mminfo_t *mm, mminfotype *mmi) return err; } } - mmi->EMSmem = (i)*0x4000lu; - //printf(" mmi->EMSmem=%lu\n", mmi->EMSmem); + gvar->mmi.EMSmem = (i)*0x4000lu; return 0; } -byte MM_MapXEMS(mminfo_t *mm, mminfotype *mmi) +byte MM_MapXEMS(global_game_variables_t *gvar) { //SUB EMS.MapXPages (PhysicalStart, LogicalStart, NumPages, Handle) @@ -374,12 +375,12 @@ byte MM_MapXEMS(mminfo_t *mm, mminfotype *mmi) //END SUB byte str[160]; byte err; - word EMShandle; + word EMSHandle; boolean errorflag=false; int i; - EMShandle=mm->EMShandle; + EMSHandle=gvar->mm.EMSHandle; - if(mm->EMSVer<0x40) + if(gvar->mm.EMSVer<0x40) return 5; for (i=0;iEMSmem = (i)*0x4000lu; + gvar->mmi.EMSmem = (i)*0x4000lu; return 0; } - +#endif //========================================================================== /* @@ -437,10 +438,10 @@ byte MM_MapXEMS(mminfo_t *mm, mminfotype *mmi) ======================= */ -boolean MML_CheckForXMS(mminfo_t *mm) +boolean MML_CheckForXMS(void) { + //numUMBs = 0; boolean errorflag=false; - mm->numUMBs = 0; __asm { mov ax,0x4300 @@ -459,7 +460,7 @@ boolean MML_CheckForXMS(mminfo_t *mm) else return true; } - +#ifndef __16_PM__ /* ====================== = @@ -470,7 +471,7 @@ boolean MML_CheckForXMS(mminfo_t *mm) ======================= */ -void MML_SetupXMS(mminfo_t *mm, mminfotype *mmi) +void MML_SetupXMS(global_game_variables_t *gvar) { word base,size; @@ -514,11 +515,11 @@ getmemory: } #endif // printf("base=%u ", base); printf("size=%u\n", size); - MML_UseSpace(base,size, mm); - mmi->XMSmem += size*16; - mm->UMBbase[mm->numUMBs] = base; - mm->numUMBs++; - if(mm->numUMBs < MAXUMBS) + MML_UseSpace(base,size, gvar); + gvar->mmi.XMSmem += size*16; + gvar->mm.UMBbase[gvar->mm.numUMBs] = base; + gvar->mm.numUMBs++; + if(gvar->mm.numUMBs < MAXUMBS) goto getmemory; } @@ -531,14 +532,14 @@ getmemory: ====================== */ -void MML_ShutdownXMS(mminfo_t *mm) +void MML_ShutdownXMS(global_game_variables_t *gvar) { int i; unsigned base; - for (i=0;inumUMBs;i++) + for (i=0;imm.numUMBs;i++) { - base = mm->UMBbase[i]; + base = gvar->mm.UMBbase[i]; __asm { mov ah,XMS_FREEUMB mov dx,[base] @@ -546,7 +547,7 @@ void MML_ShutdownXMS(mminfo_t *mm) } } } - +#endif //========================================================================== /* @@ -561,30 +562,7 @@ void MML_ShutdownXMS(mminfo_t *mm) ====================== */ -/*void MML_UseSpace(word segstart, dword seglength, mminfo_t *mm) -{ - //huge mmblocktype huge *scan,huge *last; - word segm=1; - word oldend; - dword segmlen; - dword extra; - - scan = last = mm->mmhead; - mm->mmrover = 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; @@ -595,7 +573,7 @@ void MML_ShutdownXMS(mminfo_t *mm) { scan->blob=segm; - //MML_UseSpace(segstart, seglength, mm); + //MML_UseSpace(segstart, seglength, gvar); printf("MML_UseSpace: Segment spans two blocks!\n"); //} @@ -609,37 +587,16 @@ void MML_ShutdownXMS(mminfo_t *mm) 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; - mm->mmnew->useptr = NULL; - - mm->mmnew->next = scan->next; - scan->next = mm->mmnew; - mm->mmnew->start = segstart+seglength; - mm->mmnew->length = extra; - mm->mmnew->attributes = LOCKBIT; - }//else if(segm>0) goto segu; - -}*/ -void MML_UseSpace(word segstart, dword seglength, mminfo_t *mm) +*/ +void MML_UseSpace(word segstart, dword seglength, global_game_variables_t *gvar) { mmblocktype far *scan,far *last; word oldend; sdword extra; //word segm=1; - scan = last = mm->mmhead; - mm->mmrover = mm->mmhead; // reset rover to start of memory + 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 @@ -691,14 +648,14 @@ void MML_UseSpace(word segstart, dword seglength, mminfo_t *mm) if (extra > 0) { GETNEWBLOCK; - mm->mmnew->useptr = NULL; + gvar->mm.mmnew->useptr = NULL; - mm->mmnew->next = scan->next; - scan->next = mm->mmnew; - mm->mmnew->start = segstart+seglength; - mm->mmnew->length = extra; - mm->mmnew->attributes = LOCKBIT; - } + 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; } @@ -714,18 +671,17 @@ void MML_UseSpace(word segstart, dword seglength, mminfo_t *mm) ==================== */ -void MML_ClearBlock(mminfo_t *mm) +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 = mm->mmhead->next; + scan = gvar->mm.mmhead->next; while(scan) { if(!(scan->attributes&LOCKBIT) && (scan->attributes&PURGEBITS)) { - MM_FreePtr(scan->useptr, mm); + MM_FreePtr(scan->useptr, gvar); return; } scan = scan->next; @@ -748,165 +704,134 @@ void MML_ClearBlock(mminfo_t *mm) =================== */ -void MM_Startup(mminfo_t *mm, mminfotype *mmi) +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(mm->mmstarted) -// MM_Shutdown(mm); + if(gvar->mm.mmstarted) + MM_Shutdown(gvar); - mm->mmstarted = true; - mm->bombonerror = true; + gvar->mm.mmstarted = true; + gvar->mm.bombonerror = true; // // set up the linked list (everything in the free list; // - mm->mmhead = NULL; - mm->mmfree = &(mm->mmblocks[0]); + gvar->mm.mmhead = NULL; + gvar->mm.mmfree = &(gvar->mm.mmblocks[0]); for(i=0;immblocks[i].next = &(mm->mmblocks[i+1]); - } - mm->mmblocks[i].next = NULL; + gvar->mm.mmblocks[i].next = &(gvar->mm.mmblocks[i+1]); + gvar->mm.mmblocks[i].next = NULL; // // locked block of all memory until we punch out free space // GETNEWBLOCK; - mm->mmhead = mm->mmnew; // this will allways be the first node - mm->mmnew->start = 0; - mm->mmnew->length = 0xffff; - mm->mmnew->attributes = LOCKBIT; - mm->mmnew->next = NULL; - //mm->mmnew->useptr = peeonself; - mm->mmrover = mm->mmhead; - - //printf(" %x\n", peeonself); - //printf(" %x\n", *peeonself); + gvar->mm.mmhead = gvar->mm.mmnew; // this will allways be the first node + gvar->mm.mmnew->start = 0; + gvar->mm.mmnew->length = 0xffff; + gvar->mm.mmnew->attributes = LOCKBIT; + gvar->mm.mmnew->next = NULL; + gvar->mm.mmrover = gvar->mm.mmhead; + // // get all available near conventional memory segments // #ifdef __WATCOMC__ _nheapgrow(); - length=(dword)_memavl();//(dword)GetFreeSize(); - //huge start = (void huge *)(mm->nearheap = _nmalloc(length)); - start = (void far *)(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 *)(mm->nearheap = malloc(length)); - start = (void far *)(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, mm); - mmi->nearheap = length; - //printf("start=%Fp segstart=%x seglen=%lu len=%lu\n", start, segstart, seglength, length); + 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); // // get all available far conventional memory segments // - //printf("_FARCORELEFT %lu\n", _FCORELEFT); #ifdef __WATCOMC__ _fheapgrow(); #endif #ifdef __BORLANDC__ - printf("farcoreleft() %lu\n", farcoreleft()); - printf("(farcoreleft()+32)-_FCORELEFT %d\n", (sword)((farcoreleft()+32)-_FCORELEFT)); +// printf("farcoreleft() %lu\n", farcoreleft()); +// printf("(farcoreleft()+32)-_FCORELEFT %d\n", (sword)((farcoreleft()+32)-_FCORELEFT)); #endif - length=_FCORELEFT;//_fcoreleft();//(dword)GetFarFreeSize();//0xffffUL*4UL; - start = mm->farheap = _fmalloc(length); - //start = 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, mm); - mmi->farheap = length; - //printf("start=%Fp segstart=%x seglen=%lu len=%lu\n", start, segstart, seglength, length); + 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); - mmi->mainmem = mmi->nearheap + mmi->farheap; + gvar->mmi.mainmem = gvar->mmi.nearheap + gvar->mmi.farheap; +#if !defined(__16_PM__)// && defined(__WATCOMC__) + if(!dbg_debugpm) { // // detect EMS and allocate up to 64K at page frame // - mmi->EMSmem = 0; + 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(mm); // allocate space - //TODO: EMS4! AND EMS 3.2 MASSIVE DATA HANDLMENT! - MML_UseSpace(mm->EMSpageframe,(MAPPAGES)*0x4000lu, mm); - //if(mm->EMSVer<0x40) - MM_MapEMS(mm, mmi); // map in used pages + MML_SetupEMS(gvar); // allocate space + //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 //else - //MM_MapXEMS(mm, mmi); // map in used pages + //MM_MapXEMS(gvar); // map in used pages } // // detect XMS and get upper memory blocks // emsskip: - mmi->XMSmem = 0; + 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(mm)) + if(MML_CheckForXMS()) { - MML_SetupXMS(mm, mmi); // allocate as many UMBs as possible + MML_SetupXMS(gvar); // allocate as many UMBs as possible } + } +xmsskip: +#endif // // allocate the misc buffer // -xmsskip: - mm->mmrover = mm->mmhead; // start looking for space after low block + gvar->mm.mmrover = gvar->mm.mmhead; // start looking for space after low block - MM_GetPtr(&(mm->bufferseg),BUFFERSIZE, mm, mmi); + MM_GetPtr(&(gvar->mm.bufferseg),BUFFERSIZE, gvar); } //========================================================================== @@ -921,20 +846,28 @@ xmsskip: ==================== */ -void MM_Shutdown(mminfo_t *mm) +void MM_Shutdown(global_game_variables_t *gvar) { - if(!(mm->mmstarted)) + if(!(gvar->mm.mmstarted)) return; - _ffree(mm->farheap);// printf(" far freed\n"); + _ffree(gvar->mm.farheap);// printf(" far freed\n"); #ifdef __WATCOMC__ - _nfree(mm->nearheap);// printf(" near freed\n"); + _nfree(gvar->mm.nearheap);// printf(" near freed\n"); #endif #ifdef __BORLANDC__ - free(mm->nearheap);// printf(" near freed\n"); + free(gvar->mm.nearheap);// printf(" near freed\n"); +#endif +#ifndef __16_PM__ +#ifdef __DEBUG__ + if(!dbg_debugpm) { +#endif + if(MML_CheckForEMS()){ MML_ShutdownEMS(gvar); }//printf(" EMS freed\n"); } + if(MML_CheckForXMS()){ MML_ShutdownXMS(gvar); }//printf(" XMS freed\n"); } +#ifdef __DEBUG__ + } +#endif #endif - if(MML_CheckForEMS()){ MML_ShutdownEMS(mm); }//printf(" EMS freed\n"); } - if(MML_CheckForXMS(mm)){ MML_ShutdownXMS(mm); }//printf(" XMS freed\n"); } } //========================================================================== @@ -949,9 +882,8 @@ void MM_Shutdown(mminfo_t *mm) ==================== */ -void MM_GetPtr (memptr *baseptr, dword size, mminfo_t *mm, mminfotype *mmi) +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; @@ -959,16 +891,20 @@ void MM_GetPtr (memptr *baseptr, dword size, mminfo_t *mm, mminfotype *mmi) needed = (size+15)/16; // convert size from bytes to paragraphs GETNEWBLOCK; // fill in start and next after a spot is found - mm->mmnew->length = needed; - mm->mmnew->useptr = baseptr; - //if(mm->mmnew->useptr==NULL){ -#ifdef __DEBUG__ - printf("baseptr=%04x ", baseptr); printf("useptr=%04x\n", mm->mmnew->useptr); - printf("*baseptr=%04x ", *baseptr); printf("*useptr=%04x\n", *(mm->mmnew->useptr)); - printf("*baseptr=%Fp ", *baseptr); printf("*useptr=%Fp\n", *(mm->mmnew->useptr)); + gvar->mm.mmnew->length = needed; + 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); } - mm->mmnew->attributes = BASEATTRIBUTES; + //Quit(gvar, "gvar->mm.mmnew->useptr==NULL"); } + gvar->mm.mmnew->attributes = BASEATTRIBUTES; //tryagain: for (search = 0; search<3; search++) @@ -977,25 +913,25 @@ void MM_GetPtr (memptr *baseptr, dword size, mminfo_t *mm, mminfotype *mmi) // first search: try to allocate right after the rover, then on up // second search: search from the head pointer up to the rover // third search: compress memory, then scan from start - if (search == 1 && mm->mmrover == mm->mmhead) + if (search == 1 && gvar->mm.mmrover == gvar->mm.mmhead) search++; switch (search) { case 0: - lastscan = mm->mmrover; - scan = mm->mmrover->next; + lastscan = gvar->mm.mmrover; + scan = gvar->mm.mmrover->next; endscan = NULL; break; case 1: - lastscan = mm->mmhead; - scan = mm->mmhead->next; - endscan = mm->mmrover; + lastscan = gvar->mm.mmhead; + scan = gvar->mm.mmhead->next; + endscan = gvar->mm.mmrover; break; case 2: - MM_SortMem (mm); - lastscan = mm->mmhead; - scan = mm->mmhead->next; + MM_SortMem (gvar); + lastscan = gvar->mm.mmhead; + scan = gvar->mm.mmhead->next; endscan = NULL; break; } @@ -1012,16 +948,16 @@ void MM_GetPtr (memptr *baseptr, dword size, mminfo_t *mm, mminfotype *mmi) // and allocate the new block // purge = lastscan->next; - lastscan->next = mm->mmnew; - mm->mmnew->start = *(unsigned *)baseptr = startseg; - mm->mmnew->next = scan; + lastscan->next = gvar->mm.mmnew; + gvar->mm.mmnew->start = *(unsigned *)baseptr = startseg; + gvar->mm.mmnew->next = scan; while ( purge != scan) { // free the purgable block next = purge->next; FREEBLOCK(purge); purge = next; // purge another if not at scan } - mm->mmrover = mm->mmnew; + gvar->mm.mmrover = gvar->mm.mmnew; return; // good allocation! } @@ -1040,18 +976,16 @@ void MM_GetPtr (memptr *baseptr, dword size, mminfo_t *mm, mminfotype *mmi) } } - if (mm->bombonerror) + if (gvar->mm.bombonerror) { #ifdef __WATCOMC__ //heapdump(); #endif - printf(OUT_OF_MEM_MSG,(size-mmi->nearheap)); - printf("for stability reasons the program will shut down! wwww\n"); - MM_Shutdown(mm); - exit(-1); + printf(OUT_OF_MEM_MSG,(size-gvar->mmi.nearheap)); + Quit(gvar, "for stability reasons the program will shut down! wwww\n"); } else - mm->mmerror = true; + gvar->mm.mmerror = true; } //========================================================================== @@ -1066,16 +1000,15 @@ void MM_GetPtr (memptr *baseptr, dword size, mminfo_t *mm, mminfotype *mmi) ==================== */ -void MM_FreePtr(memptr *baseptr, mminfo_t *mm) +void MM_FreePtr(memptr *baseptr, global_game_variables_t *gvar) { - //huge mmblocktype huge *scan,huge *last; mmblocktype far *scan,far *last; - last = mm->mmhead; + last = gvar->mm.mmhead; scan = last->next; - if(baseptr == mm->mmrover->useptr) // removed the last allocated block - mm->mmrover = mm->mmhead; + if(baseptr == gvar->mm.mmrover->useptr) // removed the last allocated block + gvar->mm.mmrover = gvar->mm.mmhead; while(scan->useptr != baseptr && scan) { @@ -1085,8 +1018,8 @@ void MM_FreePtr(memptr *baseptr, mminfo_t *mm) 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; @@ -1105,32 +1038,32 @@ void MM_FreePtr(memptr *baseptr, mminfo_t *mm) ===================== */ -void MM_SetPurge(memptr *baseptr, int purge, mminfo_t *mm) + +void MM_SetPurge(memptr *baseptr, int purge, global_game_variables_t *gvar) { - //huge mmblocktype huge *start; mmblocktype far *start; - start = mm->mmrover; + start = gvar->mm.mmrover; do { - if(mm->mmrover->useptr == baseptr) + if(gvar->mm.mmrover->useptr == baseptr) break; - mm->mmrover = mm->mmrover->next; + gvar->mm.mmrover = gvar->mm.mmrover->next; - if(!mm->mmrover) - mm->mmrover = mm->mmhead; - else if(mm->mmrover == start) + if(!gvar->mm.mmrover) + gvar->mm.mmrover = gvar->mm.mmhead; + else if(gvar->mm.mmrover == start) { - printf("MM_SetPurge: Block not found!"); - return; + Quit (gvar, "MM_SetPurge: Block not found!"); + //return; } } while(1); - mm->mmrover->attributes &= ~PURGEBITS; - mm->mmrover->attributes |= purge; + gvar->mm.mmrover->attributes &= ~PURGEBITS; + gvar->mm.mmrover->attributes |= purge; } //========================================================================== @@ -1145,32 +1078,31 @@ void MM_SetPurge(memptr *baseptr, int purge, mminfo_t *mm) ===================== */ -void MM_SetLock(memptr *baseptr, boolean locked, mminfo_t *mm) +void MM_SetLock(memptr *baseptr, boolean locked, global_game_variables_t *gvar) { - //huge mmblocktype huge *start; mmblocktype far *start; - start = mm->mmrover; + start = gvar->mm.mmrover; do { - if(mm->mmrover->useptr == baseptr) + if(gvar->mm.mmrover->useptr == baseptr) break; - mm->mmrover = mm->mmrover->next; + gvar->mm.mmrover = gvar->mm.mmrover->next; - if(!mm->mmrover) - mm->mmrover = mm->mmhead; - else if(mm->mmrover == start) + if(!gvar->mm.mmrover) + gvar->mm.mmrover = gvar->mm.mmhead; + else if(gvar->mm.mmrover == start) { - printf("MM_SetLock: Block not found!"); - return; + Quit (gvar, "MM_SetLock: Block not found!"); + //return; } } while(1); - mm->mmrover->attributes &= ~LOCKBIT; - mm->mmrover->attributes |= locked*LOCKBIT; + gvar->mm.mmrover->attributes &= ~LOCKBIT; + gvar->mm.mmrover->attributes |= locked*LOCKBIT; } //========================================================================== @@ -1185,12 +1117,11 @@ void MM_SetLock(memptr *baseptr, boolean locked, mminfo_t *mm) ===================== */ -void MM_SortMem(mminfo_t *mm) +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 @@ -1218,7 +1149,7 @@ void MM_SortMem(mminfo_t *mm) if(beforesort) beforesort(); - scan = mm->mmhead; + scan = gvar->mm.mmhead; last = NULL; // shut up compiler warning @@ -1240,7 +1171,7 @@ void MM_SortMem(mminfo_t *mm) // next = scan->next; FREEBLOCK(scan); - //MM_FreeBlock(scan, mm); + //MM_FreeBlock(scan, gvar); last->next = next; scan = next; continue; @@ -1275,7 +1206,7 @@ void MM_SortMem(mminfo_t *mm) scan = scan->next; // go to next block } - mm->mmrover = mm->mmhead; + gvar->mm.mmrover = gvar->mm.mmhead; if(aftersort) aftersort(); @@ -1296,23 +1227,22 @@ void MM_SortMem(mminfo_t *mm) ===================== */ -void MM_ShowMemory(global_game_variables_t *gvar,/*page_t *page, */mminfo_t *mm) +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); - scan = mm->mmhead; +//[[[[ VW_SetScreen (0,0); + scan = gvar->mm.mmhead; end = -1; CA_OpenDebug (gvar); @@ -1429,14 +1359,14 @@ void MM_ShowMemory(global_game_variables_t *gvar,/*page_t *page, */mminfo_t *mm) /*strcpy(scratch1, AARESET); strcat(scratch1, "========================================\n"); strcat(scratch1, "near= "); - ultoa (*(mm->nearheap),str,10); + ultoa (*(gvar->mm.nearheap),str,10); strcat (scratch1,str); strcat(scratch1, " far= "); - ultoa (*(mm->farheap),str,10); + ultoa (*(gvar->mm.farheap),str,10); strcat (scratch1,str); strcat(scratch1, "\n"); - //strcat(scratch1, "&near= %Fp ", &(mm->nearheap)); - //strcat(scratch1, "&far= %Fp", &(mm->farheap)); + //strcat(scratch1, "&near= %Fp ", &(gvar->mm.nearheap)); + //strcat(scratch1, "&far= %Fp", &(gvar->mm.farheap)); //strcat(scratch1, "\n"); strcat(scratch1, "========================================\n"); write(gvar->handle.debughandle,scratch1,strlen(scratch1));*/ @@ -1459,16 +1389,20 @@ void MM_ShowMemory(global_game_variables_t *gvar,/*page_t *page, */mminfo_t *mm) ===================== */ -void MM_DumpData(mminfo_t *mm) +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; - free(mm->nearheap); +#ifdef __WATCOMC__ + _nfree(gvar->mm.nearheap); +#endif +#ifdef __BORLANDC__ + free(gvar->mm.nearheap); +#endif #ifdef __BORLANDC__ dumpfile = fopen ("mmdump.16b","w"); #endif @@ -1486,7 +1420,7 @@ void MM_DumpData(mminfo_t *mm) oldlowest = lowest; lowest = 0xffff; - scan = mm->mmhead; + scan = gvar->mm.mmhead; while (scan) { owner = (unsigned)scan->useptr; @@ -1533,14 +1467,13 @@ void MM_DumpData(mminfo_t *mm) ====================== */ -dword MM_UnusedMemory(mminfo_t *mm) +dword MM_UnusedMemory(global_game_variables_t *gvar) { dword free; - //huge mmblocktype huge *scan; mmblocktype far *scan; free = 0; - scan = mm->mmhead; + scan = gvar->mm.mmhead; while(scan->next) { @@ -1565,14 +1498,13 @@ dword MM_UnusedMemory(mminfo_t *mm) ====================== */ -dword MM_TotalFree(mminfo_t *mm) +dword MM_TotalFree(global_game_variables_t *gvar) { dword free; - //huge mmblocktype huge *scan; mmblocktype far *scan; free = 0; - scan = mm->mmhead; + scan = gvar->mm.mmhead; while(scan->next) { @@ -1596,28 +1528,32 @@ dword MM_TotalFree(mminfo_t *mm) ===================== */ -void MM_Report(global_game_variables_t *gvar) +void MM_Report_(global_game_variables_t *gvar) { printf("========================================\n"); - printf(" MM_Report\n"); + printf(" MM_Report_\n"); printf("========================================\n"); if(MML_CheckForEMS()) { - printf(" LIMEMS\n"); - printf(" EMM v%x.%x available\n", gvar->mm.EMSVer>>4,gvar->mm.EMSVer&0x0F); - printf(" totalEMSpages: %u ", gvar->mm.totalEMSpages); printf("freeEMSpages: %u\n", gvar->mm.freeEMSpages); - printf(" EMSpageframe: %x\n", gvar->mm.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->mm))) + 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->mm))) 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->mm))); printf("TotalUsed: %lu\n", gvar->mmi.mainmem+gvar->mmi.EMSmem+gvar->mmi.XMSmem+gvar->mmi.XMSmem); - printf(" UnusedMemory: %lu\n", MM_UnusedMemory(&(gvar->mm))); + //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); } //========================================================================== @@ -1761,32 +1697,41 @@ void MM_EMSerr(byte *stri, byte err) ===================== */ -void MM_BombOnError(boolean bomb, mminfo_t *mm) +void MM_BombOnError(boolean bomb, global_game_variables_t *gvar) { - mm->bombonerror = bomb; + gvar->mm.bombonerror = bomb; } -/*void MM_GetNewBlock(mminfo_t *mm) +/*void MM_GetNewBlock(global_game_variables_t *gvar) { - if(!mm->mmfree) - MML_ClearBlock(mm); - mm->mmnew=mm->mmfree; - mm->mmfree=mm->mmfree->next; - if(!(mm->mmnew=mm->mmfree)) + if(!gvar->mm.mmfree) + MML_ClearBlock(gvar); + gvar->mm.mmnew=gvar->mm.mmfree; + gvar->mm.mmfree=gvar->mm.mmfree->next; + if(!(gvar->mm.mmnew=gvar->mm.mmfree)) { printf("MM_GETNEWBLOCK: No free blocks!\n"); return; } - mm->mmfree=mm->mmfree->next; + gvar->mm.mmfree=gvar->mm.mmfree->next; } -void MM_FreeBlock(mmblocktype *x, mminfo_t *mm) +void MM_FreeBlock(mmblocktype *x, global_game_variables_t *gvar) { x->useptr=NULL; - x->next=mm->mmfree; - mm->mmfree=x; + x->next=gvar->mm.mmfree; + 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 {