16_pm ommitted due to crashing exmmtest.exe

diff --git a/DEBUG.16W b/DEBUG.16W
index 8f3ffe4d29cb8c418ba1844872b735e9530f1d6f..aa147ba26ffc3f78c6a74dd86bfe65e10a5597e0 100755 (executable)
--- a/DEBUG.16W
+++ b/DEBUG.16W
@@ -1,12 +1,12 @@
-\e[0mSeg:0      Size:7812       Owner:0x6568\r
-\e[41;31m++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\e[0m\e[42;32m0\r
-\e[0m\e[0mSeg:1e84       Size:256        Owner:0x5274\r
+\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:1f84       Size:273        Owner:0x92cc\r
-\e[44;34m+++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:2513       Size:44 Owner:0x0\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:b53f       Size:10945      Owner:0x0\r
-\e[41;31m++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\e[0m\e[42;32m\r
+\e[0m\e[0mSeg:b556       Size:10922      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 d873f507e3c79368d13ee05dbef91d9f6c554821..319ef79a9c42030f667d7705e657f8a862ae6de3 100755 (executable)
--- a/HEAP.16W
+++ b/HEAP.16W
@@ -1,47 +1,47 @@
 \r
        == default ==\r
 \r
-  USED block at 25350016 of size 66\r
-  USED block at 25350058 of size 66\r
-  FREE block at 2535009a of size 18\r
-  USED block at 253500ac of size 136\r
-  USED block at 25350134 of size 20\r
-  FREE block at 25350148 of size 7860\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
 OK - end of heap\r
 \r
        == near ==\r
 \r
-  USED block at 15349306 of size 12\r
-  USED block at 15349312 of size 332\r
-  USED block at 1534945e of size 52\r
-  USED block at 15349492 of size 20\r
-  USED block at 153494a6 of size 20\r
-  USED block at 153494ba of size 20\r
-  USED block at 153494ce of size 20\r
-  USED block at 153494e2 of size 20\r
-  USED block at 153494f6 of size 27398\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
 OK - end of heap\r
 \r
        == far ==\r
 \r
-  USED block at 25350016 of size 66\r
-  USED block at 25350058 of size 66\r
-  USED block at 2535009a of size 18\r
-  USED block at 253500ac of size 136\r
-  USED block at 25350134 of size 20\r
-  USED block at 25350148 of size 7860\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
 OK - end of heap\r
 \r
 Memory Type         Total      Used       Free\r
 ----------------  --------   --------   --------\r
 Default                   8166         288       7878\r
-Near              27894        496       27398\r
+Near              27782        496       27286\r
 Far               8166         288       7878\r
 ----------------  --------   --------   --------\r
-coreleft = 27396\r
-farcoreleft = 2352\r
+coreleft = 27284\r
+farcoreleft = 2240\r
 GetFreeSize = 40512\r
-GetNearFreeSize = 27398\r
+GetNearFreeSize = 27286\r
 GetFarFreeSize = 40512\r
-memavl = 27396\r
-stackavail = 11792\r
+memavl = 27284\r
+stackavail = 11272\r

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

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

diff --git a/makefile b/makefile
index e150bce8a6228be29a1c238a025285e62a6d576f..578670e03cfddc1ec1c9d520bc93487ed6db5e19 100755 (executable)
--- a/makefile
+++ b/makefile
@@ -91,7 +91,7 @@ UPXQ=-qqq
 S_FLAGS=-sg -st -of+ -zu -zdf -zff -zgf -k32768#54096#60000
 Z_FLAGS=-zk0 -zc -zp8 -zm
 O_FLAGS=-obmilr -oe=24 -out -oh -ei -onac -ol+ -ok##x
-T_FLAGS=-bt=dos -mh -0 -fpi87 -fo=.$(OBJ) -d1 -e=65536
+T_FLAGS=-bt=dos -mh -0 -fpi87 -fo=.$(OBJ) -d1###### -e=65536
 
 CPPFLAGS=-DTARGET_MSDOS=16 -DMSDOS=1
 !ifeq DEBUGSERIAL 1
@@ -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_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/lib/16_lib.c b/src/lib/16_lib.c
index 46489c7015125477829ab7a23eb05069360d0be5..57a062175e291cc1268861973dce5432f48b09bc 100755 (executable)
--- a/src/lib/16_lib.c
+++ b/src/lib/16_lib.c
@@ -90,7 +90,7 @@ void Quit (char *error)
        {\r
          movedata ((unsigned)screen,7,0xb800,0,7*160);\r
          //gotoxy (10,4);\r
-         puts(error);\r
+         fprintf(stderr, "%s\n", error);\r
          //gotoxy (1,8);\r
          exit(1);\r
        }\r

diff --git a/src/lib/16_mm.c b/src/lib/16_mm.c
index f253768500d8c97e293b62f182444332295fcb1e..6659d0e0e82af0f371aeaffd7e7adf466007ed8d 100755 (executable)
--- a/src/lib/16_mm.c
+++ b/src/lib/16_mm.c
@@ -250,7 +250,7 @@ End:
        gvar->mm.EMSpageframe=EMSpageframe;
        gvar->mm.EMSpagesmapped=EMSpagesmapped;
        gvar->mm.EMShandle=EMShandle;
-       gvar->pm.emm.EMSVer=EMSVer;
+       gvar->mm.EMSVer=EMSVer;
        return 0;
 }
 
@@ -380,7 +380,7 @@ byte MM_MapXEMS(global_game_variables_t *gvar)
        int     i;
        EMShandle=gvar->mm.EMShandle;
 
-       if(gvar->pm.emm.EMSVer<0x40)
+       if(gvar->mm.EMSVer<0x40)
                return 5;
 
        for (i=0;i<MAPPAGES;i++)
@@ -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->pm.emm.EMSVer&0x0F);
+               printf("                EMM v%x.%x available\n", gvar->pm.emm.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);
        }

diff --git a/src/lib/typdefst.h b/src/lib/typdefst.h
index a0203ca74a8bb57fe91629029f78b2995b5d6d55..5aa4c8c3b536678e395a6b571ea19bccfb688437 100755 (executable)
--- a/src/lib/typdefst.h
+++ b/src/lib/typdefst.h
@@ -171,7 +171,7 @@ typedef struct
 #endif\r
        //byte          EMS_status;\r
        unsigned        totalEMSpages,freeEMSpages,EMSpageframe,EMSpagesmapped,EMShandle;//TODO: PM use\r
-       //unsigned int EMSVer;\r
+       unsigned int EMSVer;\r
        word numUMBs,UMBbase[MAXUMBS];\r
        //dword numUMBs,UMBbase[MAXUMBS];\r
        //huge mmblocktype      huge mmblocks[MAXBLOCKS],huge *mmhead,huge *mmfree,huge *mmrover,huge *mmnew;\r