X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Fexmmtest.c;h=5b7123bb83905d353927b2a597edde87f11729d4;hb=6cba56b1dbbb43864494ad852fecb24f5a75df7f;hp=1bd9671f2ffe15017ac32c68bc5fddfa42d1f0b0;hpb=c5a5d3be15dc4c1de46f86cec8dd5a161563b1b9;p=16.git

diff --git a/src/exmmtest.c b/src/exmmtest.c
index 1bd9671f..5b7123bb 100755
--- a/src/exmmtest.c
+++ b/src/exmmtest.c
@@ -1,5 +1,5 @@
 /* Project 16 Source Code~
- * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover
+ * Copyright (C) 2012-2017 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover
  *
  * This file is part of Project 16.
  *
@@ -23,11 +23,12 @@
 	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"
+//#include "src/lib/16_vl.h"
 #pragma hdrstop
 
 #pragma warn -pro
@@ -37,7 +38,11 @@
 #define FILEREAD
 //#define EXMMVERBOSE
 
-#define PRINTBB { 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); }
+void VGAmodeX(sword vq, boolean cmem, global_game_variables_t *gv)
+{
+	printf("VGAmodeX dummy:\n	%Fp	%Fp	%Fp\n", &vq, &cmem, gv);
+}
+#define PRINTBB { printf("&main()=	%Fp\n", argv[0]);printf("gvar.ca.tinf[0]=	%Fp\n", gvar.ca.tinf[0]);printf("&gvar.ca.tinf[0]=	%Fp\n", &gvar.ca.tinf[0]);printf("gvar.ca.tinf[0]=	%04x\n", gvar.ca.tinf[0]);printf("&gvar.ca.tinf[0]=	%04x\n", &gvar.ca.tinf[0]); }
 
 #ifdef __WATCOMC__
 void segatesuto()
@@ -61,17 +66,16 @@ void segatesuto()
 //	getch();
 }
 #endif
+//static global_game_variables_t gvar;
 
 void
 main(int argc, char *argv[])
 {
 	byte w=1;
-	global_game_variables_t gvar;
-#ifdef __WATCOMC__
-	__segment sega;
-#endif
-	memptr bigbuffer;
-
+	static global_game_variables_t gvar;
+//#ifdef __WATCOMC__
+//	__segment sega;
+//#endif
 	//static byte bakapee[64];
 	char *bakapee1, *bakapee2;
 	word baka;
@@ -84,7 +88,9 @@ main(int argc, char *argv[])
 	bakapee2 = malloc(64);
 	//file name //
 
-	gvar.mm.mmstarted=0;
+#ifdef __DEBUG_PM__
+	dbg_debugpm=1;	//debug pm
+#endif
 
 	//PRINTBB
 	if(argv[1]){ bakapee1 = argv[1];
@@ -94,47 +100,53 @@ main(int argc, char *argv[])
 		bakapee1 = "data/koishi~.pcx";
 		bakapee2 = "data/test.map";
 	}
-//	printf("main()=%Fp	start MM\n", *argv[0]);
-	MM_Startup(&gvar.mm, &gvar.mmi);
-	//PM_Startup();
-	//PM_UnlockMainMem();
+	//printf("main()=%Fp	start MM\n", *argv[0]);
+	MM_Startup(&gvar);
+	//printf("ok\n");
+//#ifdef __WATCOMC__
+#ifdef __DEBUG_PM__
+	if(dbg_debugpm>0)
+	{
+#endif
+		PM_Startup(&gvar); PM_CheckMainMem(&gvar); PM_UnlockMainMem(&gvar);
+#ifdef __DEBUG_PM__
+	}
+#endif
+//#endif
 	CA_Startup(&gvar);
 //	printf("		done!\n");
-	PRINTBB;
+	//0000PRINTBB;
 //	printf("press any key to continue!\n");
 //	getch();
 #ifdef FILEREAD
 for(w=0;w<2;w++)
 {
 //	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),&gvar.mm))
+//	printf("size of big buffer~=%u\n", _bmsize(segu, gvar.ca.tinf[0]));
+//	if(CA_FarRead(bakapeehandle,(void far *)&gvar.ca.tinf[0],sizeof(gvar.ca.tinf[0]),&gvar.mm))
 	if(w>0)
 	{
 		printf("		read\n");
-		if(CA_ReadFile(bakapee2, &bigbuffer, &gvar)) baka=1; else baka=0;
+		if(CA_ReadFile(bakapee2, &gvar.ca.tinf[0], &gvar)) baka=1; else baka=0;
 	}
 #endif
 	if(w==0)
 	{
-	printf("		load\n");
-	if(CA_LoadFile(bakapee1, &bigbuffer, &gvar)) baka=1; else baka=0;
+		printf("		load\n");
+		if(CA_LoadFile(bakapee1, &gvar.ca.tinf[0], &gvar)) baka=1; else baka=0;
 	}
 //	close(bakapeehandle);
 	//hmm functions in cache system use the buffered stuff
-#ifdef __WATCOMC__
-	printf("\nsize of big buffer~=%u\n", _bmsize(sega, bigbuffer));
-#endif
+//#ifdef __WATCOMC__
+//	printf("\nsize of big buffer~=%u\n", _bmsize(sega, gvar.ca.tinf[0]));
+//#endif
 
-	printf("contents of the buffer\n[\n%s\n]\n", bigbuffer);
+	printf("contents of the buffer\n[\n%s\n]\n", gvar.ca.tinf[0]);
 	//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);
-	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");
@@ -142,10 +154,20 @@ for(w=0;w<2;w++)
 #ifdef FILEREAD
 }
 #endif
-	MM_FreePtr(&bigbuffer, &gvar.mm);
-	//PM_Shutdown();
+	DebugMemory_(&gvar, 1);
+	MM_DumpData(&gvar);
+	MM_Report_(&gvar);
+	//printf("bakapee1=%s\n", bakapee1);
+	//printf("bakapee2=%s\n", bakapee2);
+	MM_FreePtr(&gvar.ca.tinf[0], &gvar);
+//#ifdef __WATCOMC__
+#ifdef __DEBUG_PM__
+	if(dbg_debugpm>0)
+#endif
+		PM_Shutdown(&gvar);
+//#endif
 	CA_Shutdown(&gvar);
-	MM_Shutdown(&gvar.mm);
+	MM_Shutdown(&gvar);
 	free(bakapee1); free(bakapee2);
 	printf("========================================\n");
 	printf("near=	%Fp ", gvar.mm.nearheap);
@@ -155,22 +177,22 @@ for(w=0;w<2;w++)
 	printf("&far=	%Fp", &(gvar.mm.farheap));
 	printf("\n");
 #ifdef EXMMVERBOSE
-	printf("bigb=	%Fp ", bigbuffer);
-	//printf("bigbr=	%04x", bigbuffer);
+	printf("bigb=	%Fp ", gvar.ca.tinf[0]);
+	//printf("bigbr=	%04x", gvar.ca.tinf[0]);
 	//printf("\n");
-	printf("&bigb=%Fp ", &bigbuffer);
-	//printf("&bigb=%04x", &bigbuffer);
+	printf("&bigb=%Fp ", &gvar.ca.tinf[0]);
+	//printf("&bigb=%04x", &gvar.ca.tinf[0]);
 	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
-	printf("Project 16 emmtest.exe. This is just a test file!\n");
+	printf("Project 16 exmmtest.exe. This is just a test file!\n");
 	printf("version %s\n", VERSION);
 	//printf("core left:			%lu\n", (dword)_coreleft());
 	//printf("far core left:			%lu\n", (dword)_farcoreleft());