X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Fexmmtest.c;h=280cbf91dc7e3350bd9246f582d55cbb00d75b6b;hb=55220245f3cd57d41f6ac40ef55f851f9b9d5efd;hp=870a6c6b70ee2c884d76e2e155de26fa8cdf25bb;hpb=73fcf8173be656d3bf924d54b642ea96c06366ad;p=16.git

diff --git a/src/exmmtest.c b/src/exmmtest.c
old mode 100644
new mode 100755
index 870a6c6b..280cbf91
--- 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
  *
  * This file is part of Project 16.
  *
@@ -39,6 +39,8 @@
 #define FILERL
 //#define FILEREAD
 
+global_game_variables_t gvar;
+
 void
 main(int argc, char *argv[])
 {
@@ -60,11 +62,11 @@ main(int argc, char *argv[])
 #ifdef __BORLANDC__
 	argc=argc;
 #endif
-	printf("&main()=	%Fp\n", *argv[0]);
-	printf("bigbuffer=	%Fp\n", bigbuffer);
-	printf("&bigbuffer=	%Fp\n", &bigbuffer);
-	printf("bigbuffer=	%04x\n", bigbuffer);
-	printf("&bigbuffer=	%04x\n", &bigbuffer);
+	//printf("&main()=	%Fp\n", *argv[0]);
+	//printf("bigbuffer=	%Fp\n", bigbuffer);
+	//printf("&bigbuffer=	%Fp\n", &bigbuffer);
+	//printf("bigbuffer=	%04x\n", bigbuffer);
+	//printf("&bigbuffer=	%04x\n", &bigbuffer);
 
 #ifdef FILERL
 	bakapee = malloc(64);
@@ -86,17 +88,17 @@ main(int argc, char *argv[])
 	//screen.width += (16*2);
 	//screen.height += (16*2);
 
-	printf("main()=%Fp	start MM\n", *argv[0]);
+//	printf("main()=%Fp	start MM\n", *argv[0]);
 	MM_Startup(&mm, &mmi);
 	//PM_Startup();
 	//PM_UnlockMainMem();
-	CA_Startup();
-	printf("		done!\n");
-	printf("&main()=	%Fp\n", *argv[0]);
-	printf("bigbuffer=	%Fp\n", bigbuffer);
-	printf("&bigbuffer=	%Fp\n", &bigbuffer);
-	printf("bigbuffer=	%04x\n", bigbuffer);
-	printf("&bigbuffer=	%04x\n", &bigbuffer);
+	CA_Startup(&gvar);
+//	printf("		done!\n");
+	//printf("&main()=	%Fp\n", *argv[0]);
+	//printf("bigbuffer=	%Fp\n", bigbuffer);
+	//printf("&bigbuffer=	%Fp\n", &bigbuffer);
+	//printf("bigbuffer=	%04x\n", bigbuffer);
+	//printf("&bigbuffer=	%04x\n", &bigbuffer);
 //	getch();
 #ifdef FILERL
 //	bakapeehandle = open(bakapee,O_RDONLY | O_BINARY, S_IREAD);
@@ -104,10 +106,10 @@ main(int argc, char *argv[])
 //	if(CA_FarRead(bakapeehandle,(void far *)&bigbuffer,sizeof(bigbuffer),&mm))
 #ifdef FILEREAD
 	printf("		read\n");
-	if(CA_ReadFile(&bakapee, &bigbuffer, &mm))
+	if(CA_ReadFile(bakapee, &bigbuffer, &mm))
 #else
 	printf("		load\n");
-	if(CA_LoadFile(&bakapee, &bigbuffer, &mm, &mmi))
+	if(CA_LoadFile(bakapee, &bigbuffer, &mm, &mmi))
 #endif
 		baka=1;
 	else
@@ -118,42 +120,55 @@ main(int argc, char *argv[])
 	printf("size of big buffer~=%u\n", _bmsize(sega, bigbuffer));
 #endif
 #endif
-	printf("dark purple = purgable\n");
-	printf("medium blue = non purgable\n");
-	printf("red = locked\n");
+	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");
+	printf("press any key to continue!\n");
 	getch();
 	//++++modexEnter();
 	//++++modexShowPage(&screen);
-	MM_ShowMemory(&mm);
+	MM_ShowMemory(&gvar, &mm);
 	//getch();
 	MM_DumpData(&mm);
 	//++++modexLeave();
-	MM_Report(&mm, &mmi);
-	printf("		stop!\n");
+	//++++MM_Report(&mm, &mmi);
+//	printf("		stop!\n");
 #ifdef FILERL
 	MM_FreePtr(&bigbuffer, &mm);
 #endif
 	//PM_Shutdown();
-	CA_Shutdown();
+	CA_Shutdown(&gvar);
 	MM_Shutdown(&mm);
-	printf("		done!\n");
+//	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("near=	%Fp ", mm.nearheap);
+	printf("far=	%Fp", mm.farheap);
+	printf("\n");
+	printf("&near=	%Fp ", &(mm.nearheap));
+	printf("&far=	%Fp", &(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__
-	heapdump();
+	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());