X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_mm.c;h=63eafca6a7701932d1fb7993d073a268ec45d8df;hb=da5bca7860a3455f4c0724e3b44dca98ff53f932;hp=fc5238a381641ca07e40bc946771ef57eac5bdca;hpb=6c94ef75b28003fa453cbb1ee47c985c9a3a0a84;p=16.git diff --git a/src/lib/16_mm.c b/src/lib/16_mm.c index fc5238a3..63eafca6 100644 --- a/src/lib/16_mm.c +++ b/src/lib/16_mm.c @@ -47,6 +47,10 @@ Open Watcom port by sparky4 */ #include "src/lib/16_mm.h" +#pragma hdrstop + +#pragma warn -pro +#pragma warn -use /* ============================================================================= @@ -86,7 +90,6 @@ boolean MML_CheckForEMS(void) 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 @@ -116,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); } @@ -146,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 @@ -183,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 @@ -197,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; } @@ -238,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 } @@ -274,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 @@ -284,29 +319,37 @@ 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; } byte MM_MapXEMS(mminfo_t *mm, mminfotype *mmi) { - //SUB EMS.MapXPages (PhysicalStart, LogicalStart, NumPages, Handle) //Maps up to 4 logical EMS pages to physical pages in the page frame, where: @@ -341,9 +384,8 @@ 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; } @@ -416,11 +472,10 @@ 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 @@ -440,13 +495,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__ } - printf("base=%u ", base); printf("size=%u\n", size); +#endif + done: +#ifdef __WATCOMC__ + } +#endif +// printf("base=%u ", base); printf("size=%u\n", size); MML_UseSpace(base,size, mm); mmi->XMSmem += size*16; mm->UMBbase[mm->numUMBs] = base; @@ -472,8 +537,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] @@ -495,11 +559,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; + word segm=1; + word oldend; + dword segmlen=seglength; dword extra; scan = last = mm->mmhead; @@ -512,19 +577,28 @@ void MML_UseSpace(/*d*/word segstart, dword seglength, mminfo_t *mm) { last = scan; scan = scan->next; + //printf(" start=%x",scan->start); + //printf(" seglen=%lu\n", scan->length); } //find out how many blocks it spans! - if(seglength>0xffffu) + // + for(;segmlen>0x10000;segmlen-=0x10000) { -// segm=seglength/0x4000u; - segm=seglength/0xffffu; + //printf(" seglen=%lu\n", segmlen); + segm++; } - else segm=1; +// +// take the given range out of the block +// + oldend = scan->start + scan->length; + extra = oldend - (segstart+(word)seglength); //++++emsver stuff! - if(segm>1/*extra>0xfffflu*/) + if(segm>1 || extra>=0x10000lu) + //if(extra>0xfffflu) { + scan->blob=segm; /*__asm { push ds @@ -534,45 +608,38 @@ void MML_UseSpace(/*d*/word segstart, dword seglength, mminfo_t *mm) }*/ -//MML_UseSpace(?segstart?, ?length?, mm); + //MML_UseSpace(segstart, seglength, mm); /*__asm { pop ds }*/ - //printf("MML_UseSpace: Segment spans two blocks!\n"); + printf("MML_UseSpace: Segment spans two blocks!\n"); + //} + printf("========================================\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); + printf("========================================\n"); } - -// -// 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) { 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) { - MM_GetNewBlock(mm); + GETNEWBLOCK; mm->mmnew->next = scan->next; scan->next = mm->mmnew; mm->mmnew->start = segstart+seglength; @@ -630,19 +697,21 @@ void MML_ClearBlock(mminfo_t *mm) void MM_Startup(mminfo_t *mm, mminfotype *mmi) { int i; - dword length; + dword length,seglength; + //dword length; word seglength; void huge *start; - unsigned segstart,seglength,endfree; + word segstart;//,endfree; - if(mm->mmstarted) - MM_Shutdown(mm); +// if(mm->mmstarted) +// MM_Shutdown(mm); mm->mmstarted = true; mm->bombonerror = true; + mm->endid=0; + // // 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; @@ -663,67 +731,82 @@ void MM_Startup(mminfo_t *mm, mminfotype *mmi) mm->mmnew->next = NULL; mm->mmrover = mm->mmhead; -// farlen=_bios_memsize()*1024; - // // get all available near conventional memory segments // - printf(" nearheap making!\n"); -//---- length=coreleft(); +#ifdef __WATCOMC__ _nheapgrow(); - length=_memavl(); + length=(dword)_memavl();//(dword)GetFreeSize(); + start = (void huge *)(mm->nearheap = _nmalloc(length)); +#endif +#ifdef __BORLANDC__ + length=coreleft(); start = (void huge *)(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(" near heap ok!\n"); + //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=_memavl(); - start = mm->farheap = halloc(length, sizeof(byte)); - //start = mm->farheap = _fmalloc(length); +#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; - mmi->mainmem = mmi->nearheap + mmi->farheap; - printf(" far heap ok!\n"); + //printf("start=%Fp segstart=%x seglen=%lu len=%lu\n", start, segstart, seglength, length); + mmi->mainmem = mmi->nearheap + mmi->farheap; // // detect EMS and allocate up to 64K at page frame // - printf(" EMS1\n\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++) + 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"); 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(" EMS4\n"); - if(mm->EMSVer<0x40) + //if(mm->EMSVer<0x40) MM_MapEMS(mm, mmi); // map in used pages - else - MM_MapXEMS(mm, mmi); // map in used pages + //else + //MM_MapXEMS(mm, mmi); // map in used pages } // @@ -731,16 +814,29 @@ printf(" EMS4\n"); // 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(" XMS!\n"); - //MML_SetupXMS(mm, mmi); // allocate as many UMBs as possible + MML_SetupXMS(mm, mmi); // allocate as many UMBs as possible } // @@ -769,14 +865,15 @@ void MM_Shutdown(mminfo_t *mm) if(!(mm->mmstarted)) return; - _ffree(mm->farheap); - printf(" far freed\n"); - free(mm->nearheap); - printf(" near freed\n"); - //hfree(mm->hugeheap); - //printf("huge 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"); } } //========================================================================== @@ -795,17 +892,19 @@ void MM_GetPtr(memptr *baseptr,dword size, mminfo_t *mm, mminfotype *mmi) { mmblocktype huge *scan,huge *lastscan,huge *endscan,huge *purge,huge *next; int search; - unsigned needed,startseg; + dword needed; + word startseg; needed = (size+15)/16; // convert size from bytes to paragraphs - - MM_GetNewBlock(mm); // fill in start and next after a spot is found +printf("."); //0000 + GETNEWBLOCK; // fill in start and next after a spot is found mm->mmnew->length = needed; mm->mmnew->useptr = baseptr; mm->mmnew->attributes = BASEATTRIBUTES; - - for(search = 0; search<3; search++) +printf("."); //0000 + for(search = 0; searchendid; search++) { +printf(" [case]"); //0000 // // first search: try to allocate right after the rover, then on up // second search: search from the head pointer up to the rover @@ -816,16 +915,19 @@ void MM_GetPtr(memptr *baseptr,dword size, mminfo_t *mm, mminfotype *mmi) switch(search) { case 0: +printf("0 "); //0000 lastscan = mm->mmrover; scan = mm->mmrover->next; endscan = NULL; break; case 1: +printf("1 "); //0000 lastscan = mm->mmhead; scan = mm->mmhead->next; endscan = mm->mmrover; break; case 2: +printf("2 "); //0000 MM_SortMem(mm); lastscan = mm->mmhead; scan = mm->mmhead->next; @@ -833,12 +935,14 @@ void MM_GetPtr(memptr *baseptr,dword size, mminfo_t *mm, mminfotype *mmi) break; } - startseg = lastscan->start + lastscan->length; + startseg = lastscan->start + (word)lastscan->length; while(scan != endscan) { +//printf(","); //0000 if(scan->start - startseg >= needed) { +printf("."); //0000 // // got enough space between the end of lastscan and // the start of scan, so throw out anything in the middle @@ -846,12 +950,14 @@ void MM_GetPtr(memptr *baseptr,dword size, mminfo_t *mm, mminfotype *mmi) // purge = lastscan->next; lastscan->next = mm->mmnew; - mm->mmnew->start = *(unsigned *)baseptr = startseg; + mm->mmnew->start = *(word *)baseptr = startseg; mm->mmnew->next = scan; while(purge != scan) { // free the purgable block +printf(" freeing block~\n"); //0000 next = purge->next; - MM_FreeBlock(purge, mm); + FREEBLOCK(purge); + //MM_FreeBlock(purge, mm); purge = next; // purge another if not at scan } mm->mmrover = mm->mmnew; @@ -864,17 +970,28 @@ void MM_GetPtr(memptr *baseptr,dword size, mminfo_t *mm, mminfotype *mmi) if((scan->attributes & LOCKBIT) || !(scan->attributes & PURGEBITS) ) { +printf(" [lock] "); //0000 +printf("len=%lu ", scan->length); lastscan = scan; - startseg = lastscan->start + lastscan->length; + startseg = lastscan->start + (word)lastscan->length; } - +printf("\n"); scan=scan->next; // look at next line } } if (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"); + printf(" endid=%u\n",(mm->endid)); + MM_Shutdown(mm); + exit(-1); + } else mm->mmerror = true; } @@ -915,7 +1032,7 @@ void MM_FreePtr(memptr *baseptr, mminfo_t *mm) last->next = scan->next; - MM_FreeBlock(scan, mm); + FREEBLOCK(scan); } //========================================================================== @@ -1060,7 +1177,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; @@ -1106,10 +1224,8 @@ void MM_SortMem(mminfo_t *mm) MM_SetLock(&(memptr)audiosegs[playing],false);*/ } - //========================================================================== -//****#if 0 /* ===================== = @@ -1118,105 +1234,138 @@ 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]; - + word temp; + sdword end,owner; + //word chx,chy; + word w; + dword wwww; + byte scratch[160],scratch0[4096],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); +//++++ 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) +//++++ modexClearRegion(page, chx, chy, 4, 4, 15); //++++ 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<=(wwww/80);w++) + { + //printf("0 %x %u %lu\n", scan->next->start, w, scan->length); + 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"); + }/*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:"); -ltoa ((dword)scan->length*16,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 ((word)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; +//++++chy+=4; //fprintf(stdout, "%s", scratch); -//****#endif scan = scan->next; } -CA_CloseDebug (); + CA_CloseDebug (gvar); //++++mh IN_Ack(); //**** VW_SetLineWidth(64); //++++mh bufferofs = temp; } -//****#endif //========================================================================== @@ -1230,17 +1379,16 @@ CA_CloseDebug (); void MM_DumpData(mminfo_t *mm) { - mmblocktype far *scan,far *best; + mmblocktype huge *scan,huge *best; long lowest,oldlowest; word owner; byte lock,purge; FILE *dumpfile; - - free (mm->nearheap); - dumpfile = fopen ("mmdump.txt","w"); + free(mm->nearheap); + dumpfile = fopen ("mmdump.16","w"); if (!dumpfile){ - printf("MM_DumpData: Couldn't open MMDUMP.TXT!\n"); + printf("MM_DumpData: Couldn't open MMDUMP.16!\n"); return; } @@ -1280,8 +1428,8 @@ void MM_DumpData(mminfo_t *mm) } while (lowest != 0xffff); - fclose (dumpfile); - printf("MMDUMP.TXT created.\n"); + fclose(dumpfile); + printf("MMDUMP.16 created.\n"); } //========================================================================== @@ -1311,7 +1459,7 @@ dword MM_UnusedMemory(mminfo_t *mm) scan = scan->next; } - return free*16l; + return free*16lu; // return free; } @@ -1344,7 +1492,7 @@ dword MM_TotalFree(mminfo_t *mm) scan = scan->next; } - return free*16l; + return free*16lu; // return free; } @@ -1358,7 +1506,7 @@ dword MM_TotalFree(mminfo_t *mm) ===================== */ -void MM_Report(page_t *page, mminfo_t *mm, mminfotype *mmi) +void MM_Report(/*page_t *page, */mminfo_t *mm, mminfotype *mmi) { if(MML_CheckForEMS()) { @@ -1367,7 +1515,7 @@ void MM_Report(page_t *page, mminfo_t *mm, mminfotype *mmi) printf("freeEMSpages=%u\n", mm->freeEMSpages); printf("EMSpageframe=%x\n", mm->EMSpageframe); } - if(MML_CheckForXMS(mm)) printf("XMSaddr=%Fp\n", *XMSaddr); + if(MML_CheckForXMS(mm)) printf("XMSaddr=%X\n", *XMSaddr); printf("near=%lu\n", mmi->nearheap); printf("far=%lu\n", mmi->farheap); printf("EMSmem=%lu\n", mmi->EMSmem); @@ -1375,9 +1523,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)); -// 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); } //========================================================================== @@ -1393,9 +1539,6 @@ void MM_Report(page_t *page, mminfo_t *mm, mminfotype *mmi) void MM_EMSerr(byte *stri, byte err) { //Returns a text string describing the error code in EMS.Error. - fprintf(stderr, "\n%x\n\n", err); - fprintf(stderr, "\n%u\n\n", err); - getch(); switch(err) { case 0x0: @@ -1529,18 +1672,19 @@ 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); mm->mmnew=mm->mmfree; mm->mmfree=mm->mmfree->next; - /*if(!(mm->mmnew=mm->mmfree)) + if(!(mm->mmnew=mm->mmfree)) { - printf("MM_GETNEWBLOCK: No free blocks!"); + printf("MM_GETNEWBLOCK: No free blocks!\n"); return; } - mm->mmfree=mm->mmfree->next;*/ + mm->mmfree=mm->mmfree->next; + mm->endid++; //end of list } void MM_FreeBlock(mmblocktype *x, mminfo_t *mm) @@ -1548,12 +1692,12 @@ void MM_FreeBlock(mmblocktype *x, mminfo_t *mm) x->useptr=NULL; x->next=mm->mmfree; mm->mmfree=x; -} + mm->endid--; //end of list +}*/ -void MM_seguin(void) +/*void MM_seguin(void) { - __asm - { + __asm { push ds mov ax,ds inc ax @@ -1563,11 +1707,10 @@ void MM_seguin(void) void MM_segude(void) { - __asm - { + __asm { pop ds } -} +}*/ /* pull data from far and put it into ds var