X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_mm.c;h=1b52644a00447a8cc253a0369c3f02c2cde7f64f;hb=ce843d079f953717e3ffa2a27d3c088537883555;hp=1b887284b7a8a0257c1a65264fae9c96cfa7b653;hpb=bd59805ece70eeaa2bd7248bfac8d9d8940eca8a;p=16.git diff --git a/src/lib/16_mm.c b/src/lib/16_mm.c old mode 100644 new mode 100755 index 1b887284..1b52644a --- a/src/lib/16_mm.c +++ b/src/lib/16_mm.c @@ -47,6 +47,7 @@ Open Watcom port by sparky4 */ #include "src/lib/16_mm.h" +#include "src/lib/16_ca.h" #pragma hdrstop #pragma warn -pro @@ -88,9 +89,7 @@ boolean MML_CheckForEMS(void) { boolean emmcfems; static char emmname[] = "EMMXXXX0"; //fix by andrius4669 -// mov dx,OFFSET emmname __asm { - //LEA DX, emmname //fix by andrius4669 mov dx,OFFSET emmname //fix by andrius4669 mov ax,0x3d00 int 0x21 // try to open EMMXXXX0 device @@ -120,13 +119,24 @@ boolean MML_CheckForEMS(void) // mov emmcfems,1 jmp End +#ifdef __BORLANDC__ + } +#endif error: +#ifdef __BORLANDC__ + __asm { +#endif // // EMS is bad // mov emmcfems,0 +#ifdef __BORLANDC__ + } +#endif End: +#ifdef __WATCOMC__ } +#endif return(emmcfems); } @@ -150,8 +160,7 @@ byte MML_SetupEMS(mminfo_t *mm) unsigned totalEMSpages,freeEMSpages,EMSpageframe,EMSpagesmapped,EMShandle; totalEMSpages = freeEMSpages = EMSpageframe = EMSpagesmapped = 0; - __asm - { + __asm { mov ah,EMS_STATUS int EMS_INT // make sure EMS hardware is present or ah,ah @@ -187,13 +196,23 @@ byte MML_SetupEMS(mminfo_t *mm) jle getpages mov bx,[freeEMSpages] jmp getpages - -low: +#ifdef __BORLANDC__ + } +#endif + low: +#ifdef __BORLANDC__ + __asm { +#endif cmp bx,4 jle getpages // there is only 1,2,3,or 4 pages mov bx,4 // we can't use more than 4 pages - -getpages: +#ifdef __BORLANDC__ + } +#endif + getpages: +#ifdef __BORLANDC__ + __asm { +#endif mov [EMSpagesmapped],bx mov ah,EMS_ALLOCPAGES // allocate up to 64k of EMS int EMS_INT @@ -201,19 +220,28 @@ getpages: jnz error mov [EMShandle],dx jmp End -error: +#ifdef __BORLANDC__ + } +#endif + error: +#ifdef __BORLANDC__ + __asm { +#endif mov err,ah mov errorflag,1 jmp End +#ifdef __BORLANDC__ + } +#endif noEMS: End: +#ifdef __WATCOMC__ } +#endif if(errorflag==true) { - //err = CPURegs.h.ah; strcpy(str,"MM_SetupEMS: EMS error "); - //itoa(err,str2,16); - MM_EMSerr(&str, err); + MM_EMSerr(str, err); printf("%s\n",str); return err; } @@ -242,16 +270,20 @@ void MML_ShutdownEMS(mminfo_t *mm) if(!EMShandle) return; - __asm - { + __asm { mov ah,EMS_FREEPAGES mov dx,[EMShandle] int EMS_INT or ah,ah jz ok mov errorflag,1 +#ifdef __BORLANDC__ + } +#endif ok: +#ifdef __WATCOMC__ } +#endif if(errorflag==true) printf("MML_ShutdownEMS: Error freeing EMS!\n"); //++++ add something } @@ -278,8 +310,7 @@ byte MM_MapEMS(mminfo_t *mm, mminfotype *mmi) for (i=0;i<4/*MAPPAGES*/;i++) { - __asm - { + __asm { mov ah,EMS_MAPPAGE mov bx,[i] // logical page mov al,bl // physical page @@ -288,23 +319,32 @@ byte MM_MapEMS(mminfo_t *mm, mminfotype *mmi) or ah,ah jnz error jmp End +#ifdef __BORLANDC__ + } +#endif error: +#ifdef __BORLANDC__ + __asm { +#endif mov err,ah mov errorflag,1 +#ifdef __BORLANDC__ + } +#endif End: +#ifdef __WATCOMC__ } +#endif if(errorflag==true) { - //err = CPURegs.h.ah; strcpy(str,"MM_MapEMS: EMS error "); - //itoa(err,str2,16); MM_EMSerr(str, err); printf("%s\n",str); - //printf("FACK! %x\n", err); return err; } } mmi->EMSmem = (i)*0x4000lu; + //printf(" mmi->EMSmem=%lu\n", mmi->EMSmem); return 0; } @@ -344,8 +384,7 @@ byte MM_MapXEMS(mminfo_t *mm, mminfotype *mmi) for (i=0;inumUMBs = 0; - __asm - { + __asm { mov ax,0x4300 int 0x2f // query status of installed diver cmp al,0x80 je good mov errorflag,1 +#ifdef __BORLANDC__ + } +#endif good: +#ifdef __WATCOMC__ } +#endif if(errorflag==true) return false; else return true; } @@ -419,16 +472,17 @@ boolean MML_CheckForXMS(mminfo_t *mm) void MML_SetupXMS(mminfo_t *mm, mminfotype *mmi) { - unsigned base,size; + word base,size; -getmemory: - __asm - { + + __asm { mov ax,0x4310 int 0x2f mov [WORD PTR XMSaddr],bx mov [WORD PTR XMSaddr+2],es // function pointer to XMS driver - + } +getmemory: + __asm { mov ah,XMS_ALLOCUMB mov dx,0xffff // try for largest block possible //mov ax,dx // Set available Kbytes. @@ -443,13 +497,23 @@ getmemory: call [DWORD PTR XMSaddr] // DX holds largest available UMB or ax,ax jz done // another error... - -gotone: +#ifdef __BORLANDC__ + } +#endif + gotone: +#ifdef __BORLANDC__ + __asm { +#endif mov [base],bx mov [size],dx -done: +#ifdef __BORLANDC__ + } +#endif + done: +#ifdef __WATCOMC__ } - printf("base=%u ", base); printf("size=%u\n", size); +#endif +// printf("base=%u ", base); printf("size=%u\n", size); MML_UseSpace(base,size, mm); mmi->XMSmem += size*16; mm->UMBbase[mm->numUMBs] = base; @@ -475,8 +539,7 @@ void MML_ShutdownXMS(mminfo_t *mm) for (i=0;inumUMBs;i++) { base = mm->UMBbase[i]; - __asm - { + __asm { mov ah,XMS_FREEUMB mov dx,[base] call [DWORD PTR XMSaddr] @@ -498,11 +561,12 @@ void MML_ShutdownXMS(mminfo_t *mm) ====================== */ -void MML_UseSpace(/*d*/word segstart, dword seglength, mminfo_t *mm) +/*void MML_UseSpace(word segstart, dword seglength, mminfo_t *mm) { - mmblocktype huge *scan,huge *last; - word segm; - dword oldend; + //huge mmblocktype huge *scan,huge *last; + word segm=1; + word oldend; + dword segmlen; dword extra; scan = last = mm->mmhead; @@ -517,71 +581,124 @@ void MML_UseSpace(/*d*/word segstart, dword seglength, mminfo_t *mm) scan = scan->next; } - //find out how many blocks it spans! - if(seglength>0xffffu) +// +// take the given range out of the block +// + oldend = scan->start + scan->length; + extra = oldend - (segstart+seglength); + + segmlen=extra; + + //++++emsver stuff! + if(segm>1)/// || extra>=0x10000lu) + //if(extra>0xfffflu) + { + scan->blob=segm; + + //MML_UseSpace(segstart, seglength, mm); + + printf("MML_UseSpace: Segment spans two blocks!\n"); + //} + printf("segm=%u ", segm); + printf("ex=%lu ", extra); + printf("old=%u ", oldend); + printf("start+seglen=%lu\n", segstart+seglength); + printf("segsta=%x ", segstart); + printf("len=%lu ", scan->length); + printf("seglen=%lu ", seglength); + printf("segmlen=%lu\n", segmlen); + } +//++++todo: linked list of segment! + if(segstart == scan->start) { -// segm=seglength/0x4000u; - segm=seglength/0xffffu; + last->next = scan->next; // unlink block + FREEBLOCK(scan); + scan = last; } - else segm=1; + else + scan->length = segstart-scan->start; // shorten block - //++++emsver stuff! - if(segm>1/*extra>0xfffflu*/) + if(extra > 0) { - /*__asm - { - push ds - mov ax,ds - inc ax - mov ds,ax - }*/ + 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) +{ + mmblocktype far *scan,far *last; + word oldend; + sdword extra; + //word segm=1; -//MML_UseSpace(?segstart?, ?length?, mm); + scan = last = mm->mmhead; + mm->mmrover = mm->mmhead; // reset rover to start of memory - /*__asm - { - pop ds - }*/ - //printf("MML_UseSpace: Segment spans two blocks!\n"); +// +// search for the block that contains the range of segments +// + while (scan->start+scan->length < segstart) + { + last = scan; + scan = scan->next; } +// +// find out how many blocks it spans! +// + /*for(;seglength>=0x10000;seglength-=0xFFFF) + { + //printf(" seglen=%lu\n", segmlen); + segm++; + }*/ + // // take the given range out of the block // oldend = scan->start + scan->length; - extra = oldend - (segstart+seglength); -/* -printf("segm=%u ", segm); -printf("ex=%lu ", extra); -printf("start+seglen=%lu ", segstart+seglength); -printf("len=%u ", scan->length); -printf("segsta=%x ", segstart); -printf("seglen=%lu\n", seglength); -*/ -//segu: -//++++todo: linked list of segment! -//printf("segm=%lu\n", segm); - if(segstart == scan->start) + extra = oldend - (segstart+((unsigned)seglength)); + if (extra < 0) + { + printf("========================================\n"); + printf("start=%x ", scan->start); + printf("old=%u ", oldend); + printf("start+seglen=%lu\n", segstart+seglength); + printf("segsta=%x ", segstart); + printf("len=%lu ", scan->length); + printf("seglen=%lu ", seglength); + printf("\n"); + printf("MML_UseSpace: Segment spans two blocks! %d\n", extra); + printf("========================================\n"); + //return; + } + + if (segstart == scan->start) { last->next = scan->next; // unlink block - MM_FreeBlock(scan, mm); + FREEBLOCK(scan); scan = last; } else scan->length = segstart-scan->start; // shorten block -// segm--; - - if(extra > 0) + if (extra > 0) { - MM_GetNewBlock(mm); + 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; + } } @@ -599,7 +716,8 @@ printf("seglen=%lu\n", seglength); void MML_ClearBlock(mminfo_t *mm) { - mmblocktype huge *scan,huge *last; + //huge mmblocktype huge *scan,huge *last; + mmblocktype far *scan,far *last; scan = mm->mmhead->next; @@ -633,13 +751,15 @@ void MML_ClearBlock(mminfo_t *mm) void MM_Startup(mminfo_t *mm, mminfotype *mmi) { int i; - dword length,seglength; - //dword length; word seglength; - void huge *start; + //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(mm->mmstarted) +// MM_Shutdown(mm); mm->mmstarted = true; mm->bombonerror = true; @@ -647,7 +767,6 @@ void MM_Startup(mminfo_t *mm, mminfotype *mmi) // // set up the linked list (everything in the free list; // - //printf(" linked list making!\n"); mm->mmhead = NULL; mm->mmfree = &(mm->mmblocks[0]); for(i=0;immhead = 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); // // get all available near conventional memory segments // -//---- length=coreleft(); - printf(" nearheap making!\n"); +#ifdef __WATCOMC__ _nheapgrow(); length=(dword)_memavl();//(dword)GetFreeSize(); - start = (void huge *)(mm->nearheap = _nmalloc(length)); + //huge start = (void huge *)(mm->nearheap = _nmalloc(length)); + start = (void far *)(mm->nearheap = _nmalloc(length)); +#endif +#ifdef __BORLANDC__ + length=coreleft(); + //huge start = (void huge *)(mm->nearheap = malloc(length)); + start = (void far *)(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); - //heapdump(); - //getch(); + //printf("start=%Fp segstart=%x seglen=%lu len=%lu\n", start, segstart, seglength, length); // // get all available far conventional memory segments // -//---- length=farcoreleft(); - printf(" farheap making!\n"); + //printf("_FARCORELEFT %lu\n", _FCORELEFT); +#ifdef __WATCOMC__ _fheapgrow(); - length=(dword)GetFarFreeSize();//0xffffUL*4UL; - //start = mm->farheap = halloc(length, 1); +#endif +#ifdef __BORLANDC__ + 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 -= 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); - //heapdump(); + //printf("start=%Fp segstart=%x seglen=%lu len=%lu\n", start, segstart, seglength, length); mmi->mainmem = mmi->nearheap + mmi->farheap; - getch(); - -//goto xmsskip; - // // detect EMS and allocate up to 64K at page frame // -//printf(" EMS1\n"); -//printf("\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"); //bug! mmi->EMSmem = 0; - for(i = 1;i < __argc;i++) +//goto emsskip; //0000 + for(i = 1;i < +#ifdef __WATCOMC__ + __argc +#endif +#ifdef __BORLANDC__ + _argc +#endif + ;i++) { - if(US_CheckParm(__argv[i],ParmStringsexmm) == 0) + if(US_CheckParm( +#ifdef __WATCOMC__ + __argv[i] +#endif +#ifdef __BORLANDC__ + _argv[i] +#endif + ,ParmStringsexmm) == 0) goto emsskip; // param NOEMS } -//printf("\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"); //bug! if(MML_CheckForEMS()) { -//printf(" EMS2\n"); -//printf("\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"); //bug! MML_SetupEMS(mm); // allocate space -//printf(" EMS3\n"); -//printf("\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"); //bug! //TODO: EMS4! AND EMS 3.2 MASSIVE DATA HANDLMENT! MML_UseSpace(mm->EMSpageframe,(MAPPAGES)*0x4000lu, mm); -//printf("\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"); //bug! -//printf(" EMS4\n"); //if(mm->EMSVer<0x40) MM_MapEMS(mm, mmi); // map in used pages //else //MM_MapXEMS(mm, mmi); // map in used pages } -mmi->XMSmem=0; -goto xmsskip; - // // detect XMS and get upper memory blocks // emsskip: mmi->XMSmem = 0; - for(i = 1;i < __argc;i++) +goto xmsskip;//0000 + for(i = 1;i < +#ifdef __WATCOMC__ + __argc +#endif +#ifdef __BORLANDC__ + _argc +#endif + ;i++) { - if(US_CheckParm(__argv[i],ParmStringsexmm) == 0) + if(US_CheckParm( +#ifdef __WATCOMC__ + __argv[i] +#endif +#ifdef __BORLANDC__ + _argv[i] +#endif + ,ParmStringsexmm) == 0) goto xmsskip; // param NOXMS } -//printf("\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"); //bug! if(MML_CheckForXMS(mm)) { -//printf("\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"); //bug! -//printf(" XMS!\n"); MML_SetupXMS(mm, mmi); // allocate as many UMBs as possible } @@ -786,10 +926,15 @@ void MM_Shutdown(mminfo_t *mm) if(!(mm->mmstarted)) return; - _ffree(mm->farheap); printf(" far freed\n"); - _nfree(mm->nearheap); printf(" near freed\n"); - if(MML_CheckForEMS()){ MML_ShutdownEMS(mm); printf(" EMS freed\n"); } - if(MML_CheckForXMS(mm)){ MML_ShutdownXMS(mm); printf(" XMS freed\n"); } + _ffree(mm->farheap);// printf(" far freed\n"); +#ifdef __WATCOMC__ + _nfree(mm->nearheap);// printf(" near freed\n"); +#endif +#ifdef __BORLANDC__ + free(mm->nearheap);// printf(" near freed\n"); +#endif + if(MML_CheckForEMS()){ MML_ShutdownEMS(mm); }//printf(" EMS freed\n"); } + if(MML_CheckForXMS(mm)){ MML_ShutdownXMS(mm); }//printf(" XMS freed\n"); } } //========================================================================== @@ -804,29 +949,36 @@ 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, mminfo_t *mm, mminfotype *mmi) { - mmblocktype huge *scan,huge *lastscan,huge *endscan,huge *purge,huge *next; + //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; needed = (size+15)/16; // convert size from bytes to paragraphs - MM_GetNewBlock(mm); // fill in start and next after a spot is found + GETNEWBLOCK; // fill in start and next after a spot is found mm->mmnew->length = needed; mm->mmnew->useptr = baseptr; + //if(mm->mmnew->useptr==NULL){ + 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)); + //exit(-5); } mm->mmnew->attributes = BASEATTRIBUTES; - for(search = 0; search<3; search++) +//tryagain: + for (search = 0; search<3; search++) { // // 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 && mm->mmrover == mm->mmhead) search++; - switch(search) + switch (search) { case 0: lastscan = mm->mmrover; @@ -839,7 +991,7 @@ void MM_GetPtr(memptr *baseptr,dword size, mminfo_t *mm, mminfotype *mmi) endscan = mm->mmrover; break; case 2: - MM_SortMem(mm); + MM_SortMem (mm); lastscan = mm->mmhead; scan = mm->mmhead->next; endscan = NULL; @@ -848,9 +1000,9 @@ void MM_GetPtr(memptr *baseptr,dword size, mminfo_t *mm, mminfotype *mmi) startseg = lastscan->start + lastscan->length; - while(scan != endscan) + while (scan != endscan) { - if(scan->start - startseg >= needed) + if (scan->start - startseg >= needed) { // // got enough space between the end of lastscan and @@ -861,10 +1013,10 @@ void MM_GetPtr(memptr *baseptr,dword size, mminfo_t *mm, mminfotype *mmi) lastscan->next = mm->mmnew; mm->mmnew->start = *(unsigned *)baseptr = startseg; mm->mmnew->next = scan; - while(purge != scan) + while ( purge != scan) { // free the purgable block next = purge->next; - MM_FreeBlock(purge, mm); + FREEBLOCK(purge); purge = next; // purge another if not at scan } mm->mmrover = mm->mmnew; @@ -874,7 +1026,7 @@ void MM_GetPtr(memptr *baseptr,dword size, mminfo_t *mm, mminfotype *mmi) // // if this block is purge level zero or locked, skip past it // - if((scan->attributes & LOCKBIT) + if ( (scan->attributes & LOCKBIT) || !(scan->attributes & PURGEBITS) ) { lastscan = scan; @@ -888,7 +1040,9 @@ void MM_GetPtr(memptr *baseptr,dword size, mminfo_t *mm, mminfotype *mmi) if (mm->bombonerror) { - heapdump(); +#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); @@ -912,7 +1066,8 @@ void MM_GetPtr(memptr *baseptr,dword size, mminfo_t *mm, mminfotype *mmi) void MM_FreePtr(memptr *baseptr, mminfo_t *mm) { - mmblocktype huge *scan,huge *last; + //huge mmblocktype huge *scan,huge *last; + mmblocktype far *scan,far *last; last = mm->mmhead; scan = last->next; @@ -934,7 +1089,7 @@ void MM_FreePtr(memptr *baseptr, mminfo_t *mm) last->next = scan->next; - MM_FreeBlock(scan, mm); + FREEBLOCK(scan); } //========================================================================== @@ -950,7 +1105,8 @@ void MM_FreePtr(memptr *baseptr, mminfo_t *mm) void MM_SetPurge(memptr *baseptr, int purge, mminfo_t *mm) { - mmblocktype huge *start; + //huge mmblocktype huge *start; + mmblocktype far *start; start = mm->mmrover; @@ -989,7 +1145,8 @@ void MM_SetPurge(memptr *baseptr, int purge, mminfo_t *mm) void MM_SetLock(memptr *baseptr, boolean locked, mminfo_t *mm) { - mmblocktype huge *start; + //huge mmblocktype huge *start; + mmblocktype far *start; start = mm->mmrover; @@ -1028,7 +1185,8 @@ void MM_SetLock(memptr *baseptr, boolean locked, mminfo_t *mm) void MM_SortMem(mminfo_t *mm) { - mmblocktype huge *scan,huge *last,huge *next; + //huge mmblocktype huge *scan,huge *last,huge *next; + mmblocktype far *scan,far *last,far *next; unsigned start,length,source,dest,oldborder; int playing; @@ -1079,7 +1237,8 @@ void MM_SortMem(mminfo_t *mm) // throw out the purgable block // next = scan->next; - MM_FreeBlock(scan, mm); + FREEBLOCK(scan); + //MM_FreeBlock(scan, mm); last->next = next; scan = next; continue; @@ -1125,10 +1284,8 @@ void MM_SortMem(mminfo_t *mm) MM_SetLock(&(memptr)audiosegs[playing],false);*/ } - //========================================================================== -//****#if 0 /* ===================== = @@ -1137,105 +1294,158 @@ void MM_SortMem(mminfo_t *mm) ===================== */ -void MM_ShowMemory(/*page_t *page, */mminfo_t *mm) +void MM_ShowMemory(global_game_variables_t *gvar,/*page_t *page, */mminfo_t *mm) { - mmblocktype huge *scan; - word color,temp; - long end,owner; - word chx,chy; - byte scratch[160],str[16]; - + //huge mmblocktype huge *scan; + mmblocktype far *scan; + word temp; + sdword end,owner; + //word chx,chy; + word w; + //dword wwww; + byte scratch[160],scratch0[4096],scratch1[160],str[16]; + //byte d = '#'; //**** VW_SetDefaultColors(); //**** VW_SetLineWidth(40); //++++mh temp = bufferofs; //++++mh bufferofs = 0; //**** VW_SetScreen (0,0); - scan = mm->mmhead; - end = -1; -CA_OpenDebug (); - - chx=0; - chy=0; - + CA_OpenDebug (gvar); + w=0; while(scan) { + strcpy(scratch, AARESET); if(scan->attributes & PURGEBITS) - color = 5; // dark purple = purgable + strcpy(scratch0, AAMAGENTA); // dark purple = purgable else - color = 9; // medium blue = non purgable + strcpy(scratch0, AABLUE); // medium blue = non purgable if(scan->attributes & LOCKBIT) - color = 12; // red = locked + strcpy(scratch0, AARED); // red = locked if(scan->start<=end) { - //printf("); - write(debughandle,"\nMM_ShowMemory: Memory block order currupted!\n",strlen("\nMM_ShowMemory: Memory block order currupted!\n")); + printf("\nend==%d\n\n", end); + strcat(scratch, "MM_ShowMemory: Memory block order currupted!\n"); + strcat(scratch, "End's Size: "); + ultoa (end,str,10); + strcat (scratch,str); + strcat(scratch, "\nscan->start's Size: "); + ultoa (scan->start,str,10); + strcat (scratch,str); + write(gvar->handle.debughandle,scratch,strlen(scratch)); //modexprint(&page, chx, chy, 1, 0, 24, "\nMM_ShowMemory: Memory block order currupted!\n"); - return; + break; } - end = scan->start+scan->length-1; - chy = scan->start/320; - chx = scan->start%320; + end = scan->start+(scan->length)-1; +//++++ chy = scan->start/320; +//++++ chx = scan->start%320; //modexhlin(page, scan->start, (unsigned)end, chy, color); //for(chx=scan->start;chx+4>=(word)end;chx+=4) //{ //++++ modexClearRegion(page, chx, chy, 4, 4, color); //} - //++++ VW_Hlin(scan->start,(unsigned)end,0,color); - + for(w=(scan->start)/80;w<=end/80;w++) + { + //printf("+ %u %lu\n", w, scan->length); + strcat(scratch0, "+"); + } + strcat(scratch0, AARESET); strcat(scratch0, AAGREY); strcat(scratch0,"_"); //++++ VW_Plot(scan->start,0,15); //++++ modexClearRegion(page, chx, chy, 4, 4, 15); - if(scan->next->start > end+1) //++++ VW_Hlin(end+1,scan->next->start,0,0); // black = free + + //wwww=(dword)(scan->next->start)-(dword)scan->start; + //wwww=(dword)scan->start+(dword)(scan->next->start); + if (scan->next && scan->next->start >= end+1) + { + strcat(scratch0, AARESET); + strcat(scratch0, "\n"); + strcat(scratch0,AAGREEN); + for(w=(end+1)/80;w<=((scan->next->start-scan->start)/80);w++) + //for(w=(wwww)/80;w<=((end+1)/80);w++) + //for(w=(end+1)/80;w<=((wwww)/80);w++) + { + //printf("0 %x %u %lu\n", scan->next->start, w, scan->length); + strcat(scratch0,"0"); + } + //printf("==================\n"); + //printf("w=%u wwww=%lu start=%04x next=%04x end=%lu\n", w/80, wwww/80, scan->start, (scan->next->start), end+1); + //printf("==================\n"); + strcat(scratch0, "\n"); + //getch(); + }/*else {//if(scan->next->start <= scan->start){ + scan->next->start=scan->start+0x1000; + wwww=(dword)(scan->next->start)-(dword)scan->start; + strcat(scratch0, AARESET); + strcat(scratch0, "\n"); + strcat(scratch0,AAGREEN); + for(w=(end+1);w<=(0x1000/80);w++) + { + //printf("0 %x %x %u\n", scan->start, w); + strcat(scratch0,"0"); + } + printf("================\n"); + printf("w=%x start=%x next=%x end=%u %lu\n", w, scan->start, (scan->next->start), end+1, wwww); + printf("================\n"); + getch(); + }*/ + strcat(scratch0, AARESET); + //strcat(scratch0,"\n"); //for(chx=scan->next->start;chx+4>=(word)end+1;chx+=4) //{ -//++++ chx+=scan->next->start; -//++++ modexClearRegion(page, chx, chy, 4, 4, 2); +// chx+=scan->next->start; +// modexClearRegion(page, chx, chy, 4, 4, 2); //} //modexhlin(page, end+1,scan->next->start, chy, 0); - -/* - end = scan->length-1; - y = scan->start/320; +/* y = scan->start/320; x = scan->start%320; VW_Hlin(x,x+end,y,color); - VW_Plot(x,y,15); - if (scan->next && scan->next->start > end+1) - VW_Hlin(x+end+1,x+(scan->next->start-scan->start),y,0); // black = free -*/ - -//****#if 0 -printf("\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"); //bug! -strcpy(scratch,"Seg:"); -ultoa (scan->start,str,16); -strcat (scratch,str); -strcat (scratch,"\tSize:"); -ultoa ((dword)scan->length,str,10); -strcat (scratch,str); -strcat (scratch,"\tOwner:0x"); -owner = (unsigned)scan->useptr; -ultoa (owner,str,16); -strcat (scratch,str); -strcat (scratch,"\n"); -write(debughandle,scratch,strlen(scratch)); + VW_Plot(x,y,15);*/ +//++++ VW_Hlin(x+end+1,x+(scan->next->start-scan->start),y,0); // black = free + strcat(scratch,"Seg:"); + ultoa (scan->start,str,16); + strcat (scratch,str); + strcat (scratch,"\tSize:"); + ultoa ((unsigned)scan->length,str,10); + strcat (scratch,str); + strcat (scratch,"\tOwner:0x"); + owner = (unsigned)scan->useptr; + ultoa (owner,str,16); + strcat (scratch,str); + strcat (scratch,"\n"); + write(gvar->handle.debughandle,scratch,strlen(scratch)); + write(gvar->handle.debughandle,scratch0,strlen(scratch0)); //modexprint(page, chx, chy, 1, 0, 24, &scratch); //++++chy+=4; //fprintf(stdout, "%s", scratch); -//****#endif scan = scan->next; } - -CA_CloseDebug (); + /*strcpy(scratch1, AARESET); + strcat(scratch1, "========================================\n"); + strcat(scratch1, "near= "); + ultoa (*(mm->nearheap),str,10); + strcat (scratch1,str); + strcat(scratch1, " far= "); + ultoa (*(mm->farheap),str,10); + strcat (scratch1,str); + strcat(scratch1, "\n"); + //strcat(scratch1, "&near= %Fp ", &(mm->nearheap)); + //strcat(scratch1, "&far= %Fp", &(mm->farheap)); + //strcat(scratch1, "\n"); + strcat(scratch1, "========================================\n"); + write(gvar->handle.debughandle,scratch1,strlen(scratch1));*/ + + + CA_CloseDebug (gvar); //++++mh IN_Ack(); //**** VW_SetLineWidth(64); //++++mh bufferofs = temp; } -//****#endif //========================================================================== @@ -1249,14 +1459,14 @@ CA_CloseDebug (); void MM_DumpData(mminfo_t *mm) { + //huge mmblocktype huge *scan,huge *best; mmblocktype far *scan,far *best; long lowest,oldlowest; word owner; byte lock,purge; FILE *dumpfile; - - //++++free(mm->nearheap); + free(mm->nearheap); dumpfile = fopen ("mmdump.16","w"); if (!dumpfile){ printf("MM_DumpData: Couldn't open MMDUMP.16!\n"); @@ -1272,7 +1482,7 @@ void MM_DumpData(mminfo_t *mm) scan = mm->mmhead; while (scan) { - owner = (word)scan->useptr; + owner = (unsigned)scan->useptr; if (owner && owner oldlowest) { @@ -1294,7 +1504,7 @@ void MM_DumpData(mminfo_t *mm) else lock = '-'; fprintf (dumpfile,"0x%p (%c%c) = %u\n" - ,(word)lowest,lock,purge,best->length); + ,(unsigned)lowest,lock,purge,best->length); } } while (lowest != 0xffff); @@ -1319,7 +1529,8 @@ void MM_DumpData(mminfo_t *mm) dword MM_UnusedMemory(mminfo_t *mm) { dword free; - mmblocktype huge *scan; + //huge mmblocktype huge *scan; + mmblocktype far *scan; free = 0; scan = mm->mmhead; @@ -1330,8 +1541,8 @@ dword MM_UnusedMemory(mminfo_t *mm) scan = scan->next; } -// return free*16l; - return free; + return free*16lu; +// return free; } //========================================================================== @@ -1350,7 +1561,8 @@ dword MM_UnusedMemory(mminfo_t *mm) dword MM_TotalFree(mminfo_t *mm) { dword free; - mmblocktype huge *scan; + //huge mmblocktype huge *scan; + mmblocktype far *scan; free = 0; scan = mm->mmhead; @@ -1363,8 +1575,8 @@ dword MM_TotalFree(mminfo_t *mm) scan = scan->next; } -// return free*16l; - return free; + return free*16lu; +// return free; } //========================================================================== @@ -1394,11 +1606,7 @@ void MM_Report(/*page_t *page, */mminfo_t *mm, mminfotype *mmi) printf("mainmem=%lu\n", mmi->mainmem); printf("UnusedMemory=%lu\n", MM_UnusedMemory(mm)); printf("TotalFree=%lu\n", MM_TotalFree(mm)); - //mmi->nearheap+mmi->farheap+ - printf("TotalUsed=%lu\n", mmi->mainmem+mmi->EMSmem+mmi->XMSmem);//+); -// printf("\n"); -// printf("UnusedMemory=%lu kb\n", MM_UnusedMemory()/10248); -// printf("TotalFree=%lu kb\n", MM_TotalFree()/10248); + printf("TotalUsed=%lu\n", mmi->mainmem+mmi->EMSmem+mmi->XMSmem+mmi->XMSmem); } //========================================================================== @@ -1547,7 +1755,7 @@ void MM_BombOnError(boolean bomb, mminfo_t *mm) mm->bombonerror = bomb; } -void MM_GetNewBlock(mminfo_t *mm) +/*void MM_GetNewBlock(mminfo_t *mm) { if(!mm->mmfree) MML_ClearBlock(mm); @@ -1566,9 +1774,9 @@ void MM_FreeBlock(mmblocktype *x, mminfo_t *mm) x->useptr=NULL; x->next=mm->mmfree; mm->mmfree=x; -} +}*/ -void MM_seguin(void) +/*void MM_seguin(void) { __asm { push ds @@ -1583,7 +1791,7 @@ void MM_segude(void) __asm { pop ds } -} +}*/ /* pull data from far and put it into ds var