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

diff --git a/src/exmmtest.c b/src/exmmtest.c
index e1d4e558..1bd9671f 100755
--- a/src/exmmtest.c
+++ b/src/exmmtest.c
@@ -26,6 +26,7 @@
 #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
 
@@ -33,8 +34,8 @@
 #pragma warn -use
 
 //file load or read definition
-#define FILERL
-//#define FILEREAD
+#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); }
 
@@ -47,51 +48,52 @@ void segatesuto()
 	screen = 0xB800;
 	scrptr = 0;
 	printf( "Top left character is '%c'.\n", *(screen:>scrptr) );
-	printf("Next string is: [");
-	while(*scrptr<16)
-	{
-		printf("%c", *(screen:>scrptr));
-		//printf("\b");
-		scrptr++;
-
-	}
-	printf("]\n");
-	printf("press any key to continue!\n");
-	getch();
+// 	printf("Next string is: [");
+// 	while(*scrptr<16)
+// 	{
+// 		printf("%c", *(screen:>scrptr));
+// 		//printf("\b");
+// 		scrptr++;
+//
+// 	}
+// 	printf("]\n");
+//	printf("press any key to continue!\n");
+//	getch();
 }
 #endif
 
 void
 main(int argc, char *argv[])
 {
+	byte w=1;
 	global_game_variables_t gvar;
 #ifdef __WATCOMC__
 	__segment sega;
 #endif
 	memptr bigbuffer;
 
-#ifdef FILERL
 	//static byte bakapee[64];
-	char *bakapee;
+	char *bakapee1, *bakapee2;
 	word baka;
-#endif
 
 #ifdef __BORLANDC__
 	argc=argc;
 #endif
-#ifdef FILERL
-	bakapee = malloc(64);
-#endif
+	//file name //
+	bakapee1 = malloc(64);
+	bakapee2 = malloc(64);
+	//file name //
+
 	gvar.mm.mmstarted=0;
 
 	//PRINTBB
-#ifdef FILERL
-	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";
-#endif
-
+		bakapee1 = "data/koishi~.pcx";
+		bakapee2 = "data/test.map";
+	}
 //	printf("main()=%Fp	start MM\n", *argv[0]);
 	MM_Startup(&gvar.mm, &gvar.mmi);
 	//PM_Startup();
@@ -99,55 +101,52 @@ main(int argc, char *argv[])
 	CA_Startup(&gvar);
 //	printf("		done!\n");
 	PRINTBB;
-	printf("press any key to continue!\n");
-	getch();
-#ifdef FILERL
+//	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))
-#ifdef FILEREAD
-	printf("		read\n");
-	if(CA_ReadFile(bakapee, &bigbuffer, &gvar.mm))
-#else
-	printf("		load\n");
-	if(CA_LoadFile(bakapee, &bigbuffer, &gvar.mm, &gvar.mmi))
+	if(w>0)
+	{
+		printf("		read\n");
+		if(CA_ReadFile(bakapee2, &bigbuffer, &gvar)) baka=1; else baka=0;
+	}
 #endif
-		baka=1;
-	else
-		baka=0;
+	if(w==0)
+	{
+	printf("		load\n");
+	if(CA_LoadFile(bakapee1, &bigbuffer, &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
-#endif
-	printf("press any key to continue!\n");
-	getch();
-	printf("\n\ncontents of the buffer\n[\n%s\n]\n", bigbuffer);
+
+	printf("contents of the buffer\n[\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();
-	MM_ShowMemory(&gvar, &gvar.mm);
-	//getch();
+	MM_ShowMemory(&gvar);
 	MM_DumpData(&gvar.mm);
-	MM_Report(&gvar);
-//	printf("		stop!\n");
+	MM_Report_(&gvar);
+	if(baka) printf("\nyay!\n");
+	else printf("\npoo!\n");
 	printf("press any key to continue!\n");
 	getch();
-#ifdef FILERL
-	MM_FreePtr(&bigbuffer, &gvar.mm);
+#ifdef FILEREAD
+}
 #endif
+	MM_FreePtr(&bigbuffer, &gvar.mm);
 	//PM_Shutdown();
 	CA_Shutdown(&gvar);
 	MM_Shutdown(&gvar.mm);
-//	printf("		done!\n");
-#ifdef FILERL
-	free(bakapee);
-	if(baka) printf("\nyay!\n");
-	else printf("\npoo!\n");
-#endif
+	free(bakapee1); free(bakapee2);
 	printf("========================================\n");
 	printf("near=	%Fp ", gvar.mm.nearheap);
 	printf("far=	%Fp", gvar.mm.farheap);