Merge remote-tracking branch 'upstream/master'

[16.git] / src / exmmtest.c

diff --git a/src/exmmtest.c b/src/exmmtest.c
old mode 100644 (file)
new mode 100755 (executable)
index 870a6c6..280cbf9
--- a/src/exmmtest.c
+++ b/src/exmmtest.c
@@ -1,5 +1,5 @@
 /* Project 16 Source Code~\r
- * Copyright (C) 2012-2015 sparky4 & pngwen & andrius4669\r
+ * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123\r
  *\r
  * This file is part of Project 16.\r
  *\r
@@ -39,6 +39,8 @@
 #define FILERL\r
 //#define FILEREAD\r
 \r
+global_game_variables_t gvar;\r
+\r
 void\r
 main(int argc, char *argv[])\r
 {\r
@@ -60,11 +62,11 @@ 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
+       //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
@@ -86,17 +88,17 @@ main(int argc, char *argv[])
        //screen.width += (16*2);\r
        //screen.height += (16*2);\r
 \r
-       printf("main()=%Fp      start MM\n", *argv[0]);\r
+//     printf("main()=%Fp      start MM\n", *argv[0]);\r
        MM_Startup(&mm, &mmi);\r
        //PM_Startup();\r
        //PM_UnlockMainMem();\r
-       CA_Startup();\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
+       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
 //     getch();\r
 #ifdef FILERL\r
 //     bakapeehandle = open(bakapee,O_RDONLY | O_BINARY, S_IREAD);\r
@@ -104,10 +106,10 @@ main(int argc, char *argv[])
 //     if(CA_FarRead(bakapeehandle,(void far *)&bigbuffer,sizeof(bigbuffer),&mm))\r
 #ifdef FILEREAD\r
        printf("                read\n");\r
-       if(CA_ReadFile(&bakapee, &bigbuffer, &mm))\r
+       if(CA_ReadFile(bakapee, &bigbuffer, &mm))\r
 #else\r
        printf("                load\n");\r
-       if(CA_LoadFile(&bakapee, &bigbuffer, &mm, &mmi))\r
+       if(CA_LoadFile(bakapee, &bigbuffer, &mm, &mmi))\r
 #endif\r
                baka=1;\r
        else\r
@@ -118,42 +120,55 @@ main(int argc, char *argv[])
        printf("size of big buffer~=%u\n", _bmsize(sega, bigbuffer));\r
 #endif\r
 #endif\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
+       printf("[\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(&mm);\r
+       MM_ShowMemory(&gvar, &mm);\r
        //getch();\r
        MM_DumpData(&mm);\r
        //++++modexLeave();\r
-       MM_Report(&mm, &mmi);\r
-       printf("                stop!\n");\r
+       //++++MM_Report(&mm, &mmi);\r
+//     printf("                stop!\n");\r
 #ifdef FILERL\r
        MM_FreePtr(&bigbuffer, &mm);\r
 #endif\r
        //PM_Shutdown();\r
-       CA_Shutdown();\r
+       CA_Shutdown(&gvar);\r
        MM_Shutdown(&mm);\r
-       printf("                done!\n");\r
+//     printf("                done!\n");\r
 #ifdef FILERL\r
        free(bakapee);\r
        if(baka) printf("\nyay!\n");\r
        else printf("\npoo!\n");\r
 #endif\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
-       //printf("\n\n");\r
-       //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
-       //getch();\r
+       printf("========================================\n");\r
+       printf("near=   %Fp ", mm.nearheap);\r
+       printf("far=    %Fp", mm.farheap);\r
+       printf("\n");\r
+       printf("&near=  %Fp ", &(mm.nearheap));\r
+       printf("&far=   %Fp", &(mm.farheap));\r
+       printf("\n");\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
+       printf("========================================\n");\r
 #ifdef __WATCOMC__\r
-       heapdump();\r
+       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
+       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