X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_mm.c;h=9486e2e55e008d1abcdd0f3ebc8a36d0cb3074b9;hb=f7d4708784bcfac49b37a1648e06e24b56063e7e;hp=05a72f8c6e4f650ab4287f7f696eff447de68fd6;hpb=1cd7d6a6135b715e3157847e70971376c5bdf9a0;p=16.git diff --git a/src/lib/16_mm.c b/src/lib/16_mm.c index 05a72f8c..9486e2e5 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 /* ============================================================================= @@ -137,7 +141,7 @@ boolean MML_CheckForEMS(void) byte MML_SetupEMS(mminfo_t *mm) { - char str[80];//,str2[10]; + byte str[160]; byte err; boolean errorflag=false; @@ -207,9 +211,9 @@ End: if(errorflag==true) { //err = CPURegs.h.ah; - strcpy(str,"MM_SetupEMS: EMS error"); + strcpy(str,"MM_SetupEMS: EMS error "); //itoa(err,str2,16); - strcat(str,MM_EMSerr(err)); + MM_EMSerr(&str, err); printf("%s\n",str); return err; } @@ -265,7 +269,7 @@ void MML_ShutdownEMS(mminfo_t *mm) byte MM_MapEMS(mminfo_t *mm, mminfotype *mmi) { - char str[80]; + byte str[160]; unsigned EMShandle; byte err; boolean errorflag=false; @@ -292,9 +296,9 @@ byte MM_MapEMS(mminfo_t *mm, mminfotype *mmi) if(errorflag==true) { //err = CPURegs.h.ah; - strcpy(str,"MM_MapEMS: EMS error"); + strcpy(str,"MM_MapEMS: EMS error "); //itoa(err,str2,16); - strcat(str,MM_EMSerr(err)); + MM_EMSerr(str, err); printf("%s\n",str); //printf("FACK! %x\n", err); return err; @@ -306,7 +310,6 @@ byte MM_MapEMS(mminfo_t *mm, mminfotype *mmi) 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: @@ -329,7 +332,7 @@ byte MM_MapXEMS(mminfo_t *mm, mminfotype *mmi) // EMS.Error = (Regs.ax AND 0xFF00&) \ 0x100 //Store the status code //END SUB - char str[80]; + byte str[160]; byte err; word EMShandle; boolean errorflag=false; @@ -343,7 +346,7 @@ byte MM_MapXEMS(mminfo_t *mm, mminfotype *mmi) { __asm { - mov ax,EMS_MAPXPAGE + mov ah,EMS_MAPXPAGE mov cx,[i] // logical page mov al,bl // physical page mov dx,[EMShandle] // handle @@ -360,9 +363,9 @@ byte MM_MapXEMS(mminfo_t *mm, mminfotype *mmi) { //err = CPURegs.h.ah; //strcpy(str,"MM_MapXEMS: EMS error 0x"); - strcpy(str,"MM_MapXEMS: EMS error"); + strcpy(str,"MM_MapXEMS: EMS error "); //itoa(err,str2,16); - strcat(str,MM_EMSerr(err)); + MM_EMSerr(&str, err); printf("%s\n",str); //printf("%s%x\n",str, err); //printf("FACK! %x\n", err); @@ -548,14 +551,14 @@ void MML_UseSpace(/*d*/word segstart, dword seglength, mminfo_t *mm) // 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); @@ -630,18 +633,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); mm->mmstarted = true; mm->bombonerror = true; + // // 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; @@ -661,65 +668,75 @@ 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 // //---- length=coreleft(); + printf(" nearheap making!\n"); _nheapgrow(); - length=_memavl(); - start = (void huge *)(mm->nearheap = malloc(length)); + length=(dword)_coreleft();//(dword)_memmax();//(dword)GetFreeSize(); + start = (void huge *)(mm->nearheap = _nmalloc(length)); 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); + //heapdump(); + //getch(); // // get all available far conventional memory segments // //---- length=farcoreleft(); + printf(" farheap making!\n"); _fheapgrow(); - length=_memavl(); - start = mm->farheap = halloc(length, sizeof(byte)); - //start = mm->farheap = _fmalloc(length); + length=(dword)_farcoreleft();//(dword)GetFarFreeSize();//0xffffUL*4UL; + //start = mm->farheap = halloc(length, 1); + start = mm->farheap = _fmalloc(length); 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(); + mmi->mainmem = mmi->nearheap + mmi->farheap; - //printf("far heap ok!\n"); + getch(); + +//goto xmsskip; // // 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! +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++) { if(US_CheckParm(__argv[i],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! +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(" 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! +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) +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 + //else + //MM_MapXEMS(mm, mmi); // map in used pages } // @@ -732,11 +749,12 @@ emsskip: if(US_CheckParm(__argv[i],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! +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 +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 } // @@ -765,14 +783,10 @@ 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"); + _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"); } } //========================================================================== @@ -870,7 +884,12 @@ void MM_GetPtr(memptr *baseptr,dword size, mminfo_t *mm, mminfotype *mmi) } if (mm->bombonerror) + { printf(OUT_OF_MEM_MSG,(size-mmi->nearheap)); + printf("for stability reasons the program will shut down! wwww\n"); + MM_Shutdown(mm); + exit(-1); + } else mm->mmerror = true; } @@ -1114,7 +1133,7 @@ void MM_SortMem(mminfo_t *mm) ===================== */ -void MM_ShowMemory(page_t *page, mminfo_t *mm) +void MM_ShowMemory(/*page_t *page, */mminfo_t *mm) { mmblocktype huge *scan; word color,temp; @@ -1158,19 +1177,19 @@ CA_OpenDebug (); //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); //++++ VW_Plot(scan->start,0,15); - modexClearRegion(page, chx, chy, 4, 4, 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 //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); @@ -1190,7 +1209,7 @@ strcpy(scratch,"Seg:"); ultoa (scan->start,str,16); strcat (scratch,str); strcat (scratch,"\tSize:"); -ltoa ((dword)scan->length*16,str,10); +ultoa ((dword)scan->length,str,10); strcat (scratch,str); strcat (scratch,"\tOwner:0x"); owner = (unsigned)scan->useptr; @@ -1199,7 +1218,7 @@ strcat (scratch,str); strcat (scratch,"\n"); write(debughandle,scratch,strlen(scratch)); //modexprint(page, chx, chy, 1, 0, 24, &scratch); -chy+=4; +//++++chy+=4; //fprintf(stdout, "%s", scratch); //****#endif @@ -1233,10 +1252,10 @@ void MM_DumpData(mminfo_t *mm) 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; } @@ -1276,8 +1295,8 @@ void MM_DumpData(mminfo_t *mm) } while (lowest != 0xffff); - fclose (dumpfile); - printf("MMDUMP.TXT created.\n"); + fclose(dumpfile); + printf("MMDUMP.16 created.\n"); } //========================================================================== @@ -1307,8 +1326,8 @@ dword MM_UnusedMemory(mminfo_t *mm) scan = scan->next; } - return free*16l; -// return free; +// return free*16l; + return free; } //========================================================================== @@ -1340,8 +1359,8 @@ dword MM_TotalFree(mminfo_t *mm) scan = scan->next; } - return free*16l; -// return free; +// return free*16l; + return free; } //========================================================================== @@ -1354,7 +1373,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()) { @@ -1363,7 +1382,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); @@ -1371,6 +1390,8 @@ 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); @@ -1386,128 +1407,125 @@ void MM_Report(page_t *page, mminfo_t *mm, mminfotype *mmi) ===================== */ -byte *MM_EMSerr(byte err) +void MM_EMSerr(byte *stri, byte err) { //Returns a text string describing the error code in EMS.Error. - static byte msag[128]; switch(err) { case 0x0: - strcpy(msag, "successful"); + strcat(stri, "successful"); break; case 0x80: - strcpy(msag, "internal error"); + strcat(stri, "internal error"); break; case 0x81: - strcpy(msag, "hardware malfunction"); + strcat(stri, "hardware malfunction"); break; case 0x82: - strcpy(msag, "busy .. retry later"); + strcat(stri, "busy .. retry later"); break; case 0x83: - strcpy(msag, "invalid handle"); + strcat(stri, "invalid handle"); break; case 0x84: - strcpy(msag, "undefined function requested by application"); + strcat(stri, "undefined function requested by application"); break; case 0x85: - strcpy(msag, "no more handles available"); + strcat(stri, "no more handles available"); break; case 0x86: - strcpy(msag, "error in save or restore of mapping context"); + strcat(stri, "error in save or restore of mapping context"); break; case 0x87: - strcpy(msag, "insufficient memory pages in system"); + strcat(stri, "insufficient memory pages in system"); break; case 0x88: - strcpy(msag, "insufficient memory pages available"); + strcat(stri, "insufficient memory pages available"); break; case 0x89: - strcpy(msag, "zero pages requested"); + strcat(stri, "zero pages requested"); break; case 0x8A: - strcpy(msag, "invalid logical page number encountered"); + strcat(stri, "invalid logical page number encountered"); break; case 0x8B: - strcpy(msag, "invalid physical page number encountered"); + strcat(stri, "invalid physical page number encountered"); break; case 0x8C: - strcpy(msag, "page-mapping hardware state save area is full"); + strcat(stri, "page-mapping hardware state save area is full"); break; case 0x8D: - strcpy(msag, "save of mapping context failed"); + strcat(stri, "save of mapping context failed"); break; case 0x8E: - strcpy(msag, "restore of mapping context failed"); + strcat(stri, "restore of mapping context failed"); break; case 0x8F: - strcpy(msag, "undefined subfunction"); + strcat(stri, "undefined subfunction"); break; case 0x90: - strcpy(msag, "undefined attribute type"); + strcat(stri, "undefined attribute type"); break; case 0x91: - strcpy(msag, "feature not supported"); + strcat(stri, "feature not supported"); break; case 0x92: - strcpy(msag, "successful, but a portion of the source region has been overwritten"); + strcat(stri, "successful, but a portion of the source region has been overwritten"); break; case 0x93: - strcpy(msag, "length of source or destination region exceeds length of region allocated to either source or destination handle"); + strcat(stri, "length of source or destination region exceeds length of region allocated to either source or destination handle"); break; case 0x94: - strcpy(msag, "conventional and expanded memory regions overlap"); + strcat(stri, "conventional and expanded memory regions overlap"); break; case 0x95: - strcpy(msag, "offset within logical page exceeds size of logical page"); + strcat(stri, "offset within logical page exceeds size of logical page"); break; case 0x96: - strcpy(msag, "region length exceeds 1 MB"); + strcat(stri, "region length exceeds 1 MB"); break; case 0x97: - strcpy(msag, "source and destination EMS regions have same handle and overlap"); + strcat(stri, "source and destination EMS regions have same handle and overlap"); break; case 0x98: - strcpy(msag, "memory source or destination type undefined"); + strcat(stri, "memory source or destination type undefined"); break; case 0x9A: - strcpy(msag, "specified alternate map register or DMA register set not supported"); + strcat(stri, "specified alternate map register or DMA register set not supported"); break; case 0x9B: - strcpy(msag, "all alternate map register or DMA register sets currently allocated"); + strcat(stri, "all alternate map register or DMA register sets currently allocated"); break; case 0x9C: - strcpy(msag, "alternate map register or DMA register sets not supported"); + strcat(stri, "alternate map register or DMA register sets not supported"); break; case 0x9D: - strcpy(msag, "undefined or unallocated alternate map register or DMA register set"); + strcat(stri, "undefined or unallocated alternate map register or DMA register set"); break; case 0x9E: - strcpy(msag, "dedicated DMA channels not supported"); + strcat(stri, "dedicated DMA channels not supported"); break; case 0x9F: - strcpy(msag, "specified dedicated DMA channel not supported"); + strcat(stri, "specified dedicated DMA channel not supported"); break; case 0xA0: - strcpy(msag, "no such handle name"); + strcat(stri, "no such handle name"); break; case 0xA1: - strcpy(msag, "a handle found had no name, or duplicate handle name"); + strcat(stri, "a handle found had no name, or duplicate handle name"); break; case 0xA2: - strcpy(msag, "attempted to wrap around 1M conventional address space"); + strcat(stri, "attempted to wrap around 1M conventional address space"); break; case 0xA3: - strcpy(msag, "source array corrupted"); + strcat(stri, "source array corrupted"); break; case 0xA4: - strcpy(msag, "operating system denied access"); + strcat(stri, "operating system denied access"); break; default: - strcpy(msag, "undefined error"); - break; + strcat(stri, "undefined error"); } - return &msag; } //========================================================================== @@ -1548,8 +1566,7 @@ void MM_FreeBlock(mmblocktype *x, mminfo_t *mm) void MM_seguin(void) { - __asm - { + __asm { push ds mov ax,ds inc ax @@ -1559,8 +1576,7 @@ void MM_seguin(void) void MM_segude(void) { - __asm - { + __asm { pop ds } }