X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_mm.c;h=1ae9e65ab9f94e24f706f0eded02541424963b6a;hb=9ada0e848c6a1a951a4325d66532282e00238d17;hp=8a64d1055e8c8a019e11a8ef6f5c523cdd88fb7d;hpb=62cbd212900e125c2f8470a5ef85fe80938e1efa;p=16.git

diff --git a/src/lib/16_mm.c b/src/lib/16_mm.c
index 8a64d105..1ae9e65a 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
@@ -174,7 +175,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]
@@ -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,9 +455,8 @@ 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;
-	//word segm=0;
 	dword		extra;
 
 	scan = last = mm->mmhead;
@@ -440,13 +471,16 @@ void MML_UseSpace(/*d*/word segstart, dword seglength, mminfo_t *mm)
 		scan = scan->next;
 	}
 
-//
-// take the given range out of the block
-//
-	oldend = scan->start + scan->length;
-	extra = oldend - (segstart+seglength);
+	//find out how many blocks it spans!
+	if(seglength>0xffffu)
+	{
+//		segm=seglength/0x4000u;
+		segm=seglength/0xffffu;
+	}
+	else segm=1;
+
 	//++++emsver stuff!
-	if(extra>0xfffflu)
+	if(segm>1/*extra>0xfffflu*/)
 	{
 		/*__asm
 		{
@@ -455,10 +489,7 @@ void MML_UseSpace(/*d*/word segstart, dword seglength, mminfo_t *mm)
 			inc		ax
 			mov	ds,ax
 		}*/
-printf("extra=%lu	", extra);
-printf("oldend=%lu	", oldend);
-printf("length=%lu	", scan->length);
-printf("seglength=%lu\n", seglength);
+
 
 //MML_UseSpace(?segstart?, ?length?, mm);
 
@@ -469,6 +500,19 @@ printf("seglength=%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);
@@ -543,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;
 
@@ -569,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;
@@ -583,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
@@ -597,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;
@@ -607,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");
 
 
 //
@@ -643,11 +687,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
 	}
 
 //
@@ -1028,9 +1072,9 @@ void MM_SortMem(mminfo_t *mm)
 void MM_ShowMemory(mminfo_t *mm)
 {
 	mmblocktype huge *scan;
-	unsigned color,temp;//, i;
+	unsigned color,temp;
 	long	end,owner;
-	char    scratch[80],str[10];
+	char    scratch[160],str[16];
 
 //****	VW_SetDefaultColors();
 //****	VW_SetLineWidth(40);
@@ -1044,7 +1088,7 @@ void MM_ShowMemory(mminfo_t *mm)
 
 //CA_OpenDebug ();
 
-	while (scan)
+	while(scan)
 	{
 		if(scan->attributes & PURGEBITS)
 			color = 5;		// dark purple = purgable
@@ -1054,7 +1098,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;
@@ -1064,9 +1108,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");