wwww format of showmem edited

diff --git a/DEBUG.16B b/DEBUG.16B
index d10b5a80ed7115f0f7133d6fae80a09399e380b1..546573cb6951109cb3bf1aa6b804f95cbe215df2 100755 (executable)
--- a/DEBUG.16B
+++ b/DEBUG.16B
@@ -1,17 +1,12 @@
-\e[0mSeg:0      Size:2898       Owner:0xe8be\r
-\e[41;31m+++++++++++++++++++++++++++++++++++++\e[0m\e[47;37m_\e[0m\r
-\e[42;32m0\r
-\e[0m\e[0mSeg:b52        Size:256        Owner:0xcf80\r
-\e[44;34m++++\e[0m\e[47;37m_\e[0m\r
-\e[42;32m\r
-\e[0m\e[0mSeg:c52        Size:273        Owner:0xfe0\r
-\e[44;34m++++\e[0m\e[47;37m_\e[0m\r
-\e[42;32m00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\r
+\e[0mSeg:0      Size:2982       Owner:0x6574\r
+\e[41;31m++++++++++++++++++++++++++++++++++++++\e[0m\e[42;32m0\r
+\e[0m\e[0mSeg:ba6        Size:256        Owner:0xcf7a\r
+\e[44;34m++++\e[0m\e[42;32m\r
+\e[0m\e[0mSeg:ca6        Size:273        Owner:0xfde\r
+\e[44;34m++++\e[0m\e[42;32m000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\r
 \e[0m\e[0mSeg:9fde       Size:28706      Owner:0x0\r
-\e[41;31m\e[0m\e[47;37m_\e[0m\r
-\e[42;32m\r
+\e[41;31m\e[0m\e[42;32m\r
 \e[0m\e[0mSeg:9ffe       Size:16386      Owner:0x0\r
-\e[41;31m++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\e[0m\e[47;37m_\e[0m\r
-\e[42;32m\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\e[47;37m_\e[0m
\ No newline at end of file
+\e[41;31m++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\e[0m
\ No newline at end of file

diff --git a/DEBUG.16W b/DEBUG.16W
index eb376e6551d9174b5fd6f9111dca2534b8df2315..8f3ffe4d29cb8c418ba1844872b735e9530f1d6f 100755 (executable)
--- a/DEBUG.16W
+++ b/DEBUG.16W
@@ -1,17 +1,12 @@
-\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: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: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: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:b616       Size:10730      Owner:0x0\r
-\e[41;31m+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\e[0m\e[47;37m_\e[0m\r
-\e[42;32m\r
+\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[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[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:e000       Size:8191       Owner:0x0\r
-\e[41;31m++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\e[0m\e[47;37m_\e[0m
\ No newline at end of file
+\e[41;31m++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\e[0m
\ No newline at end of file

diff --git a/HEAP.16W b/HEAP.16W
index d4ef59d0ad8b1009deba4c8fe80dbe2d8e591576..d873f507e3c79368d13ee05dbef91d9f6c554821 100755 (executable)
--- a/HEAP.16W
+++ b/HEAP.16W
@@ -1,47 +1,47 @@
 \r
        == default ==\r
 \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
+  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
 OK - end of heap\r
 \r
        == near ==\r
 \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
+  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
 OK - end of heap\r
 \r
        == far ==\r
 \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
+  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
 OK - end of heap\r
 \r
 Memory Type         Total      Used       Free\r
 ----------------  --------   --------   --------\r
 Default                   8166         288       7878\r
-Near              27894        714       27180\r
+Near              27894        496       27398\r
 Far               8166         288       7878\r
 ----------------  --------   --------   --------\r
-coreleft = 27178\r
-farcoreleft = 59464\r
-GetFreeSize = 32304\r
-GetNearFreeSize = 27180\r
-GetFarFreeSize = 32304\r
-memavl = 27178\r
+coreleft = 27396\r
+farcoreleft = 2352\r
+GetFreeSize = 40512\r
+GetNearFreeSize = 27398\r
+GetFarFreeSize = 40512\r
+memavl = 27396\r
 stackavail = 11792\r

diff --git a/MMDUMP.16B b/MMDUMP.16B
index f8f409f2f63426044c502b7fbed16a754fa14d8a..2e06a768004248e1dfe1dac64e3bcd8b81c4e4bf 100755 (executable)
Binary files a/MMDUMP.16B and b/MMDUMP.16B differ

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

diff --git a/bcexmm.dsk b/bcexmm.dsk
index a7d7bc63d9b969446e362d4b790cf7f84f2b0007..9d1c2ae5dac26efd4b845a894173c649cc46b58c 100755 (executable)
Binary files a/bcexmm.dsk and b/bcexmm.dsk differ

diff --git a/bcexmm.exe b/bcexmm.exe
index 2cdb4e5653522a798caa9037d847dc6791460dbf..d4ca4af8941a6d2e8f1b3552122810b957b51599 100755 (executable)
Binary files a/bcexmm.exe and b/bcexmm.exe differ

diff --git a/bcexmm.prj b/bcexmm.prj
index bf5ac135882593e7ff8d31de614ba6bfc4c0c427..6a7ef6315f8aa11cdcd50480cf8f75c87940f4a6 100755 (executable)
Binary files a/bcexmm.prj and b/bcexmm.prj differ

diff --git a/modex.lib b/modex.lib
deleted file mode 100755 (executable)
index 560a1c6..0000000
Binary files a/modex.lib and /dev/null differ

diff --git a/src/lib/16_mm.c b/src/lib/16_mm.c
index 66271124c3b0b855b450314dfd423cec2afc7c86..add7707e00435baa7ec00aeff435932b5a90ef57 100755 (executable)
--- a/src/lib/16_mm.c
+++ b/src/lib/16_mm.c
@@ -1354,7 +1354,7 @@ void MM_ShowMemory(global_game_variables_t *gvar,/*page_t *page, */mminfo_t *mm)
                        //printf("+     %u      %lu\n", w, scan->length);
                        strcat(scratch0, "+");
                }
-               strcat(scratch0, AARESET); strcat(scratch0, AAGREY); strcat(scratch0,"_");
+               //++==++==optional strcat(scratch0, AARESET); strcat(scratch0, AAGREY); strcat(scratch0,"_");
 //++++         VW_Plot(scan->start,0,15);
 //++++                         modexClearRegion(page, chx, chy, 4, 4, 15);
 //++++                 VW_Hlin(end+1,scan->next->start,0,0);   // black = free
@@ -1364,7 +1364,7 @@ void MM_ShowMemory(global_game_variables_t *gvar,/*page_t *page, */mminfo_t *mm)
                if (scan->next && scan->next->start >= end+1)
                {
                        strcat(scratch0, AARESET);
-                       strcat(scratch0, "\n");
+                       //++==++==optional strcat(scratch0, "\n");
                        strcat(scratch0,AAGREEN);
                        for(w=(end+1)/80;w<=((scan->next->start-scan->start)/80);w++)
                        //for(w=(wwww)/80;w<=((end+1)/80);w++)

diff --git a/src/lib/typdefst.h b/src/lib/typdefst.h
index 5323222e8c203ce7a39e283d715ae7d3ce06844f..fdf96a278d241d0c9228e3aad7e1a489f4e2e993 100755 (executable)
--- a/src/lib/typdefst.h
+++ b/src/lib/typdefst.h
@@ -194,9 +194,9 @@ typedef struct
 typedef struct\r
 {\r
        int             mapon, mapnum;\r
-       __segment       *mapsegs[4];\r
-       __segment       *mapheaderseg[NUMMAPS];\r
-       __segment       *tinf;\r
+       __SEGA  *mapsegs[4];\r
+       __SEGA  *mapheaderseg[NUMMAPS];\r
+       __SEGA  *tinf;\r
 } ca_mapinfo_t;\r
 \r
 typedef struct\r

diff --git a/src/lib/types.h b/src/lib/types.h
index e147ececf2ab070ef221b3df3738d1817cf6c4ee..9d0e7b3b5a8c1540b35d94ac2d12b0ef288666be 100755 (executable)
--- a/src/lib/types.h
+++ b/src/lib/types.h
@@ -50,9 +50,11 @@ MK_FP(segment value, 0)*/
 #ifdef __WATCOMC__\r
 typedef void __based( void ) * memptr; ////old //----typedef void __based(__self) * memptr;\r
 typedef unsigned short _seg; // it will contains segment value (as Borland _seg)\r
+#define __SEGA __segment\r
 #endif\r
 #ifdef __BORLANDC__\r
 typedef void _seg * memptr;\r
+#define __SEGA _seg\r
 #endif\r
 \r
 #endif/*_TYPE_H_*/\r