X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Fexmmtest.c;h=b57a6f055b23357c71ca68b072ca702a11d6fb9c;hb=5a54933b41f0bcd3653a5da5fc37cc72a08448a3;hp=78fa104fdb4dd8257c93b6a9dcf3bcf8d6d1cc5f;hpb=8fc86da2131adb94c210e5e50e2743bcc2c3eb69;p=16.git

diff --git a/src/exmmtest.c b/src/exmmtest.c
index 78fa104f..b57a6f05 100755
--- a/src/exmmtest.c
+++ b/src/exmmtest.c
@@ -23,9 +23,11 @@
 	exmm test
 */
 #include "src/lib/16_head.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
 
@@ -64,33 +66,46 @@ void segatesuto()
 void
 main(int argc, char *argv[])
 {
-	byte w;
-	global_game_variables_t gvar;
+	byte w=1;
+	static global_game_variables_t gvar;
 #ifdef __WATCOMC__
 	__segment sega;
 #endif
 	memptr bigbuffer;
 
 	//static byte bakapee[64];
-	char *bakapee;
+	char *bakapee1, *bakapee2;
 	word baka;
 
 #ifdef __BORLANDC__
 	argc=argc;
 #endif
-	bakapee = malloc(64);
+	//file name //
+	bakapee1 = malloc(64);
+	bakapee2 = malloc(64);
+	//file name //
+
 	gvar.mm.mmstarted=0;
+	debugpm=1;	//debug pm
 
 	//PRINTBB
-	if(argv[1]) bakapee = argv[1];
-	else
+	if(argv[1]){ bakapee1 = argv[1];
+	if(argv[2]) bakapee2 = argv[2]; }
+	else{
 	//{ printf("filename!: "); scanf("%[^\n]", &bakapee); }
-	bakapee = "data/koishi~.pcx";
-
-//	printf("main()=%Fp	start MM\n", *argv[0]);
-	MM_Startup(&gvar.mm, &gvar.mmi);
-	//PM_Startup();
-	//PM_UnlockMainMem();
+		bakapee1 = "data/koishi~.pcx";
+		bakapee2 = "data/test.map";
+	}
+	printf("main()=%Fp	start MM\n", *argv[0]);
+	MM_Startup(&gvar);
+	printf("ok\n");
+	if(debugpm>0)
+	{
+		PM_Startup(&gvar);
+		printf("pmstarted ok\n");
+		//PM_CheckMainMem(&gvar);
+		PM_UnlockMainMem(&gvar);
+	}
 	CA_Startup(&gvar);
 //	printf("		done!\n");
 	PRINTBB;
@@ -105,11 +120,14 @@ for(w=0;w<2;w++)
 	if(w>0)
 	{
 		printf("		read\n");
-		if(CA_ReadFile(bakapee, &bigbuffer, &gvar)) baka=1; else baka=0;
+		if(CA_ReadFile(bakapee2, &bigbuffer, &gvar)) baka=1; else baka=0;
 	}
 #endif
+	if(w==0)
+	{
 	printf("		load\n");
-	if(CA_LoadFile(bakapee, &bigbuffer, &gvar)) baka=1; else baka=0;
+	if(CA_LoadFile(bakapee1, &bigbuffer, &gvar)) baka=1; else baka=0;
+	}
 //	close(bakapeehandle);
 	//hmm functions in cache system use the buffered stuff
 #ifdef __WATCOMC__
@@ -122,21 +140,24 @@ for(w=0;w<2;w++)
 	//printf("red = locked\n");
 	printf("press any key to continue!\n");
 	getch();
-	MM_ShowMemory(&gvar, &gvar.mm);
-	MM_DumpData(&gvar.mm);
-	MM_Report(&gvar);
+	MM_ShowMemory(&gvar);
+	MM_DumpData(&gvar);
+	MM_Report_(&gvar);
+	if(baka) printf("\nyay!\n");
+	else printf("\npoo!\n");
 	printf("press any key to continue!\n");
 	getch();
 #ifdef FILEREAD
 }
 #endif
-	MM_FreePtr(&bigbuffer, &gvar.mm);
-	//PM_Shutdown();
+	printf("bakapee1=%s\n", bakapee1);
+	printf("bakapee2=%s\n", bakapee2);
+	MM_FreePtr(&bigbuffer, &gvar);
+	if(debugpm>0)
+		PM_Shutdown(&gvar);
 	CA_Shutdown(&gvar);
-	MM_Shutdown(&gvar.mm);
-	free(bakapee);
-	if(baka) printf("\nyay!\n");
-	else printf("\npoo!\n");
+	MM_Shutdown(&gvar);
+	free(bakapee1); free(bakapee2);
 	printf("========================================\n");
 	printf("near=	%Fp ", gvar.mm.nearheap);
 	printf("far=	%Fp", gvar.mm.farheap);