X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_mm.c;h=cc8f9284d2b0abe537b671316abaae27a8c2fda0;hb=dae38738bd8f69f329d0ad51a7728c9abff073df;hp=e738cad5e6fa186bf161f3b638cd23052c051327;hpb=1e6ea7c0ae09578fb11557868bd0551e4f19a12c;p=16.git diff --git a/src/lib/16_mm.c b/src/lib/16_mm.c index e738cad5..cc8f9284 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",""}; /* @@ -190,7 +174,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 @@ -351,18 +343,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 +371,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,14 +420,17 @@ 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; + dword oldend; + ///*d*/word fat=0; + dword extra; scan = last = mm->mmhead; mm->mmrover = mm->mmhead; // reset rover to start of memory + scan->segm=1; + scan->segmlen=seglength; // // search for the block that contains the range of segments @@ -446,18 +441,45 @@ void MML_UseSpace(unsigned segstart, unsigned seglength, mminfo_t *mm) scan = scan->next; } + //find out how many blocks it span! + if(seglength>0xfffflu) + { + scan->segm=seglength/0xfffflu; + } + // // take the given range out of the block // oldend = scan->start + scan->length; extra = oldend - (segstart+seglength); - if(extra < 0) + //++++emsver stuff! + if(extra>0xfffflu) { - printf("MML_UseSpace: Segment spans two blocks!"); - return; + /*__asm + { + push ds + mov ax,ds + inc ax + mov ds,ax + }*/ +printf("segm=%u ", scan->segm); +printf("ex=%lu ", extra); +printf("len=%u ", scan->length); +printf("segsta=%u ", segstart); +printf("seglen=%lu\n", seglength); + +//MML_UseSpace(?segstart?, ?length?, mm); + + /*__asm + { + pop ds + }*/ + //printf("MML_UseSpace: Segment spans two blocks!\n"); } - +//segu: +//++++todo: linked list of segment! +//printf("segm=%lu\n", segm); if(segstart == scan->start) { last->next = scan->next; // unlink block @@ -467,6 +489,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 +499,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 +517,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 +531,7 @@ void MML_ClearBlock(mminfo_t *mm) scan = scan->next; } - printf("MM_ClearBlock: No purgable blocks!"); + printf("MM_ClearBlock: No purgable blocks!\n"); } @@ -527,8 +551,8 @@ void MML_ClearBlock(mminfo_t *mm) void MM_Startup(mminfo_t *mm, mminfotype *mmi) { int i; - dword length; - void far *start; + dword length;//,farlen; + void huge *start; unsigned segstart,seglength,endfree; if(mm->mmstarted) @@ -553,11 +577,12 @@ void MM_Startup(mminfo_t *mm, mminfotype *mmi) MM_GetNewBlock(mm); mm->mmhead = mm->mmnew; // this will allways be the first node mm->mmnew->start = 0; - mm->mmnew->length = 0xffff; + mm->mmnew->length = 0xffff; //todo: mm make it fucking massive as fuck!~ mm->mmnew->attributes = LOCKBIT; mm->mmnew->next = NULL; mm->mmrover = mm->mmhead; +// farlen=_bios_memsize()*1024; // // get all available near conventional memory segments @@ -565,7 +590,7 @@ 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; @@ -580,7 +605,9 @@ void MM_Startup(mminfo_t *mm, mminfotype *mmi) //---- length=farcoreleft(); _fheapgrow(); length=_memavl(); - start = mm->farheap = _fmalloc(length); + //length-=farlen; + start = mm->farheap = halloc(length, sizeof(dword)); + //start = mm->farheap = _fmalloc(length); length -= 16-(FP_OFF(start)&15); length -= SAVEFARHEAP; seglength = length / 16; // now in paragraphs @@ -593,6 +620,7 @@ void MM_Startup(mminfo_t *mm, mminfotype *mmi) // // 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++) { @@ -605,11 +633,12 @@ void MM_Startup(mminfo_t *mm, mminfotype *mmi) //printf("EMS1\n"); MML_SetupEMS(mm); // allocate space 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); + //TODO: EMS4! AND EMS 3.2 MASSIVE DATA HANDLMENT! + MML_UseSpace(mm->EMSpageframe,(mm->EMSpagesmapped)*0x4000lu, mm); //printf("EMS3\n"); MM_MapEMS(mm); // map in used pages //printf("EMS4\n"); - mmi->EMSmem = mm->EMSpagesmapped*0x4000l; + mmi->EMSmem = (mm->EMSpagesmapped)*0x4000lu; } // @@ -619,13 +648,13 @@ 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! +// 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"); + printf("XMS!\n"); MML_SetupXMS(mm, mmi); // allocate as many UMBs as possible } @@ -679,8 +708,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 +808,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; @@ -818,7 +846,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 +885,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 +924,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; @@ -1007,10 +1035,10 @@ void MM_SortMem(mminfo_t *mm) void MM_ShowMemory(mminfo_t *mm) { - mmblocktype far *scan; + mmblocktype huge *scan; unsigned color,temp;//, i; long end,owner; - char scratch[80],str[10]; + char scratch[160],str[16]; //**** VW_SetDefaultColors(); //**** VW_SetLineWidth(40); @@ -1024,7 +1052,7 @@ void MM_ShowMemory(mminfo_t *mm) //CA_OpenDebug (); - while (scan) + while(scan) { if(scan->attributes & PURGEBITS) color = 5; // dark purple = purgable @@ -1034,7 +1062,7 @@ void MM_ShowMemory(mminfo_t *mm) color = 12; // red = locked if(scan->start<=end) { - printf("MM_ShowMemory: Memory block order currupted!"); + printf("\nMM_ShowMemory: Memory block order currupted!\n"); return; } end = scan->start+scan->length-1; @@ -1044,10 +1072,12 @@ void MM_ShowMemory(mminfo_t *mm) //++++ VW_Hlin(end+1,scan->next->start,0,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,"Location:"); +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; @@ -1084,8 +1114,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 +1145,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; @@ -1150,8 +1180,9 @@ void MM_Report(mminfo_t *mm, mminfotype *mmi) printf("EMM %x available\n", mm->EMSVer); 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 +1252,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 +*/