X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_mm.c;h=f03d56a1ae306b95c0f91a333d4af7830f07ec1c;hb=cf3bed60e91dc628e3bb76aaae3f0f8222ac3c38;hp=3ee4fc5fa70372d5d44b11fba3cdb9f0ad1307f5;hpb=93cdaef09e5ffb919360c46a621d1338bba0d82c;p=16.git

diff --git a/src/lib/16_mm.c b/src/lib/16_mm.c
index 3ee4fc5f..f03d56a1 100644
--- a/src/lib/16_mm.c
+++ b/src/lib/16_mm.c
@@ -174,7 +174,7 @@ unsigned MML_SetupEMS(mminfo_t *mm)
 		mov	[freeEMSpages],bx
 		or	bx,bx
 		jz	noEMS						// no EMS at all to allocate
-//++++EXPAND DONG!!!!
+											//EXPAND DONG!!!!
 		cmp	[EMSVer],0x40
 		jb	low
 		cmp	bx,[freeEMSpages]
@@ -341,7 +341,7 @@ boolean MML_CheckForXMS(mminfo_t *mm)
 
 void MML_SetupXMS(mminfo_t *mm, mminfotype *mmi)
 {
-	word	base,size;
+	unsigned	base,size;
 
 getmemory:
 	__asm
@@ -371,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;
@@ -419,16 +420,17 @@ void MML_ShutdownXMS(mminfo_t *mm)
 ======================
 */
 
-void MML_UseSpace(unsigned segstart, dword seglength, mminfo_t *mm)
+void MML_UseSpace(/*d*/word segstart, dword seglength, mminfo_t *mm)
 {
 	mmblocktype huge *scan,huge *last;
 	dword	oldend;
-	dword fat=0;
-	word segm=0;
+	///*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
@@ -439,6 +441,12 @@ void MML_UseSpace(unsigned segstart, dword 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
 //
@@ -447,12 +455,26 @@ void MML_UseSpace(unsigned segstart, dword seglength, mminfo_t *mm)
 	//++++emsver stuff!
 	if(extra>0xfffflu)
 	{
-		segm=(extra%(0xfffflu))-1;
-		fat=segm*(0xfffflu);
-		extra-=fat;
-//printf("extra=%lu	", extra);
-//printf("segm=%lu\n", segm);
-		printf("MML_UseSpace: Segment spans two blocks!\n");
+		/*__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:
@@ -469,7 +491,7 @@ void MML_UseSpace(unsigned segstart, dword seglength, mminfo_t *mm)
 
 //	segm--;
 
-	if(0xfffflu > extra > 0)
+	if(extra > 0)
 	{
 		MM_GetNewBlock(mm);
 		mm->mmnew->next = scan->next;
@@ -598,7 +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!
+	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++)
 	{
@@ -612,11 +634,11 @@ void MM_Startup(mminfo_t *mm, mminfotype *mmi)
 		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!
 		//TODO: EMS4! AND EMS 3.2 MASSIVE DATA HANDLMENT!
-		MML_UseSpace(mm->EMSpageframe,((dword)mm->EMSpagesmapped)*0x4000lu, mm);
+		MML_UseSpace(mm->EMSpageframe,(/*++++mm->EMSpagesmapped++++*/4)*0x4000lu, mm);
 //printf("EMS3\n");
 		MM_MapEMS(mm);					// map in used pages
 //printf("EMS4\n");
-		mmi->EMSmem = ((dword)mm->EMSpagesmapped)*0x4000lu;
+		mmi->EMSmem = (/*++++mm->EMSpagesmapped++++*/4)*0x4000lu;
 	}
 
 //
@@ -632,8 +654,8 @@ emsskip:
 //	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
 	}
 
 //
@@ -1016,7 +1038,7 @@ void MM_ShowMemory(mminfo_t *mm)
 	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);
@@ -1030,7 +1052,7 @@ void MM_ShowMemory(mminfo_t *mm)
 
 //CA_OpenDebug ();
 
-	while (scan)
+	while(scan)
 	{
 		if(scan->attributes & PURGEBITS)
 			color = 5;		// dark purple = purgable
@@ -1040,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;
@@ -1050,9 +1072,11 @@ 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:");
+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");
@@ -1158,7 +1182,7 @@ void MM_Report(mminfo_t *mm, mminfotype *mmi)
 		printf("freeEMSpages=%u\n", mm->freeEMSpages);
 		printf("EMSpageframe=%x\n", mm->EMSpageframe);
 	}
-	if(MML_CheckForXMS(mm)) printf("XMSaddr=%x\n", *XMSaddr);
+	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);
@@ -1228,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
+*/