X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_mm.c;h=f0c40f9ec4f53b210bba7444cc90f3a280c7fff5;hb=974303f5ca3975d925d08452c175e09b77e8d4b4;hp=e738cad5e6fa186bf161f3b638cd23052c051327;hpb=1e6ea7c0ae09578fb11557868bd0551e4f19a12c;p=16.git diff --git a/src/lib/16_mm.c b/src/lib/16_mm.c index e738cad5..f0c40f9e 100644 --- a/src/lib/16_mm.c +++ b/src/lib/16_mm.c @@ -41,7 +41,11 @@ EMS / XMS unmanaged routines ============================================================================= */ +/* + +Open Watcom port by sparky4 +*/ #include "src/lib/16_mm.h" /* @@ -52,10 +56,6 @@ EMS / XMS unmanaged routines ============================================================================= */ -//mminfo_t mminfo; -//memptr bufferseg; -//boolean mmerror; - void (* beforesort) (void); void (* aftersort) (void); void (* XMSaddr) (void); // far pointer to XMS driver @@ -68,22 +68,6 @@ void (* XMSaddr) (void); // far pointer to XMS driver ============================================================================= */ -//boolean mmstarted; - -//void far *farheap; -//void *nearheap; - -//mmblocktype far mmblocks[MAXBLOCKS],far *mmhead,far *mmfree,far *mmrover,far *mmnew; - -//boolean bombonerror; - -//unsigned totalEMSpages,freeEMSpages,EMSpageframe,EMSpagesmapped,EMShandle; -//unsigned int EMSVer; - -//void (* XMSaddr) (void); // far pointer to XMS driver - -//unsigned numUMBs,UMBbase[MAXUMBS]; - static char *ParmStringsexmm[] = {"noems","noxms",""}; /* @@ -99,10 +83,11 @@ static char *ParmStringsexmm[] = {"noems","noxms",""}; boolean MML_CheckForEMS(void) { boolean emmcfems; - char emmname[] = "EMMXXXX0"; + static char emmname[] = "EMMXXXX0"; //fix by andrius4669 // mov dx,OFFSET emmname __asm { - LEA DX, emmname //fix by andrius4669 + //LEA DX, emmname //fix by andrius4669 + mov dx,OFFSET emmname //fix by andrius4669 mov ax,0x3d00 int 0x21 // try to open EMMXXXX0 device jc error @@ -158,6 +143,7 @@ unsigned MML_SetupEMS(mminfo_t *mm) union REGS CPURegs; unsigned int EMSVer = 0; + //byte EMS_status; unsigned totalEMSpages,freeEMSpages,EMSpageframe,EMSpagesmapped,EMShandle; totalEMSpages = freeEMSpages = EMSpageframe = EMSpagesmapped = 0; @@ -166,6 +152,7 @@ unsigned MML_SetupEMS(mminfo_t *mm) mov ah,EMS_STATUS int EMS_INT // make sure EMS hardware is present or ah,ah + //mov [EMS_status],ah jnz error mov ah,EMS_VERSION @@ -190,7 +177,15 @@ unsigned MML_SetupEMS(mminfo_t *mm) mov [freeEMSpages],bx or bx,bx jz noEMS // no EMS at all to allocate - + //EXPAND DONG!!!! + cmp [EMSVer],0x40 + jb low + cmp bx,[freeEMSpages] + jle getpages + mov bx,[freeEMSpages] + jmp getpages + +low: 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 @@ -277,7 +272,7 @@ unsigned MM_MapEMS(mminfo_t *mm) union REGS CPURegs; EMShandle=mm->EMShandle; - for (i=0;iEMSpagesmapped;i++) + for (i=0;iEMSpagesmapped*/;i++) { __asm { @@ -299,13 +294,44 @@ unsigned MM_MapEMS(mminfo_t *mm) strcpy(str,"MM_MapEMS: EMS error 0x"); itoa(err,str2,16); strcpy(str,str2); - printf("%s\n",str); + //printf("%s\n",str); + printf("FACK! %u\n", err); return err; } } return 0; } +/* +SUB EMS.MapXPages (PhysicalStart, LogicalStart, NumPages, Handle) + + 'Maps up to 4 logical EMS pages to physical pages in the page frame, where: + ' + 'PhysicalStart = Physical page first logical page is mapped to + 'LogicalStart = First logical page to map + 'NumPages = Number of pages to map (1 to 4) + 'Handle = EMS handle logical pages are allocated to + + 'Create a buffer containing the page information + FOR x = 0 TO NumPages - 1 + MapInfo$ = MapInfo$ + MKI$(LogicalStart + x) + MKI$(PhysicalStart + x) + NEXT + + Regs.ax = &H5000 'Map the pages in the buffer + Regs.cx = NumPages 'to the pageframe + Regs.dx = Handle + Regs.ds = VARSEG(MapInfo$) + Regs.si = SADD(MapInfo$) + InterruptX &H67, Regs, Regs + EMS.Error = (Regs.ax AND &HFF00&) \ &H100 'Store the status code + +END SUB +*/ +void MM_MapXEMS(mminfo_t *mm) +{ + +} + //========================================================================== /* @@ -351,18 +377,17 @@ void MML_SetupXMS(mminfo_t *mm, mminfotype *mmi) { unsigned base,size; +getmemory: __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. call [DWORD PTR XMSaddr] or ax,ax jnz gotone @@ -380,6 +405,7 @@ gotone: mov [size],dx done: } + printf("base=%u ", base); printf("size=%u\n", size); MML_UseSpace(base,size, mm); mmi->XMSmem += size*16; mm->UMBbase[mm->numUMBs] = base; @@ -428,11 +454,12 @@ void MML_ShutdownXMS(mminfo_t *mm) ====================== */ -void MML_UseSpace(unsigned segstart, unsigned seglength, mminfo_t *mm) +void MML_UseSpace(/*d*/word segstart, dword seglength, mminfo_t *mm) { - mmblocktype far *scan,far *last; - unsigned oldend; - long extra; + mmblocktype huge *scan,huge *last; + word segm; + dword oldend; + dword extra; scan = last = mm->mmhead; mm->mmrover = mm->mmhead; // reset rover to start of memory @@ -446,18 +473,51 @@ void MML_UseSpace(unsigned segstart, unsigned seglength, mminfo_t *mm) scan = scan->next; } + //find out how many blocks it spans! + if(seglength>0xffffu) + { +// segm=seglength/0x4000u; + segm=seglength/0xffffu; + } + else segm=1; + + //++++emsver stuff! + if(segm>1/*extra>0xfffflu*/) + { + /*__asm + { + push ds + mov ax,ds + inc ax + mov ds,ax + }*/ + + +//MML_UseSpace(?segstart?, ?length?, mm); + + /*__asm + { + pop ds + }*/ + //printf("MML_UseSpace: Segment spans two blocks!\n"); + } + // // take the given range out of the block // oldend = scan->start + scan->length; extra = oldend - (segstart+seglength); - if(extra < 0) - { - printf("MML_UseSpace: Segment spans two blocks!"); - return; - } +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 @@ -467,6 +527,8 @@ void MML_UseSpace(unsigned segstart, unsigned seglength, mminfo_t *mm) else scan->length = segstart-scan->start; // shorten block +// segm--; + if(extra > 0) { MM_GetNewBlock(mm); @@ -475,7 +537,7 @@ void MML_UseSpace(unsigned segstart, unsigned seglength, mminfo_t *mm) mm->mmnew->start = segstart+seglength; mm->mmnew->length = extra; mm->mmnew->attributes = LOCKBIT; - } + }//else if(segm>0) goto segu; } @@ -493,7 +555,7 @@ void MML_UseSpace(unsigned segstart, unsigned seglength, mminfo_t *mm) void MML_ClearBlock(mminfo_t *mm) { - mmblocktype far *scan,far *last; + mmblocktype huge *scan,huge *last; scan = mm->mmhead->next; @@ -507,7 +569,7 @@ void MML_ClearBlock(mminfo_t *mm) scan = scan->next; } - printf("MM_ClearBlock: No purgable blocks!"); + printf("MM_ClearBlock: No purgable blocks!\n"); } @@ -528,7 +590,7 @@ void MM_Startup(mminfo_t *mm, mminfotype *mmi) { int i; dword length; - void far *start; + void huge *start; unsigned segstart,seglength,endfree; if(mm->mmstarted) @@ -558,6 +620,7 @@ 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 @@ -565,14 +628,14 @@ void MM_Startup(mminfo_t *mm, mminfotype *mmi) //---- length=coreleft(); _nheapgrow(); length=_memavl(); - start = (void far *)(mm->nearheap = malloc(length)); - + start = (void huge *)(mm->nearheap = malloc(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"); // // get all available far conventional memory segments @@ -580,7 +643,8 @@ void MM_Startup(mminfo_t *mm, mminfotype *mmi) //---- length=farcoreleft(); _fheapgrow(); length=_memavl(); - start = mm->farheap = _fmalloc(length); + start = mm->farheap = halloc(length, sizeof(byte)); + //start = mm->farheap = _fmalloc(length); length -= 16-(FP_OFF(start)&15); length -= SAVEFARHEAP; seglength = length / 16; // now in paragraphs @@ -588,11 +652,13 @@ void MM_Startup(mminfo_t *mm, mminfotype *mmi) MML_UseSpace(segstart,seglength, mm); mmi->farheap = length; mmi->mainmem = mmi->nearheap + mmi->farheap; + //printf("far heap ok!\n"); // // detect EMS and allocate up to 64K at page frame // + printf("EMS!\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++) { @@ -602,14 +668,16 @@ void MM_Startup(mminfo_t *mm, mminfotype *mmi) 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("EMS1\n"); +printf("EMS1\n"); MML_SetupEMS(mm); // allocate space +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_UseSpace(mm->EMSpageframe,mm->EMSpagesmapped*0x400, mm); -//printf("EMS3\n"); + //TODO: EMS4! AND EMS 3.2 MASSIVE DATA HANDLMENT! + MML_UseSpace(mm->EMSpageframe,(MAPPAGES)*0x4000lu, mm); +printf("EMS3\n"); MM_MapEMS(mm); // map in used pages -//printf("EMS4\n"); - mmi->EMSmem = mm->EMSpagesmapped*0x4000l; +printf("EMS4\n"); + mmi->EMSmem = (MAPPAGES)*0x4000lu; } // @@ -619,14 +687,14 @@ emsskip: mmi->XMSmem = 0; for(i = 1;i < __argc;i++) { - if( US_CheckParm(__argv[i],ParmStringsexmm) == 0) + 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! if(MML_CheckForXMS(mm)) { -//printf("XMS!\n"); - MML_SetupXMS(mm, mmi); // allocate as many UMBs as possible + printf("XMS!\n"); + //MML_SetupXMS(mm, mmi); // allocate as many UMBs as possible } // @@ -679,8 +747,7 @@ void MM_Shutdown(mminfo_t *mm) void MM_GetPtr(memptr *baseptr,dword size, mminfo_t *mm, mminfotype *mmi) { - mmblocktype far *scan,far *lastscan,far *endscan - ,far *purge,far *next; + mmblocktype huge *scan,huge *lastscan,huge *endscan,huge *purge,huge *next; int search; unsigned needed,startseg; @@ -780,7 +847,7 @@ void MM_GetPtr(memptr *baseptr,dword size, mminfo_t *mm, mminfotype *mmi) void MM_FreePtr(memptr *baseptr, mminfo_t *mm) { - mmblocktype far *scan,far *last; + mmblocktype huge *scan,huge *last; last = mm->mmhead; scan = last->next; @@ -796,7 +863,7 @@ void MM_FreePtr(memptr *baseptr, mminfo_t *mm) if(!scan) { - printf("MM_FreePtr: Block not found!"); + printf("MM_FreePtr: Block not found!\n"); return; } @@ -818,7 +885,7 @@ void MM_FreePtr(memptr *baseptr, mminfo_t *mm) void MM_SetPurge(memptr *baseptr, int purge, mminfo_t *mm) { - mmblocktype far *start; + mmblocktype huge *start; start = mm->mmrover; @@ -857,7 +924,7 @@ void MM_SetPurge(memptr *baseptr, int purge, mminfo_t *mm) void MM_SetLock(memptr *baseptr, boolean locked, mminfo_t *mm) { - mmblocktype far *start; + mmblocktype huge *start; start = mm->mmrover; @@ -896,7 +963,7 @@ void MM_SetLock(memptr *baseptr, boolean locked, mminfo_t *mm) void MM_SortMem(mminfo_t *mm) { - mmblocktype far *scan,far *last,far *next; + mmblocktype huge *scan,huge *last,huge *next; unsigned start,length,source,dest,oldborder; int playing; @@ -1005,12 +1072,13 @@ void MM_SortMem(mminfo_t *mm) ===================== */ -void MM_ShowMemory(mminfo_t *mm) +void MM_ShowMemory(page_t *page, mminfo_t *mm) { - mmblocktype far *scan; - unsigned color,temp;//, i; + mmblocktype huge *scan; + word color,temp; long end,owner; - char scratch[80],str[10]; + word chx,chy; + byte scratch[160],str[16]; //**** VW_SetDefaultColors(); //**** VW_SetLineWidth(40); @@ -1022,9 +1090,12 @@ void MM_ShowMemory(mminfo_t *mm) end = -1; -//CA_OpenDebug (); +CA_OpenDebug (); + + chx=0; + chy=0; - while (scan) + while(scan) { if(scan->attributes & PURGEBITS) color = 5; // dark purple = purgable @@ -1034,34 +1105,66 @@ void MM_ShowMemory(mminfo_t *mm) color = 12; // red = locked if(scan->start<=end) { - printf("MM_ShowMemory: Memory block order currupted!"); + //printf("); + write(debughandle,"\nMM_ShowMemory: Memory block order currupted!\n",strlen("\nMM_ShowMemory: Memory block order currupted!\n")); + //modexprint(&page, chx, chy, 1, 0, 24, "\nMM_ShowMemory: Memory block order currupted!\n"); return; } 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); + //++++ 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 + //for(chx=scan->next->start;chx+4>=(word)end+1;chx+=4) + //{ + 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; + 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("Location:"); -printf("%x\t", scan->start); -strcpy (scratch,"Size:"); -ltoa ((long)scan->length*16,str,10); +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)); -fprintf(stdout, "%s", scratch); +write(debughandle,scratch,strlen(scratch)); +//modexprint(page, chx, chy, 1, 0, 24, &scratch); +chy+=4; +//fprintf(stdout, "%s", scratch); //****#endif scan = scan->next; } -//CA_CloseDebug (); +CA_CloseDebug (); //++++mh IN_Ack(); //**** VW_SetLineWidth(64); @@ -1071,6 +1174,72 @@ fprintf(stdout, "%s", scratch); //========================================================================== +/* +===================== += += MM_DumpData += +===================== +*/ + +void MM_DumpData(mminfo_t *mm) +{ + mmblocktype far *scan,far *best; + long lowest,oldlowest; + word owner; + byte lock,purge; + FILE *dumpfile; + + + free (mm->nearheap); + dumpfile = fopen ("mmdump.txt","w"); + if (!dumpfile){ + printf("MM_DumpData: Couldn't open MMDUMP.TXT!\n"); + return; + } + + lowest = -1; + do + { + oldlowest = lowest; + lowest = 0xffff; + + scan = mm->mmhead; + while (scan) + { + owner = (word)scan->useptr; + + if (owner && owner oldlowest) + { + best = scan; + lowest = owner; + } + + scan = scan->next; + } + + if (lowest != 0xffff) + { + if (best->attributes & PURGEBITS) + purge = 'P'; + else + purge = '-'; + if (best->attributes & LOCKBIT) + lock = 'L'; + else + lock = '-'; + fprintf (dumpfile,"0x%p (%c%c) = %u\n" + ,(word)lowest,lock,purge,best->length); + } + + } while (lowest != 0xffff); + + fclose (dumpfile); + printf("MMDUMP.TXT created.\n"); +} + +//========================================================================== + /* ====================== @@ -1084,8 +1253,8 @@ fprintf(stdout, "%s", scratch); dword MM_UnusedMemory(mminfo_t *mm) { - unsigned free; - mmblocktype far *scan; + dword free; + mmblocktype huge *scan; free = 0; scan = mm->mmhead; @@ -1115,8 +1284,8 @@ dword MM_UnusedMemory(mminfo_t *mm) dword MM_TotalFree(mminfo_t *mm) { - unsigned free; - mmblocktype far *scan; + dword free; + mmblocktype huge *scan; free = 0; scan = mm->mmhead; @@ -1143,15 +1312,16 @@ dword MM_TotalFree(mminfo_t *mm) ===================== */ -void MM_Report(mminfo_t *mm, mminfotype *mmi) +void MM_Report(page_t *page, mminfo_t *mm, mminfotype *mmi) { if(MML_CheckForEMS()) { - printf("EMM %x available\n", mm->EMSVer); + printf("EMM v%x.%x available\n", mm->EMSVer>>4,mm->EMSVer&0x0F); printf("totalEMSpages=%u\n", mm->totalEMSpages); printf("freeEMSpages=%u\n", mm->freeEMSpages); - printf("EMSpageframe=%Fp\n", mm->EMSpageframe); + printf("EMSpageframe=%x\n", mm->EMSpageframe); } + if(MML_CheckForXMS(mm)) printf("XMSaddr=%Fp\n", *XMSaddr); printf("near=%lu\n", mmi->nearheap); printf("far=%lu\n", mmi->farheap); printf("EMSmem=%lu\n", mmi->EMSmem); @@ -1221,3 +1391,33 @@ void MM_FreeBlock(mmblocktype *x, mminfo_t *mm) x->next=mm->mmfree; mm->mmfree=x; } + +void MM_seguin(void) +{ + __asm + { + push ds + mov ax,ds + inc ax + mov ds,ax + } +} + +void MM_segude(void) +{ + __asm + { + pop ds + } +} + +/* +pull data from far and put it into ds var +mov ax,es:si +mov x,ax +*/ +/* +ss stack segment +sp top of stack +bp bottem of stack +*/