broken bcexmm broken

[proj16/16.git] / src / exmmtest.c

diff --git a/src/exmmtest.c b/src/exmmtest.c
index 25436f8..a7d9410 100755 (executable)
--- a/src/exmmtest.c
+++ b/src/exmmtest.c
@@ -24,7 +24,9 @@
 */\r
 #include "src/lib/16_head.h"\r
 #include "src/lib/16_tail.h"\r
+//#ifdef __WATCOMC__\r
 #include "src/lib/16_pm.h"\r
+//#endif\r
 #include "src/lib/16_ca.h"\r
 #include "src/lib/16_mm.h"\r
 #include "src/lib/16_hc.h"\r
@@ -38,7 +40,11 @@
 #define FILEREAD\r
 //#define EXMMVERBOSE\r
 \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
+void VGAmodeX(sword vq, boolean cmem, global_game_variables_t *gv)\r
+{\r
+       printf("VGAmodeX dummy:\n       %Fp     %Fp     %Fp\n", &vq, &cmem, gv);\r
+}\r
+#define PRINTBB { printf("&main()=     %Fp\n", argv[0]);printf("gvar.ca.tinf[0]=       %Fp\n", gvar.ca.tinf[0]);printf("&gvar.ca.tinf[0]=      %Fp\n", &gvar.ca.tinf[0]);printf("gvar.ca.tinf[0]=      %04x\n", gvar.ca.tinf[0]);printf("&gvar.ca.tinf[0]=     %04x\n", &gvar.ca.tinf[0]); }\r
 \r
 #ifdef __WATCOMC__\r
 void segatesuto()\r
@@ -72,8 +78,6 @@ main(int argc, char *argv[])
 //#ifdef __WATCOMC__\r
 //     __segment sega;\r
 //#endif\r
-       memptr bigbuffer;\r
-\r
        //static byte bakapee[64];\r
        char *bakapee1, *bakapee2;\r
        word baka;\r
@@ -86,11 +90,11 @@ main(int argc, char *argv[])
        bakapee2 = malloc(64);\r
        //file name //\r
 \r
-       gvar.mm.mmstarted=0;\r
-\r
+//#ifdef __WATCOMC__\r
 #ifdef __DEBUG_PM__\r
        dbg_debugpm=1;  //debug pm\r
 #endif\r
+//#endif\r
 \r
        //PRINTBB\r
        if(argv[1]){ bakapee1 = argv[1];\r
@@ -108,10 +112,7 @@ main(int argc, char *argv[])
        if(dbg_debugpm>0)\r
        {\r
 #endif\r
-               PM_Startup(&gvar);\r
-               //printf("pmstarted ok\n");\r
-               //PM_CheckMainMem(&gvar);\r
-               PM_UnlockMainMem(&gvar);\r
+               PM_Startup(&gvar); PM_CheckMainMem(&gvar); PM_UnlockMainMem(&gvar);\r
 #ifdef __DEBUG_PM__\r
        }\r
 #endif\r
@@ -125,31 +126,31 @@ main(int argc, char *argv[])
 for(w=0;w<2;w++)\r
 {\r
 //     bakapeehandle = open(bakapee,O_RDONLY | O_BINARY, S_IREAD);\r
-//     printf("size of big buffer~=%u\n", _bmsize(segu, bigbuffer));\r
-//     if(CA_FarRead(bakapeehandle,(void far *)&bigbuffer,sizeof(bigbuffer),&gvar.mm))\r
+//     printf("size of big buffer~=%u\n", _bmsize(segu, gvar.ca.tinf[0]));\r
+//     if(CA_FarRead(bakapeehandle,(void far *)&gvar.ca.tinf[0],sizeof(gvar.ca.tinf[0]),&gvar.mm))\r
        if(w>0)\r
        {\r
                printf("                read\n");\r
-               if(CA_ReadFile(bakapee2, &bigbuffer, &gvar)) baka=1; else baka=0;\r
+               if(CA_ReadFile(bakapee2, &gvar.ca.tinf[0], &gvar)) baka=1; else baka=0;\r
        }\r
 #endif\r
        if(w==0)\r
        {\r
-       printf("                load\n");\r
-       if(CA_LoadFile(bakapee1, &bigbuffer, &gvar)) baka=1; else baka=0;\r
+               printf("                load\n");\r
+               if(CA_LoadFile(bakapee1, &gvar.ca.tinf[0], &gvar)) baka=1; else baka=0;\r
        }\r
 //     close(bakapeehandle);\r
        //hmm functions in cache system use the buffered stuff\r
 //#ifdef __WATCOMC__\r
-//     printf("\nsize of big buffer~=%u\n", _bmsize(sega, bigbuffer));\r
+//     printf("\nsize of big buffer~=%u\n", _bmsize(sega, gvar.ca.tinf[0]));\r
 //#endif\r
 \r
-       printf("contents of the buffer\n[\n%s\n]\n", bigbuffer);\r
+       printf("contents of the buffer\n[\n%s\n]\n", gvar.ca.tinf[0]);\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
-//     DebugMemory_(&gvar, 1);\r
+       DebugMemory_(&gvar, 1);\r
        if(baka) printf("\nyay!\n");\r
        else printf("\npoo!\n");\r
        printf("press any key to continue!\n");\r
@@ -162,7 +163,7 @@ for(w=0;w<2;w++)
        MM_Report_(&gvar);\r
        //printf("bakapee1=%s\n", bakapee1);\r
        //printf("bakapee2=%s\n", bakapee2);\r
-       MM_FreePtr(&bigbuffer, &gvar);\r
+       MM_FreePtr(&gvar.ca.tinf[0], &gvar);\r
 //#ifdef __WATCOMC__\r
 #ifdef __DEBUG_PM__\r
        if(dbg_debugpm>0)\r
@@ -180,11 +181,11 @@ for(w=0;w<2;w++)
        printf("&far=   %Fp", &(gvar.mm.farheap));\r
        printf("\n");\r
 #ifdef EXMMVERBOSE\r
-       printf("bigb=   %Fp ", bigbuffer);\r
-       //printf("bigbr=        %04x", bigbuffer);\r
+       printf("bigb=   %Fp ", gvar.ca.tinf[0]);\r
+       //printf("bigbr=        %04x", gvar.ca.tinf[0]);\r
        //printf("\n");\r
-       printf("&bigb=%Fp ", &bigbuffer);\r
-       //printf("&bigb=%04x", &bigbuffer);\r
+       printf("&bigb=%Fp ", &gvar.ca.tinf[0]);\r
+       //printf("&bigb=%04x", &gvar.ca.tinf[0]);\r
        printf("\n");\r
        printf("========================================\n");\r
 #endif\r
@@ -197,6 +198,7 @@ for(w=0;w<2;w++)
 #endif\r
        printf("Project 16 exmmtest.exe. This is just a test file!\n");\r
        printf("version %s\n", VERSION);\r
+       //printf("\n");\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