16_pm is now in exmmtest.exe and major studying of how it behaves is needed to functi...

diff --git a/DEBUG.16W b/DEBUG.16W
index aa147ba26ffc3f78c6a74dd86bfe65e10a5597e0..443a5fd67999740bf14f38c28838790c3421bd91 100755 (executable)
--- a/DEBUG.16W
+++ b/DEBUG.16W
@@ -1,12 +1,12 @@
-\e[0mSeg:0      Size:7842       Owner:0x3370\r
-\e[41;31m+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\e[0m\e[42;32m0\r
-\e[0m\e[0mSeg:1ea2       Size:256        Owner:0x52e8\r
-\e[44;34m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:1fa2       Size:273        Owner:0x9340\r
-\e[44;34m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:252a       Size:44 Owner:0x0\r
-\e[41;31m++\e[0m\e[42;32m0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\r
-\e[0m\e[0mSeg:b556       Size:10922      Owner:0x0\r
-\e[41;31m+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\e[0m\e[42;32m\r
+\e[0mSeg:0      Size:10392      Owner:0x7cfc\r
+\e[41;31m++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\e[0m\e[42;32m0\r
+\e[0m\e[0mSeg:2898       Size:256        Owner:0x638e\r
+\e[44;34m+++++\e[0m\e[42;32m\r
+\e[0m\e[0mSeg:2998       Size:401        Owner:0xa41a\r
+\e[44;34m++++++\e[0m\e[42;32m\r
+\e[0m\e[0mSeg:2e11       Size:36 Owner:0x0\r
+\e[41;31m+\e[0m\e[42;32m000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\r
+\e[0m\e[0mSeg:be35       Size:8651       Owner:0x0\r
+\e[41;31m+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\e[0m\e[42;32m\r
 \e[0m\e[0mSeg:e000       Size:8191       Owner:0x0\r
 \e[41;31m++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\e[0m
\ No newline at end of file

diff --git a/HEAP.16W b/HEAP.16W
index 319ef79a9c42030f667d7705e657f8a862ae6de3..11a19e8380bda6a9330da12b6a965577a4add07f 100755 (executable)
--- a/HEAP.16W
+++ b/HEAP.16W
@@ -1,47 +1,71 @@
 \r
        == default ==\r
 \r
-  USED block at 254c0016 of size 66\r
-  USED block at 254c0058 of size 66\r
-  FREE block at 254c009a of size 18\r
-  USED block at 254c00ac of size 136\r
-  USED block at 254c0134 of size 20\r
-  FREE block at 254c0148 of size 7860\r
+  FREE block at 2e330016 of size 18\r
+  USED block at 2e330028 of size 136\r
+  USED block at 2e3300b0 of size 50\r
+  USED block at 2e3300e2 of size 50\r
+  USED block at 2e330114 of size 50\r
+  USED block at 2e330146 of size 50\r
+  USED block at 2e330178 of size 50\r
+  USED block at 2e3301aa of size 50\r
+  USED block at 2e3301dc of size 50\r
+  USED block at 2e33020e of size 50\r
+  USED block at 2e330240 of size 50\r
+  USED block at 2e330272 of size 50\r
+  USED block at 2e3302a4 of size 50\r
+  USED block at 2e3302d6 of size 50\r
+  USED block at 2e330308 of size 50\r
+  FREE block at 2e33033a of size 14\r
+  USED block at 2e330348 of size 20\r
+  FREE block at 2e33035c of size 7328\r
 OK - end of heap\r
 \r
        == near ==\r
 \r
-  USED block at 154b9376 of size 12\r
-  USED block at 154b9382 of size 332\r
-  USED block at 154b94ce of size 52\r
-  USED block at 154b9502 of size 20\r
-  USED block at 154b9516 of size 20\r
-  USED block at 154b952a of size 20\r
-  USED block at 154b953e of size 20\r
-  USED block at 154b9552 of size 20\r
-  USED block at 154b9566 of size 27286\r
+  USED block at 1e32a466 of size 12\r
+  USED block at 1e32a472 of size 330\r
+  USED block at 1e32a5bc of size 52\r
+  USED block at 1e32a5f0 of size 20\r
+  USED block at 1e32a604 of size 20\r
+  USED block at 1e32a618 of size 20\r
+  USED block at 1e32a62c of size 20\r
+  USED block at 1e32a640 of size 20\r
+  USED block at 1e32a654 of size 22952\r
 OK - end of heap\r
 \r
        == far ==\r
 \r
-  USED block at 254c0016 of size 66\r
-  USED block at 254c0058 of size 66\r
-  USED block at 254c009a of size 18\r
-  USED block at 254c00ac of size 136\r
-  USED block at 254c0134 of size 20\r
-  USED block at 254c0148 of size 7860\r
+  USED block at 2e330016 of size 18\r
+  USED block at 2e330028 of size 136\r
+  USED block at 2e3300b0 of size 50\r
+  USED block at 2e3300e2 of size 50\r
+  USED block at 2e330114 of size 50\r
+  USED block at 2e330146 of size 50\r
+  USED block at 2e330178 of size 50\r
+  USED block at 2e3301aa of size 50\r
+  USED block at 2e3301dc of size 50\r
+  USED block at 2e33020e of size 50\r
+  USED block at 2e330240 of size 50\r
+  USED block at 2e330272 of size 50\r
+  USED block at 2e3302a4 of size 50\r
+  USED block at 2e3302d6 of size 50\r
+  USED block at 2e330308 of size 50\r
+  USED block at 2e33033a of size 14\r
+  USED block at 2e330348 of size 20\r
+  USED block at 2e33035c of size 7328\r
 OK - end of heap\r
 \r
 Memory Type         Total      Used       Free\r
 ----------------  --------   --------   --------\r
-Default                   8166         288       7878\r
-Near              27782        496       27286\r
-Far               8166         288       7878\r
+Default                   8166         806       7360\r
+Near              23446        494       22952\r
+Far               8166         806       7360\r
 ----------------  --------   --------   --------\r
-coreleft = 27284\r
-farcoreleft = 2240\r
-GetFreeSize = 40512\r
-GetNearFreeSize = 27286\r
-GetFarFreeSize = 40512\r
-memavl = 27284\r
-stackavail = 11272\r
+coreleft = 22950\r
+farcoreleft = 21944\r
+GetFreeSize = 64548\r
+GetNearFreeSize = 22952\r
+GetFarFreeSize = 64548\r
+memavl = 22950\r
+stackavail = 11203\r

diff --git a/MMDUMP.16W b/MMDUMP.16W
index 2c53e9f080fa694c225c3e45cbf9b15a32ee2cc1..300e3279762e6d5eb41f81bd1adea17b2d92d237 100755 (executable)
Binary files a/MMDUMP.16W and b/MMDUMP.16W differ

diff --git a/PROFILE.16W b/PROFILE.16W
new file mode 100755 (executable)
index 0000000..e69de29

diff --git a/makefile b/makefile
index 578670e03cfddc1ec1c9d520bc93487ed6db5e19..fc9da23af278dbbfb733f9d1ce44f6346ca95126 100755 (executable)
--- a/makefile
+++ b/makefile
@@ -106,7 +106,7 @@ LIBFLAGS=$(WLIBQ) -b -n
 # objects
 #
 VGMSNDOBJ = vgmSnd.$(OBJ) 16_snd.$(OBJ)
-16LIBOBJS = 16_lib.$(OBJ) 16_in.$(OBJ) 16_mm.$(OBJ) wcpu.$(OBJ) 16_head.$(OBJ) 16_ca.$(OBJ) 16_dbg.$(OBJ) kitten.$(OBJ) 16_hc.$(OBJ) 16_timer.$(OBJ)#### 16_pm.$(OBJ)
+16LIBOBJS = 16_pm.$(OBJ) 16_lib.$(OBJ) 16_in.$(OBJ) 16_mm.$(OBJ) wcpu.$(OBJ) 16_head.$(OBJ) 16_ca.$(OBJ) 16_dbg.$(OBJ) kitten.$(OBJ) 16_hc.$(OBJ) 16_timer.$(OBJ)#### 16_pm.$(OBJ)
 GFXLIBOBJS = modex16.$(OBJ) bitmap.$(OBJ) 16text.$(OBJ) bakapee.$(OBJ) scroll16.$(OBJ) 16render.$(OBJ) 16_vrs.$(OBJ) 16_sprit.$(OBJ) #scroll16.$(OBJ)
 #16planar.$(OBJ) planar.$(OBJ)
 DOSLIBOBJ = adlib.$(OBJ) 8254.$(OBJ) 8259.$(OBJ) dos.$(OBJ) cpu.$(OBJ)

diff --git a/src/exmmtest.c b/src/exmmtest.c
index ff8be1df8f353cf10c58bf09442eefdde2c39b1d..a40b9988670fd607aaf2caa649eca4d42af77397 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
@@ -96,8 +97,9 @@ main(int argc, char *argv[])
        }\r
 //     printf("main()=%Fp      start MM\n", *argv[0]);\r
        MM_Startup(&gvar);\r
-       //PM_Startup();\r
-       //PM_UnlockMainMem();\r
+       PM_Startup(&gvar);\r
+       //++++PM_UnlockMainMem(&gvar);\r
+       PM_LockMainMem(&gvar);\r
        CA_Startup(&gvar);\r
 //     printf("                done!\n");\r
        PRINTBB;\r
@@ -143,7 +145,7 @@ for(w=0;w<2;w++)
 }\r
 #endif\r
        MM_FreePtr(&bigbuffer, &gvar);\r
-       //PM_Shutdown();\r
+       PM_Shutdown(&gvar);\r
        CA_Shutdown(&gvar);\r
        MM_Shutdown(&gvar);\r
        free(bakapee1); free(bakapee2);\r

diff --git a/src/lib/.16_pm.c.kate-swp b/src/lib/.16_pm.c.kate-swp
new file mode 100755 (executable)
index 0000000..16c820b
Binary files /dev/null and b/src/lib/.16_pm.c.kate-swp differ

diff --git a/src/lib/16_mm.c b/src/lib/16_mm.c
index 6659d0e0e82af0f371aeaffd7e7adf466007ed8d..9eb93c67b45d47774fe81758d1870ce9d48f803a 100755 (executable)
--- a/src/lib/16_mm.c
+++ b/src/lib/16_mm.c
@@ -1605,7 +1605,7 @@ void MM_Report_(global_game_variables_t *gvar)
        if(MML_CheckForEMS())
        {
                printf("        LIMEMS\n");
-               printf("                EMM v%x.%x available\n", gvar->pm.emm.EMSVer>>4,gvar->mm.EMSVer&0x0F);
+               printf("                EMM v%x.%x available\n", gvar->mm.EMSVer>>4,gvar->mm.EMSVer&0x0F);
                printf("                totalEMSpages:  %u      ", gvar->mm.totalEMSpages); printf("freeEMSpages:       %u\n", gvar->mm.freeEMSpages);
                printf("                EMSpageframe:   %x\n", gvar->mm.EMSpageframe);
        }