X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_mm.c;h=524d7ae53892768a0012249766823faea0c689c2;hb=b74047609032f3e2c97d7afca3c63177005c5366;hp=f6477b4d7c6ec54d5805d2f0be42cbe42f71c805;hpb=2fa06f324b3d3f955a4f6dc59bc9eb57e0ca22a6;p=16.git

diff --git a/src/lib/16_mm.c b/src/lib/16_mm.c
index f6477b4d..524d7ae5 100644
--- a/src/lib/16_mm.c
+++ b/src/lib/16_mm.c
@@ -83,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
@@ -269,7 +270,7 @@ unsigned MM_MapEMS(mminfo_t *mm)
 	union REGS CPURegs;
 	EMShandle=mm->EMShandle;
 
-	for (i=0;i<mm->EMSpagesmapped;i++)
+	for (i=0;i<4/*mm->EMSpagesmapped*/;i++)
 	{
 		__asm
 		{
@@ -291,13 +292,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)
+{
+
+}
+
 //==========================================================================
 
 /*
@@ -423,14 +455,12 @@ void MML_ShutdownXMS(mminfo_t *mm)
 void MML_UseSpace(/*d*/word segstart, dword seglength, mminfo_t *mm)
 {
 	mmblocktype huge *scan,huge *last;
+	word		segm;
 	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
@@ -441,19 +471,16 @@ void MML_UseSpace(/*d*/word segstart, dword seglength, mminfo_t *mm)
 		scan = scan->next;
 	}
 
-	//find out how many blocks it span!
-	if(seglength>0xfffflu)
+	//find out how many blocks it spans!
+	if(seglength>0xffffu)
 	{
-		scan->segm=seglength/0xfffflu;
+//		segm=seglength/0x4000u;
+		segm=seglength/0xffffu;
 	}
+	else segm=1;
 
-//
-// take the given range out of the block
-//
-	oldend = scan->start + scan->length;
-	extra = oldend - (segstart+seglength);
 	//++++emsver stuff!
-	if(extra>0xfffflu)
+	if(segm>1/*extra>0xfffflu*/)
 	{
 		/*__asm
 		{
@@ -462,11 +489,7 @@ void MML_UseSpace(/*d*/word segstart, dword seglength, mminfo_t *mm)
 			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);
 
@@ -477,6 +500,19 @@ printf("seglen=%lu\n", seglength);
 		//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);
+
+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);
@@ -551,7 +587,7 @@ void MML_ClearBlock(mminfo_t *mm)
 void MM_Startup(mminfo_t *mm, mminfotype *mmi)
 {
 	int i;
-	dword length;//,farlen;
+	dword length;
 	void huge	*start;
 	unsigned	segstart,seglength,endfree;
 
@@ -577,7 +613,7 @@ 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;			//todo: mm make it fucking massive as fuck!~
+	mm->mmnew->length = 0xffff;
 	mm->mmnew->attributes = LOCKBIT;
 	mm->mmnew->next = NULL;
 	mm->mmrover = mm->mmhead;
@@ -591,13 +627,13 @@ void MM_Startup(mminfo_t *mm, mminfotype *mmi)
 	_nheapgrow();
 	length=_memavl();
 	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
@@ -605,8 +641,7 @@ void MM_Startup(mminfo_t *mm, mminfotype *mmi)
 //----	length=farcoreleft();
 	_fheapgrow();
 	length=_memavl();
-	//length-=farlen;
-	start = mm->farheap = halloc(length, sizeof(dword));
+	start = mm->farheap = halloc(length, sizeof(byte));
 	//start = mm->farheap = _fmalloc(length);
 	length -= 16-(FP_OFF(start)&15);
 	length -= SAVEFARHEAP;
@@ -615,6 +650,7 @@ 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");
 
 
 //
@@ -630,15 +666,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!
 		//TODO: EMS4! AND EMS 3.2 MASSIVE DATA HANDLMENT!
-		MML_UseSpace(mm->EMSpageframe,(mm->EMSpagesmapped)*0x4000lu, mm);
-//printf("EMS3\n");
+		MML_UseSpace(mm->EMSpageframe,(MAPPAGES)*0x4000lu, mm);
+printf("EMS3\n");
 		MM_MapEMS(mm);					// map in used pages
-//printf("EMS4\n");
-		mmi->EMSmem = (mm->EMSpagesmapped)*0x4000lu;
+printf("EMS4\n");
+		mmi->EMSmem = (MAPPAGES)*0x4000lu;
 	}
 
 //
@@ -651,11 +688,11 @@ 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
+		//MML_SetupXMS(mm, mmi);					// allocate as many UMBs as possible
 	}
 
 //
@@ -1033,12 +1070,13 @@ void MM_SortMem(mminfo_t *mm)
 =====================
 */
 
-void MM_ShowMemory(mminfo_t *mm)
+void MM_ShowMemory(page_t *page, mminfo_t *mm)
 {
 	mmblocktype huge *scan;
-	unsigned color,temp;//, i;
+	unsigned color,temp;
 	long	end,owner;
-	char    scratch[80],str[10];
+	word chx,chy;
+	char    scratch[160],str[16];
 
 //****	VW_SetDefaultColors();
 //****	VW_SetLineWidth(40);
@@ -1050,7 +1088,10 @@ void MM_ShowMemory(mminfo_t *mm)
 
 	end = -1;
 
-//CA_OpenDebug ();
+CA_OpenDebug ();
+
+	chx=0;
+	chy=0;
 
 	while(scan)
 	{
@@ -1062,20 +1103,29 @@ void MM_ShowMemory(mminfo_t *mm)
 			color = 12;		// red = locked
 		if(scan->start<=end)
 		{
-			printf("scan->start=%d\n", scan->start);
-			printf("MM_ShowMemory: Memory block order currupted!\n");
+			//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;
+				modexhlin(page, scan->start, (unsigned)end, chy, color);
 //++++		VW_Hlin(scan->start,(unsigned)end,0,color);
+//void VW_Plot(unsigned x, unsigned y, unsigned color);
+//void VW_Hlin(unsigned xl, unsigned xh, unsigned y, unsigned color);
+
 //++++		VW_Plot(scan->start,0,15);
+				modexputPixel(page, scan->start, chy, 15);
 		if(scan->next->start > end+1)
 //++++			VW_Hlin(end+1,scan->next->start,0,0);	// black = free
+					modexhlin(page, end+1,scan->next->start, chy, color);
 
 //****#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,"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");
@@ -1083,14 +1133,16 @@ 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);
@@ -1098,6 +1150,72 @@ fprintf(stdout, "%s", scratch);
 }
 //****#endif
 
+//==========================================================================
+
+/*
+=====================
+=
+= MM_DumpData
+=
+=====================
+*/
+
+void MM_DumpData(mminfo_t *mm)
+{
+	mmblocktype far *scan,far *best;
+	long	lowest,oldlowest;
+	unsigned	owner;
+	char	lock,purge;
+	FILE	*dumpfile;
+
+
+	free (mm->nearheap);
+	dumpfile = fopen ("mmdump.txt","w");
+	if (!dumpfile){
+		printf("MM_DumpData: Couldn't open MMDUMP.TXT!");
+		return;
+	}
+
+	lowest = -1;
+	do
+	{
+		oldlowest = lowest;
+		lowest = 0xffff;
+
+		scan = mm->mmhead;
+		while (scan)
+		{
+			owner = (unsigned)scan->useptr;
+
+			if (owner && owner<lowest && 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"
+			,(unsigned)lowest,lock,purge,best->length);
+		}
+
+	} while (lowest != 0xffff);
+
+	fclose (dumpfile);
+	printf("MMDUMP.TXT created.");
+}
+
 //==========================================================================
 
 
@@ -1172,11 +1290,11 @@ 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=%x\n", mm->EMSpageframe);