====PM WORKS! XMS PORTING IS NEXT! BCEXMM is broke====

[16.git] / src / exmmtest.c

diff --git a/src/exmmtest.c b/src/exmmtest.c
index 1bd9671f2ffe15017ac32c68bc5fddfa42d1f0b0..d040a7299cbe290049210db63428e3fcb2d762f9 100755 (executable)
--- a/src/exmmtest.c
+++ b/src/exmmtest.c
@@ -23,6 +23,7 @@
        exmm test\r
 */\r
 #include "src/lib/16_head.h"\r
+#include "src/lib/16_pm.h"\r
 #include "src/lib/16_ca.h"\r
 #include "src/lib/16_mm.h"\r
 #include "src/lib/16_hc.h"\r
@@ -61,12 +62,12 @@ void segatesuto()
 //     getch();\r
 }\r
 #endif\r
-\r
+static global_game_variables_t gvar;\r
 void\r
 main(int argc, char *argv[])\r
 {\r
        byte w=1;\r
-       global_game_variables_t gvar;\r
+       //static global_game_variables_t gvar;\r
 #ifdef __WATCOMC__\r
        __segment sega;\r
 #endif\r
@@ -85,6 +86,7 @@ main(int argc, char *argv[])
        //file name //\r
 \r
        gvar.mm.mmstarted=0;\r
+       debugpm=1;      //debug pm\r
 \r
        //PRINTBB\r
        if(argv[1]){ bakapee1 = argv[1];\r
@@ -94,10 +96,16 @@ main(int argc, char *argv[])
                bakapee1 = "data/koishi~.pcx";\r
                bakapee2 = "data/test.map";\r
        }\r
-//     printf("main()=%Fp      start MM\n", *argv[0]);\r
-       MM_Startup(&gvar.mm, &gvar.mmi);\r
-       //PM_Startup();\r
-       //PM_UnlockMainMem();\r
+       printf("main()=%Fp      start MM\n", *argv[0]);\r
+       MM_Startup(&gvar);\r
+       printf("ok\n");\r
+       if(debugpm>0)\r
+       {\r
+               PM_Startup(&gvar);\r
+               printf("pmstarted ok\n");\r
+               //PM_CheckMainMem(&gvar);\r
+               PM_UnlockMainMem(&gvar);\r
+       }\r
        CA_Startup(&gvar);\r
 //     printf("                done!\n");\r
        PRINTBB;\r
@@ -133,7 +141,7 @@ for(w=0;w<2;w++)
        printf("press any key to continue!\n");\r
        getch();\r
        MM_ShowMemory(&gvar);\r
-       MM_DumpData(&gvar.mm);\r
+       MM_DumpData(&gvar);\r
        MM_Report_(&gvar);\r
        if(baka) printf("\nyay!\n");\r
        else printf("\npoo!\n");\r
@@ -142,10 +150,13 @@ for(w=0;w<2;w++)
 #ifdef FILEREAD\r
 }\r
 #endif\r
-       MM_FreePtr(&bigbuffer, &gvar.mm);\r
-       //PM_Shutdown();\r
+       printf("bakapee1=%s\n", bakapee1);\r
+       printf("bakapee2=%s\n", bakapee2);\r
+       MM_FreePtr(&bigbuffer, &gvar);\r
+       if(debugpm>0)\r
+               PM_Shutdown(&gvar);\r
        CA_Shutdown(&gvar);\r
-       MM_Shutdown(&gvar.mm);\r
+       MM_Shutdown(&gvar);\r
        free(bakapee1); free(bakapee2);\r
        printf("========================================\n");\r
        printf("near=   %Fp ", gvar.mm.nearheap);\r