From: sparky4 <sparky4@cock.li>
Date: Tue, 21 Jul 2015 21:34:03 +0000 (-0500)
Subject: hmmm buggy file loading....
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=1df785756c72384792b0e3ef57f5f9f3f84507c3;p=proj16%2F16.git

hmmm buggy file loading....
	modified:   DEBUG.TXT
	modified:   MMDUMP.TXT
	modified:   exmmtest.exe
	modified:   src/exmmtest.c
	modified:   src/lib/16_mm.c
---

diff --git a/DEBUG.TXT b/DEBUG.TXT
index e324c609..bc6b5dd0 100644
--- a/DEBUG.TXT
+++ b/DEBUG.TXT
@@ -1,6 +1,6 @@
-Seg:0	Size:92208	Owner:0x5b92
-Seg:1683	Size:4096	Owner:0x7298
-Seg:1cad	Size:8752	Owner:0xf686
-Seg:5ece	Size:529184	Owner:0xfe
+Seg:0	Size:92176	Owner:0xfe5e
+Seg:1681	Size:4096	Owner:0x7298
+Seg:1caf	Size:8752	Owner:0x80
+Seg:5ed0	Size:529152	Owner:0x80
 
 MM_ShowMemory: Memory block order currupted!
diff --git a/MMDUMP.TXT b/MMDUMP.TXT
index eb2546ba..b1326e93 100644
Binary files a/MMDUMP.TXT and b/MMDUMP.TXT differ
diff --git a/exmmtest.exe b/exmmtest.exe
index c60cd9c8..ef66fe39 100644
Binary files a/exmmtest.exe and b/exmmtest.exe differ
diff --git a/src/exmmtest.c b/src/exmmtest.c
index b0629790..1e40e9b9 100644
--- a/src/exmmtest.c
+++ b/src/exmmtest.c
@@ -39,7 +39,9 @@ main(int argc, char *argv[])
 	word baka;
 	page_t screen;
 
-	bakapee = _nmalloc(64);
+	printf("&main()=%Fp\n", *argv[0]);
+
+	bakapee = malloc(64);
 //	memset(bakapee, 0, 64);
 	mm.mmstarted=0;
 
diff --git a/src/lib/16_mm.c b/src/lib/16_mm.c
index a21c55dc..1bd9866a 100644
--- a/src/lib/16_mm.c
+++ b/src/lib/16_mm.c
@@ -667,8 +667,8 @@ void MM_Startup(mminfo_t *mm, mminfotype *mmi)
 //
 	printf("		nearheap making!\n");
 //----	length=coreleft();
-	_nheapgrow();
-	length=_memavl();
+	//_nheapgrow();
+	length=_memmax();
 	start = (void huge *)(mm->nearheap = _nmalloc(length));
 	length -= 16-(FP_OFF(start)&15);
 	length -= SAVENEARHEAP;