From: sparky4 <sparky4@cock.li>
Date: Thu, 2 Jul 2015 20:52:10 +0000 (-0500)
Subject: wwww
X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=1f684b0fcb66f1d186999ab4a6a10328e1104b37;p=16.git

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

diff --git a/exmmtest.exe b/exmmtest.exe
index b5f310fe..a5e30074 100644
Binary files a/exmmtest.exe and b/exmmtest.exe differ
diff --git a/src/exmmtest.c b/src/exmmtest.c
index e0904292..61d77a30 100644
--- a/src/exmmtest.c
+++ b/src/exmmtest.c
@@ -49,7 +49,7 @@ main(int argc, char *argv[])
 	else baka=0;
 	//MM_GetPtr(&bigbuffer, mmi.nearheap, &mm, &mmi);
 	//hmm functions in cache system use the buffered stuff
-	printf("size of big buffer~=%ul\n", _bmsize(segu, bigbuffer));
+	printf("size of big buffer~=%u\n", _bmsize(segu, bigbuffer));
 	MM_ShowMemory(&mm);
 	MM_Report(&mm, &mmi);
 	printf("stop!\n");
@@ -57,6 +57,7 @@ main(int argc, char *argv[])
 	MM_Shutdown(&mm);
 	printf("done!\n");
 	free(bakapee);
+	//printf("_bios_memsize=%u\n", _bios_memsize());
 	if(baka) printf("\nyay!\n");
 	else printf("\npoo!\n");
 }
diff --git a/src/lib/16_mm.c b/src/lib/16_mm.c
index 492a5119..3fad748b 100644
--- a/src/lib/16_mm.c
+++ b/src/lib/16_mm.c
@@ -511,7 +511,7 @@ void MML_ClearBlock(mminfo_t *mm)
 void MM_Startup(mminfo_t *mm, mminfotype *mmi)
 {
 	int i;
-	dword length;
+	dword length;//,farlen;
 	void huge	*start;
 	unsigned	segstart,seglength,endfree;
 
@@ -542,6 +542,7 @@ void MM_Startup(mminfo_t *mm, mminfotype *mmi)
 	mm->mmnew->next = NULL;
 	mm->mmrover = mm->mmhead;
 
+//	farlen=_bios_memsize()*1024;
 
 //
 // get all available near conventional memory segments
@@ -564,6 +565,7 @@ void MM_Startup(mminfo_t *mm, mminfotype *mmi)
 //----	length=farcoreleft();
 	_fheapgrow();
 	length=_memavl();
+	//length-=farlen;
 	start = mm->farheap = halloc(length, 1);
 	//start = mm->farheap = _fmalloc(length);
 	length -= 16-(FP_OFF(start)&15);
diff --git a/src/lib/16_mm.h b/src/lib/16_mm.h
index fb99af1d..bef21c03 100644
--- a/src/lib/16_mm.h
+++ b/src/lib/16_mm.h
@@ -23,6 +23,7 @@
 
 #include <string.h>
 #include <malloc.h>
+//#include <bios.h>
 #include "src/lib/16_head.h"
 //++++mh	#include "src/lib/16_in.h"