X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Fexmmtest.c;h=35701796b5e39ebca32ecb289dd03dc4a1745d05;hb=3baebbddf8e57357bc4c5d3e512c91c8e9c84773;hp=d22774df6d4c83e3f8a3e00da04c6ca0b7f75503;hpb=45151cf05d1815a6bb2c04cb6ef7650d9113df61;p=16.git

diff --git a/src/exmmtest.c b/src/exmmtest.c
old mode 100644
new mode 100755
index d22774df..35701796
--- a/src/exmmtest.c
+++ b/src/exmmtest.c
@@ -1,5 +1,5 @@
 /* Project 16 Source Code~
- * Copyright (C) 2012-2015 sparky4 & pngwen & andrius4669
+ * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover
  *
  * This file is part of Project 16.
  *
@@ -39,11 +39,11 @@
 #define FILERL
 //#define FILEREAD
 
+global_game_variables_t gvar;
+
 void
 main(int argc, char *argv[])
 {
-	global_game_variables_t gvar;
-	mminfo_t mm; mminfotype mmi;
 #ifdef __WATCOMC__
 	__segment sega;
 	void __based(sega)* bigbuffer;
@@ -70,7 +70,7 @@ main(int argc, char *argv[])
 #ifdef FILERL
 	bakapee = malloc(64);
 #endif
-	mm.mmstarted=0;
+	gvar.mm.mmstarted=0;
 
 #ifdef FILERL
 //	printf("filename!: ");
@@ -88,7 +88,7 @@ main(int argc, char *argv[])
 	//screen.height += (16*2);
 
 //	printf("main()=%Fp	start MM\n", *argv[0]);
-	MM_Startup(&mm, &mmi);
+	MM_Startup(&gvar.mm, &gvar.mmi);
 	//PM_Startup();
 	//PM_UnlockMainMem();
 	CA_Startup(&gvar);
@@ -102,13 +102,13 @@ main(int argc, char *argv[])
 #ifdef FILERL
 //	bakapeehandle = open(bakapee,O_RDONLY | O_BINARY, S_IREAD);
 //	printf("size of big buffer~=%u\n", _bmsize(segu, bigbuffer));
-//	if(CA_FarRead(bakapeehandle,(void far *)&bigbuffer,sizeof(bigbuffer),&mm))
+//	if(CA_FarRead(bakapeehandle,(void far *)&bigbuffer,sizeof(bigbuffer),&gvar.mm))
 #ifdef FILEREAD
 	printf("		read\n");
-	if(CA_ReadFile(bakapee, &bigbuffer, &mm))
+	if(CA_ReadFile(bakapee, &bigbuffer, &gvar.mm))
 #else
 	printf("		load\n");
-	if(CA_LoadFile(bakapee, &bigbuffer, &mm, &mmi))
+	if(CA_LoadFile(bakapee, &bigbuffer, &gvar.mm, &gvar.mmi))
 #endif
 		baka=1;
 	else
@@ -119,6 +119,9 @@ main(int argc, char *argv[])
 	printf("size of big buffer~=%u\n", _bmsize(sega, bigbuffer));
 #endif
 #endif
+	printf("press any key to continue!\n");
+	getch();
+	printf("[\n%s\n]\n", bigbuffer);
 	//printf("dark purple = purgable\n");
 	//printf("medium blue = non purgable\n");
 	//printf("red = locked\n");
@@ -126,36 +129,45 @@ main(int argc, char *argv[])
 	getch();
 	//++++modexEnter();
 	//++++modexShowPage(&screen);
-	MM_ShowMemory(&gvar, &mm);
+	MM_ShowMemory(&gvar, &gvar.mm);
 	//getch();
-	MM_DumpData(&mm);
+	MM_DumpData(&gvar.mm);
 	//++++modexLeave();
-	MM_Report(&mm, &mmi);
+	//++++MM_Report(&gvar.mm, &gvar.mmi);
 //	printf("		stop!\n");
 #ifdef FILERL
-	MM_FreePtr(&bigbuffer, &mm);
+	MM_FreePtr(&bigbuffer, &gvar.mm);
 #endif
 	//PM_Shutdown();
 	CA_Shutdown(&gvar);
-	MM_Shutdown(&mm);
+	MM_Shutdown(&gvar.mm);
 //	printf("		done!\n");
 #ifdef FILERL
 	free(bakapee);
 	if(baka) printf("\nyay!\n");
 	else printf("\npoo!\n");
 #endif
-	//printf("bigbuffer=	%Fp\n", bigbuffer);
-	//printf("&bigbuffer=	%Fp\n", &bigbuffer);
-	//printf("bigbuffer=	%04x\n", bigbuffer);
-	//printf("&bigbuffer=	%04x\n", &bigbuffer);
-	//printf("\n\n");
-	//printf("Total free:			%lu\n", (dword)(GetFreeSize()));
-	//printf("Total near free:		%lu\n", (dword)(GetNearFreeSize()));
-	//printf("Total far free:			%lu\n", (dword)(GetFarFreeSize()));
-	//getch();
-//	printf("\n");
+	printf("========================================\n");
+	printf("near=	%Fp ", gvar.mm.nearheap);
+	printf("far=	%Fp", gvar.mm.farheap);
+	printf("\n");
+	printf("&near=	%Fp ", &(gvar.mm.nearheap));
+	printf("&far=	%Fp", &(gvar.mm.farheap));
+	printf("\n");
+	printf("bigb=	%Fp ", bigbuffer);
+	//printf("bigbr=	%04x", bigbuffer);
+	//printf("\n");
+	printf("&bigb=%Fp ", &bigbuffer);
+	//printf("&bigb=%04x", &bigbuffer);
+	printf("\n");
+	printf("========================================\n");
 #ifdef __WATCOMC__
+	printf("Total free:			%lu\n", (dword)(GetFreeSize()));
+	printf("Total near free:		%lu\n", (dword)(GetNearFreeSize()));
+	printf("Total far free:			%lu\n", (dword)(GetFarFreeSize()));
 	heapdump(&gvar);
+	printf("Project 16 emmtest.exe. This is just a test file!\n");
+	printf("version %s\n", VERSION);
 #endif
 	//printf("core left:			%lu\n", (dword)_coreleft());
 	//printf("far core left:			%lu\n", (dword)_farcoreleft());