From: sparky4 <sparky4@cock.li>
Date: Wed, 22 Jul 2015 12:04:09 +0000 (-0500)
Subject: ASS!!
X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=0f4063088028b30d531256fcb56905a4765c5323;p=16.git

ASS!!
	modified:   DEBUG.TXT
	modified:   MMDUMP.TXT
	new file:   exmmtest.exe
	modified:   makefile
	deleted:    mmtest.exe
	renamed:    src/mmtest.c -> src/exmmtest.c
	modified:   src/lib/16_mm.c
---

diff --git a/DEBUG.TXT b/DEBUG.TXT
index ec1c08ba..ead23ca7 100644
--- a/DEBUG.TXT
+++ b/DEBUG.TXT
@@ -1,4 +1,4 @@
-Seg:a17	Size:1092657440	Owner:0x11c6
-Seg:19cb	Size:-1669231296	Owner:0xc417
-
-MM_ShowMemory: Memory block order currupted!
+Seg:0	Size:88400	Owner:0x0
+Seg:1595	Size:4096	Owner:0x420
+Seg:1a3a	Size:810080	Owner:0x0
+Seg:e000	Size:-917520	Owner:0x0
diff --git a/MMDUMP.TXT b/MMDUMP.TXT
index e69de29b..6d15b6f7 100644
Binary files a/MMDUMP.TXT and b/MMDUMP.TXT differ
diff --git a/exmmtest.exe b/exmmtest.exe
new file mode 100644
index 00000000..bcec52f8
Binary files /dev/null and b/exmmtest.exe differ
diff --git a/makefile b/makefile
index c22da3b1..cd103e73 100644
--- a/makefile
+++ b/makefile
@@ -29,7 +29,7 @@ DOSLIBOBJ = adlib.$(OBJ) midi.$(OBJ) 8254.$(OBJ) 8259.$(OBJ) dos.$(OBJ) cpu.$(OB
 16LIBOBJS = 16_in.$(OBJ) 16_mm.$(OBJ) wcpu.$(OBJ) 16_head.$(OBJ) scroll16.$(OBJ) 16_ca.$(OBJ)
 GFXLIBOBJS = modex16.$(OBJ) bitmap.$(OBJ) planar.$(OBJ) 16text.$(OBJ)
 
-all: 16.exe mmtest.exe test.exe pcxtest.exe test2.exe palettec.exe maptest.exe fmemtest.exe fonttest.exe fontgfx.exe sountest.exe tsthimem.exe inputest.exe
+all: 16.exe exmmtest.exe test.exe pcxtest.exe test2.exe palettec.exe maptest.exe fmemtest.exe fonttest.exe fontgfx.exe sountest.exe tsthimem.exe inputest.exe
 #testemm.exe testemm0.exe fonttes0.exe miditest.exe
 
 #
@@ -96,8 +96,8 @@ maptest.exe: maptest.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) 16.lib
 fmemtest.exe: fmemtest.$(OBJ) 16.lib
 	wcl $(FLAGS) fmemtest.$(OBJ) 16.lib
 
-mmtest.exe: mmtest.$(OBJ) 16.lib
-	wcl $(FLAGS) mmtest.$(OBJ) 16.lib
+exmmtest.exe: exmmtest.$(OBJ) 16.lib
+	wcl $(FLAGS) exmmtest.$(OBJ) 16.lib
 
 #
 #executable's objects
@@ -159,8 +159,8 @@ testemm0.$(OBJ): $(SRC)testemm0.c
 tsthimem.$(OBJ): $(SRC)tsthimem.c
 	wcl $(FLAGS) -c $(SRC)tsthimem.c
 
-mmtest.$(OBJ): $(SRC)mmtest.c
-	wcl $(FLAGS) -c $(SRC)mmtest.c
+exmmtest.$(OBJ): $(SRC)exmmtest.c
+	wcl $(FLAGS) -c $(SRC)exmmtest.c
 
 #
 #non executable objects libraries
diff --git a/mmtest.exe b/mmtest.exe
deleted file mode 100644
index 263dbf6d..00000000
Binary files a/mmtest.exe and /dev/null differ
diff --git a/src/mmtest.c b/src/exmmtest.c
similarity index 97%
rename from src/mmtest.c
rename to src/exmmtest.c
index 6f635844..690851f0 100644
--- a/src/mmtest.c
+++ b/src/exmmtest.c
@@ -23,14 +23,14 @@
 	exmm test
 */
 #include <stdio.h>
-#include <dos.h>
+#include <bios.h>
 
 #include "src/lib/16_head.h"
 #include "src/lib/16_ca.h"
 #include "src/lib/16_mm.h"
 //#include "src/lib/modex16.h"
 
-#define FILERL
+//#define FILERL
 //#define FILEINIT
 
 void
@@ -114,4 +114,5 @@ main(int argc, char *argv[])
 	if(baka) printf("\nyay!\n");
 	else printf("\npoo!\n");
 #endif
+	printf("_bios_memsize=%u\n", _bios_memsize());
 }
diff --git a/src/lib/16_mm.c b/src/lib/16_mm.c
index bf7536fc..b1a56ad4 100644
--- a/src/lib/16_mm.c
+++ b/src/lib/16_mm.c
@@ -705,7 +705,7 @@ void MM_Startup(mminfo_t *mm, mminfotype *mmi)
 //
 //----	length=farcoreleft();
 	//printf("		farheap making!\n");
-	_fheapgrow();
+	/*_fheapgrow();
 	length=0xff;//UL*4UL;//_memavl();
 	start = mm->farheap = halloc(length, sizeof(byte));
 	//start = mm->farheap = _fmalloc(length);
@@ -713,8 +713,8 @@ void MM_Startup(mminfo_t *mm, mminfotype *mmi)
 	length -= SAVEFARHEAP;
 	seglength = length / 16;			// now in paragraphs
 	segstart = FP_SEG(start)+(FP_OFF(start)+15)/16;
-	MML_UseSpace(segstart,seglength, mm);
-	mmi->farheap = length;
+	MML_UseSpace(segstart,seglength, mm);*/
+	mmi->farheap = 0;//length;
 	mmi->mainmem = mmi->nearheap + mmi->farheap;
 	/*switch( _fheapchk() ) {
 		case _HEAPOK: