X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2F16_mm.c;h=38754e10cbbae0f570cec38df1908ae75bc09c69;hb=96e05db3b16f8e7ea67df81250163e0b590c4195;hp=138a31b41580a4077f96c1e87789152036a26198;hpb=364d4b084428eeee1b6c510ff65241d3b92ccc5a;p=16.git

diff --git a/src/lib/16_mm.c b/src/lib/16_mm.c
index 138a31b4..38754e10 100644
--- a/src/lib/16_mm.c
+++ b/src/lib/16_mm.c
@@ -739,7 +739,7 @@ printf("		EMS4\n");
 //
 // detect XMS and get upper memory blocks
 //
-emsskip:/*
+emsskip:
 	mmi->XMSmem = 0;
 	for(i = 1;i < __argc;i++)
 	{
@@ -751,17 +751,13 @@ 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
 	{
 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
+		MML_SetupXMS(mm, mmi);					// allocate as many UMBs as possible
 	}
 
 //
 // allocate the misc buffer
 //
-xmsskip:*/
-/*mmi->nearheap = 0;
-mmi->farheap = 0;
-mmi->EMSmem = 0;*/
-mmi->XMSmem = 0;
+xmsskip:
 	mm->mmrover = mm->mmhead;		// start looking for space after low block
 
 	MM_GetPtr(&(mm->bufferseg),BUFFERSIZE, mm, mmi);
@@ -1208,7 +1204,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;
@@ -1381,7 +1377,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);
@@ -1389,6 +1385,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);
@@ -1563,8 +1561,7 @@ void MM_FreeBlock(mmblocktype *x, mminfo_t *mm)
 
 void MM_seguin(void)
 {
-	__asm
-	{
+	__asm {
 		push	ds
 		mov	ax,ds
 		inc		ax
@@ -1574,8 +1571,7 @@ void MM_seguin(void)
 
 void MM_segude(void)
 {
-	__asm
-	{
+	__asm {
 		pop ds
 	}
 }