From: sparky4 <sparky4@cock.li>
Date: Tue, 21 Jul 2015 13:43:31 +0000 (-0500)
Subject: ok!
X-Git-Url: http://4ch.mooo.com/gitweb/?p=16.git;a=commitdiff_plain;h=2b50163c4c1f5925bc21dcb475f3f5468a8e854b

ok!
	modified:   exmmtest.exe
	modified:   src/lib/16_mm.c
	modified:   src/lib/16_mm.h
---

diff --git a/exmmtest.exe b/exmmtest.exe
index 8903757d..921a7225 100644
Binary files a/exmmtest.exe and b/exmmtest.exe differ
diff --git a/src/lib/16_mm.c b/src/lib/16_mm.c
index 24f78c5b..3d81976c 100644
--- a/src/lib/16_mm.c
+++ b/src/lib/16_mm.c
@@ -372,6 +372,7 @@ char	str[80];//,str2[10];
 	}
 	return 0;
 */
+	return 0;
 }
 
 //==========================================================================
@@ -499,7 +500,7 @@ void MML_ShutdownXMS(mminfo_t *mm)
 void MML_UseSpace(/*d*/word segstart, dword seglength, mminfo_t *mm)
 {
 	mmblocktype huge *scan,huge *last;
-	word		segm;
+	//word		segm;
 	dword	oldend;
 	dword		extra;
 
@@ -518,13 +519,13 @@ void MML_UseSpace(/*d*/word segstart, dword seglength, mminfo_t *mm)
 	//find out how many blocks it spans!
 	if(seglength>0xffffu)
 	{
-//		segm=seglength/0x4000u;
-		segm=seglength/0xffffu;
+//		scan->segm=seglength/0x4000u;
+		scan->segm=seglength/0xffffu;
 	}
-	else segm=1;
+	else scan->segm=1;
 
 	//++++emsver stuff!
-	if(segm>1/*extra>0xfffflu*/)
+	if(scan->segm>1/*extra>0xfffflu*/)
 	{
 		/*__asm
 		{
@@ -550,7 +551,7 @@ void MML_UseSpace(/*d*/word segstart, dword seglength, mminfo_t *mm)
 	oldend = scan->start + scan->length;
 	extra = oldend - (segstart+seglength);
 
-printf("segm=%u	", segm);
+printf("segm=%u	", scan->segm);
 printf("ex=%lu	", extra);
 printf("start+seglen=%lu	", segstart+seglength);
 printf("len=%u	", scan->length);
diff --git a/src/lib/16_mm.h b/src/lib/16_mm.h
index 2981a1a3..13b6b5e9 100644
--- a/src/lib/16_mm.h
+++ b/src/lib/16_mm.h
@@ -122,7 +122,7 @@ typedef struct mmblockstruct
 	//dword	start,length;
 	//word	start;
 	//dword length;
-	//byte segm;				//how many 64kb segment blocks it takes up if there is many data!
+	word segm;				//how many 64kb segment blocks it takes up if there is many data!
 	unsigned	attributes;
 	memptr		*useptr;	// pointer to the segment start
 	struct mmblockstruct huge *next;
@@ -133,7 +133,6 @@ typedef struct
 {
 	memptr bufferseg;
 	boolean		mmstarted, bombonerror, mmerror;
-	word segm;
 	void huge	*farheap;
 	void		*nearheap;
 	//byte		EMS_status;