exmmtest read file works correctly for multifile stuff

diff --git a/DEBUG.16W b/DEBUG.16W
index f90eb59c396a92e1d13dde3ef5f352246c83f9f7..eb376e6551d9174b5fd6f9111dca2534b8df2315 100755 (executable)
--- a/DEBUG.16W
+++ b/DEBUG.16W
@@ -1,16 +1,16 @@
-\e[0mSeg:0      Size:8030       Owner:0xbcb3\r
+\e[0mSeg:0      Size:8041       Owner:0x0\r
 \e[41;31m+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\e[0m\e[47;37m_\e[0m\r
 \e[42;32m0\r
-\e[0m\e[0mSeg:1f5e       Size:256        Owner:0x527a\r
+\e[0m\e[0mSeg:1f69       Size:256        Owner:0x5274\r
 \e[44;34m++++\e[0m\e[47;37m_\e[0m\r
 \e[42;32m\r
-\e[0m\e[0mSeg:205e       Size:273        Owner:0x92d2\r
-\e[44;34m++++\e[0m\e[47;37m_\e[0m\r
+\e[0m\e[0mSeg:2069       Size:273        Owner:0x92cc\r
+\e[44;34m+++++\e[0m\e[47;37m_\e[0m\r
 \e[42;32m\r
-\e[0m\e[0mSeg:25df       Size:40 Owner:0x0\r
+\e[0m\e[0mSeg:25ea       Size:44 Owner:0x0\r
 \e[41;31m+\e[0m\e[47;37m_\e[0m\r
 \e[42;32m00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\r
-\e[0m\e[0mSeg:b607       Size:10745      Owner:0x0\r
+\e[0m\e[0mSeg:b616       Size:10730      Owner:0x0\r
 \e[41;31m+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\e[0m\e[47;37m_\e[0m\r
 \e[42;32m\r
 \e[0m\e[0mSeg:e000       Size:8191       Owner:0x0\r

diff --git a/HEAP.16W b/HEAP.16W
index 1d5295a219e32d45e448a270273f300560f3fcaa..d4ef59d0ad8b1009deba4c8fe80dbe2d8e591576 100755 (executable)
--- a/HEAP.16W
+++ b/HEAP.16W
@@ -1,45 +1,47 @@
 \r
        == default ==\r
 \r
-  USED block at 26010016 of size 66\r
-  FREE block at 26010058 of size 18\r
-  USED block at 2601006a of size 136\r
-  USED block at 260100f2 of size 20\r
-  FREE block at 26010106 of size 7926\r
+  USED block at 260c0016 of size 66\r
+  USED block at 260c0058 of size 66\r
+  FREE block at 260c009a of size 18\r
+  USED block at 260c00ac of size 136\r
+  USED block at 260c0134 of size 20\r
+  FREE block at 260c0148 of size 7860\r
 OK - end of heap\r
 \r
        == near ==\r
 \r
-  USED block at 16009306 of size 12\r
-  USED block at 16009312 of size 530\r
-  USED block at 16009524 of size 72\r
-  USED block at 1600956c of size 20\r
-  USED block at 16009580 of size 20\r
-  USED block at 16009594 of size 20\r
-  USED block at 160095a8 of size 20\r
-  USED block at 160095bc of size 20\r
-  USED block at 160095d0 of size 27180\r
+  USED block at 160b9306 of size 12\r
+  USED block at 160b9312 of size 530\r
+  USED block at 160b9524 of size 72\r
+  USED block at 160b956c of size 20\r
+  USED block at 160b9580 of size 20\r
+  USED block at 160b9594 of size 20\r
+  USED block at 160b95a8 of size 20\r
+  USED block at 160b95bc of size 20\r
+  USED block at 160b95d0 of size 27180\r
 OK - end of heap\r
 \r
        == far ==\r
 \r
-  USED block at 26010016 of size 66\r
-  USED block at 26010058 of size 18\r
-  USED block at 2601006a of size 136\r
-  USED block at 260100f2 of size 20\r
-  USED block at 26010106 of size 7926\r
+  USED block at 260c0016 of size 66\r
+  USED block at 260c0058 of size 66\r
+  USED block at 260c009a of size 18\r
+  USED block at 260c00ac of size 136\r
+  USED block at 260c0134 of size 20\r
+  USED block at 260c0148 of size 7860\r
 OK - end of heap\r
 \r
 Memory Type         Total      Used       Free\r
 ----------------  --------   --------   --------\r
-Default                   8166         222       7944\r
+Default                   8166         288       7878\r
 Near              27894        714       27180\r
-Far               8166         222       7944\r
+Far               8166         288       7878\r
 ----------------  --------   --------   --------\r
 coreleft = 27178\r
-farcoreleft = 59530\r
-GetFreeSize = 32370\r
+farcoreleft = 59464\r
+GetFreeSize = 32304\r
 GetNearFreeSize = 27180\r
-GetFarFreeSize = 32370\r
+GetFarFreeSize = 32304\r
 memavl = 27178\r
-stackavail = 11798\r
+stackavail = 11792\r

diff --git a/MMDUMP.16W b/MMDUMP.16W
index 7f77808283331490a22ef3ed19cb10f8e99cb497..9aae7dc267680df3db8d32916980c7854dcf7a2c 100755 (executable)
Binary files a/MMDUMP.16W and b/MMDUMP.16W differ

diff --git a/src/exmmtest.c b/src/exmmtest.c
index 78fa104fdb4dd8257c93b6a9dcf3bcf8d6d1cc5f..02fafeb6aa1b63db68c9d010b2154a99d75b0afc 100755 (executable)
--- a/src/exmmtest.c
+++ b/src/exmmtest.c
@@ -64,7 +64,7 @@ void segatesuto()
 void\r
 main(int argc, char *argv[])\r
 {\r
-       byte w;\r
+       byte w=1;\r
        global_game_variables_t gvar;\r
 #ifdef __WATCOMC__\r
        __segment sega;\r
@@ -72,21 +72,27 @@ main(int argc, char *argv[])
        memptr bigbuffer;\r
 \r
        //static byte bakapee[64];\r
-       char *bakapee;\r
+       char *bakapee1, *bakapee2;\r
        word baka;\r
 \r
 #ifdef __BORLANDC__\r
        argc=argc;\r
 #endif\r
-       bakapee = malloc(64);\r
+       //file name //\r
+       bakapee1 = malloc(64);\r
+       bakapee2 = malloc(64);\r
+       //file name //\r
+\r
        gvar.mm.mmstarted=0;\r
 \r
        //PRINTBB\r
-       if(argv[1]) bakapee = argv[1];\r
-       else\r
+       if(argv[1]){ bakapee1 = argv[1];\r
+       if(argv[2]) bakapee2 = argv[2]; }\r
+       else{\r
        //{ printf("filename!: "); scanf("%[^\n]", &bakapee); }\r
-       bakapee = "data/koishi~.pcx";\r
-\r
+               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
@@ -105,11 +111,14 @@ for(w=0;w<2;w++)
        if(w>0)\r
        {\r
                printf("                read\n");\r
-               if(CA_ReadFile(bakapee, &bigbuffer, &gvar)) baka=1; else baka=0;\r
+               if(CA_ReadFile(bakapee2, &bigbuffer, &gvar)) baka=1; else baka=0;\r
        }\r
 #endif\r
+       if(w==0)\r
+       {\r
        printf("                load\n");\r
-       if(CA_LoadFile(bakapee, &bigbuffer, &gvar)) baka=1; else baka=0;\r
+       if(CA_LoadFile(bakapee1, &bigbuffer, &gvar)) baka=1; else baka=0;\r
+       }\r
 //     close(bakapeehandle);\r
        //hmm functions in cache system use the buffered stuff\r
 #ifdef __WATCOMC__\r
@@ -125,6 +134,8 @@ for(w=0;w<2;w++)
        MM_ShowMemory(&gvar, &gvar.mm);\r
        MM_DumpData(&gvar.mm);\r
        MM_Report(&gvar);\r
+       if(baka) printf("\nyay!\n");\r
+       else printf("\npoo!\n");\r
        printf("press any key to continue!\n");\r
        getch();\r
 #ifdef FILEREAD\r
@@ -134,9 +145,7 @@ for(w=0;w<2;w++)
        //PM_Shutdown();\r
        CA_Shutdown(&gvar);\r
        MM_Shutdown(&gvar.mm);\r
-       free(bakapee);\r
-       if(baka) printf("\nyay!\n");\r
-       else printf("\npoo!\n");\r
+       free(bakapee1); free(bakapee2);\r
        printf("========================================\n");\r
        printf("near=   %Fp ", gvar.mm.nearheap);\r
        printf("far=    %Fp", gvar.mm.farheap);\r