^^ yay! i polished exmmtest and the memory reporter

[16.git] / src / exmmtest.c

diff --git a/src/exmmtest.c b/src/exmmtest.c
index d1db67c611ba050c97f2a99191d84689e97bd403..d7eee8ded05e43947cfa344bbca94982862ec3d2 100755 (executable)
--- a/src/exmmtest.c
+++ b/src/exmmtest.c
@@ -22,9 +22,6 @@
 /*\r
        exmm test\r
 */\r
-//#include <stdio.h>\r
-//#include <bios.h>\r
-\r
 #include "src/lib/16_head.h"\r
 #include "src/lib/16_ca.h"\r
 #include "src/lib/16_mm.h"\r
@@ -39,11 +36,12 @@
 #define FILERL\r
 //#define FILEREAD\r
 \r
-global_game_variables_t gvar;\r
+#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); }\r
 \r
 void\r
 main(int argc, char *argv[])\r
 {\r
+       global_game_variables_t gvar;\r
 #ifdef __WATCOMC__\r
        __segment sega;\r
        void __based(sega)* bigbuffer;\r
@@ -60,25 +58,17 @@ main(int argc, char *argv[])
 #ifdef __BORLANDC__\r
        argc=argc;\r
 #endif\r
-       //printf("&main()=      %Fp\n", *argv[0]);\r
-       //printf("bigbuffer=    %Fp\n", bigbuffer);\r
-       //printf("&bigbuffer=   %Fp\n", &bigbuffer);\r
-       //printf("bigbuffer=    %04x\n", bigbuffer);\r
-       //printf("&bigbuffer=   %04x\n", &bigbuffer);\r
-\r
 #ifdef FILERL\r
        bakapee = malloc(64);\r
 #endif\r
        gvar.mm.mmstarted=0;\r
 \r
+       //PRINTBB\r
 #ifdef FILERL\r
        if(argv[1]) bakapee = argv[1];\r
        else\r
-       {\r
-               printf("filename!: ");\r
-               scanf("%[^\n]", &bakapee);\r
-       }\r
-//     bakapee = "data/koishi~.pcx";\r
+       //{ printf("filename!: "); scanf("%[^\n]", &bakapee); }\r
+       bakapee = "data/koishi~.pcx";\r
 #endif\r
 \r
 //     printf("main()=%Fp      start MM\n", *argv[0]);\r
@@ -87,11 +77,7 @@ main(int argc, char *argv[])
        //PM_UnlockMainMem();\r
        CA_Startup(&gvar);\r
 //     printf("                done!\n");\r
-       //printf("&main()=      %Fp\n", *argv[0]);\r
-       //printf("bigbuffer=    %Fp\n", bigbuffer);\r
-       //printf("&bigbuffer=   %Fp\n", &bigbuffer);\r
-       //printf("bigbuffer=    %04x\n", bigbuffer);\r
-       //printf("&bigbuffer=   %04x\n", &bigbuffer);\r
+       //PRINTBB\r
 //     getch();\r
 #ifdef FILERL\r
 //     bakapeehandle = open(bakapee,O_RDONLY | O_BINARY, S_IREAD);\r
@@ -110,25 +96,23 @@ main(int argc, char *argv[])
 //     close(bakapeehandle);\r
        //hmm functions in cache system use the buffered stuff\r
 #ifdef __WATCOMC__\r
-       printf("size of big buffer~=%u\n", _bmsize(sega, bigbuffer));\r
+       printf("\nsize of big buffer~=%u\n", _bmsize(sega, bigbuffer));\r
 #endif\r
 #endif\r
        printf("press any key to continue!\n");\r
        getch();\r
-       printf("[\n%s\n]\n", bigbuffer);\r
+       printf("\n\ncontents of the buffer\n[\n%s\n]\n", bigbuffer);\r
        //printf("dark purple = purgable\n");\r
        //printf("medium blue = non purgable\n");\r
        //printf("red = locked\n");\r
        printf("press any key to continue!\n");\r
        getch();\r
-       //++++modexEnter();\r
-       //++++modexShowPage(&screen);\r
        MM_ShowMemory(&gvar, &gvar.mm);\r
        //getch();\r
        MM_DumpData(&gvar.mm);\r
-       //++++modexLeave();\r
-       //++++MM_Report(&gvar.mm, &gvar.mmi);\r
+       MM_Report(&gvar);\r
 //     printf("                stop!\n");\r
+       getch();\r
 #ifdef FILERL\r
        MM_FreePtr(&bigbuffer, &gvar.mm);\r
 #endif\r
@@ -148,21 +132,23 @@ main(int argc, char *argv[])
        printf("&near=  %Fp ", &(gvar.mm.nearheap));\r
        printf("&far=   %Fp", &(gvar.mm.farheap));\r
        printf("\n");\r
+#ifdef EXMMVERBOSE\r
        printf("bigb=   %Fp ", bigbuffer);\r
        //printf("bigbr=        %04x", bigbuffer);\r
        //printf("\n");\r
        printf("&bigb=%Fp ", &bigbuffer);\r
        //printf("&bigb=%04x", &bigbuffer);\r
        printf("\n");\r
+#endif\r
        printf("========================================\n");\r
 #ifdef __WATCOMC__\r
-       printf("Total free:                     %lu\n", (dword)(GetFreeSize()));\r
+//this is far  printf("Total free:                     %lu\n", (dword)(GetFreeSize()));\r
        printf("Total near free:                %lu\n", (dword)(GetNearFreeSize()));\r
        printf("Total far free:                 %lu\n", (dword)(GetFarFreeSize()));\r
        heapdump(&gvar);\r
+       #endif\r
        printf("Project 16 emmtest.exe. This is just a test file!\n");\r
        printf("version %s\n", VERSION);\r
-#endif\r
        //printf("core left:                    %lu\n", (dword)_coreleft());\r
        //printf("far core left:                        %lu\n", (dword)_farcoreleft());\r
        //printf("based core left:                      %lu\n", (dword)_basedcoreleft());\r