X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Fexmmtest.c;h=f68d148e99bb4e1e2bff099a8cf7d50a796f985d;hb=a4d644c938b7c09f23cdbee5b42a3b524f781a41;hp=f958283223b07ceac26763fded533a298c70ad0c;hpb=9bd9229921a81b5bd735a2fbf464288400c62503;p=16.git

diff --git a/src/exmmtest.c b/src/exmmtest.c
index f9582832..f68d148e 100755
--- a/src/exmmtest.c
+++ b/src/exmmtest.c
@@ -23,11 +23,11 @@
 	exmm test
 */
 #include "src/lib/16_head.h"
+#include "src/lib/16_tail.h"
 #include "src/lib/16_pm.h"
 #include "src/lib/16_ca.h"
 #include "src/lib/16_mm.h"
 #include "src/lib/16_hc.h"
-#include "src/lib/16_lib.h"
 //#include "src/lib/modex16.h"
 #pragma hdrstop
 
@@ -62,12 +62,13 @@ void segatesuto()
 //	getch();
 }
 #endif
+//static global_game_variables_t gvar;
 
 void
 main(int argc, char *argv[])
 {
 	byte w=1;
-	global_game_variables_t gvar;
+	static global_game_variables_t gvar;
 #ifdef __WATCOMC__
 	__segment sega;
 #endif
@@ -86,7 +87,7 @@ main(int argc, char *argv[])
 	//file name //
 
 	gvar.mm.mmstarted=0;
-	pmdebug=0;
+	dbg_debugpm=1;	//debug pm
 
 	//PRINTBB
 	if(argv[1]){ bakapee1 = argv[1];
@@ -98,15 +99,19 @@ main(int argc, char *argv[])
 	}
 	//printf("main()=%Fp	start MM\n", *argv[0]);
 	MM_Startup(&gvar);
-	if(pmdebug>0)
+	//printf("ok\n");
+//#ifdef __WATCOMC__
+	if(dbg_debugpm>0)
 	{
 		PM_Startup(&gvar);
-		PM_CheckMainMem(&gvar);
+		//printf("pmstarted ok\n");
+		//PM_CheckMainMem(&gvar);
 		PM_UnlockMainMem(&gvar);
 	}
+//#endif
 	CA_Startup(&gvar);
 //	printf("		done!\n");
-	PRINTBB;
+	//0000PRINTBB;
 //	printf("press any key to continue!\n");
 //	getch();
 #ifdef FILEREAD
@@ -136,11 +141,8 @@ for(w=0;w<2;w++)
 	//printf("dark purple = purgable\n");
 	//printf("medium blue = non purgable\n");
 	//printf("red = locked\n");
-	printf("press any key to continue!\n");
-	getch();
-	MM_ShowMemory(&gvar);
-	MM_DumpData(&gvar);
-	MM_Report_(&gvar);
+//	printf("press any key to continue!\n");
+//	DebugMemory_(&gvar, 1);
 	if(baka) printf("\nyay!\n");
 	else printf("\npoo!\n");
 	printf("press any key to continue!\n");
@@ -148,11 +150,16 @@ for(w=0;w<2;w++)
 #ifdef FILEREAD
 }
 #endif
-	printf("bakapee1=%s\n", bakapee1);
-	printf("bakapee2=%s\n", bakapee2);
+	DebugMemory_(&gvar, 1);
+	MM_DumpData(&gvar);
+	MM_Report_(&gvar);
+	//printf("bakapee1=%s\n", bakapee1);
+	//printf("bakapee2=%s\n", bakapee2);
 	MM_FreePtr(&bigbuffer, &gvar);
-	if(pmdebug>0)
+//#ifdef __WATCOMC__
+	if(dbg_debugpm>0)
 		PM_Shutdown(&gvar);
+//#endif
 	CA_Shutdown(&gvar);
 	MM_Shutdown(&gvar);
 	free(bakapee1); free(bakapee2);
@@ -170,12 +177,12 @@ for(w=0;w<2;w++)
 	printf("&bigb=%Fp ", &bigbuffer);
 	//printf("&bigb=%04x", &bigbuffer);
 	printf("\n");
-#endif
 	printf("========================================\n");
+#endif
 #ifdef __WATCOMC__
 //this is far	printf("Total free:			%lu\n", (dword)(GetFreeSize()));
-	printf("Total near free:		%lu\n", (dword)(GetNearFreeSize()));
-	printf("Total far free:			%lu\n", (dword)(GetFarFreeSize()));
+	printf("Total near free:		%lub\n", (dword)(GetNearFreeSize()));
+	printf("Total far free:			%lub\n", (dword)(GetFarFreeSize()));
 	heapdump(&gvar);
 	segatesuto();
 #endif