wwww fixed up the debug dump and still working on improveing the debug memory stuff

	deleted:    16_CA.BCO
	deleted:    16_HC.BCO
	deleted:    16_HEAD.BCO
	deleted:    16_MM.BCO
	modified:   DEBUG.16
	deleted:    EXMMBC.BCO
	modified:   HEAP.16
	deleted:    KITTEN.BCO
	modified:   exmmtest.exe
	modified:   src/lib/16_mm.c
	modified:   tsthimem.exe

diff --git a/16_CA.BCO b/16_CA.BCO
deleted file mode 100644 (file)
index 45dacb9..0000000
Binary files a/16_CA.BCO and /dev/null differ

diff --git a/16_HC.BCO b/16_HC.BCO
deleted file mode 100644 (file)
index 4c7dc4c..0000000
Binary files a/16_HC.BCO and /dev/null differ

diff --git a/16_HEAD.BCO b/16_HEAD.BCO
deleted file mode 100644 (file)
index 4414798..0000000
Binary files a/16_HEAD.BCO and /dev/null differ

diff --git a/16_MM.BCO b/16_MM.BCO
deleted file mode 100644 (file)
index 0e19705..0000000
Binary files a/16_MM.BCO and /dev/null differ

diff --git a/DEBUG.16 b/DEBUG.16
index 843fc6fea73535af8c13f624e333ff7cda0bc5aa..eb29f127549939a648e80d99d654730b1c1d0267 100644 (file)
--- a/DEBUG.16
+++ b/DEBUG.16
@@ -1,17 +1,17 @@
-\e[0mSeg:0      Size:5533       Owner:0x0\r
-\e[41;31m++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\e[0m\e[47;37m_\e[0m\r
-\e[42;32m0\e[0m\r
-\e[0mSeg:159d   Size:256        Owner:0x351c\r
+\e[0mSeg:0      Size:5188       Owner:0x0\r
+\e[41;31m+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\e[0m\e[47;37m_\e[0m\r
+\e[42;32m0\r
+\e[0m\e[0mSeg:1444       Size:256        Owner:0x351c\r
+\e[44;34m+++++\e[0m\e[47;37m_\e[0m\r
+\e[42;32m\r
+\e[0m\e[0mSeg:1544       Size:273        Owner:0x858c\r
 \e[44;34m++++\e[0m\e[47;37m_\e[0m\r
-\e[42;32m\e[0m\r
-\e[0mSeg:169d   Size:273        Owner:0x858c\r
-\e[44;34m++++\e[0m\e[47;37m_\e[0m\r
-\e[42;32m\e[0m\r
-\e[0mSeg:1cec   Size:40 Owner:0x0\r
+\e[42;32m\r
+\e[0m\e[0mSeg:1bab       Size:40 Owner:0x0\r
 \e[41;31m++\e[0m\e[47;37m_\e[0m\r
-\e[42;32m000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\e[0m\r
-\e[0mSeg:ad14   Size:13036      Owner:0x0\r
-\e[41;31m++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\e[0m\e[47;37m_\e[0m\r
-\e[42;32m\e[0m\r
-\e[0mSeg:e000   Size:8191       Owner:0x0\r
-\e[41;31m++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\e[0m\e[47;37m_\e[0m\r
+\e[42;32m0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\r
+\e[0m\e[0mSeg:abd3       Size:13357      Owner:0x0\r
+\e[41;31m++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\e[0m\e[47;37m_\e[0m\r
+\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

diff --git a/EXMMBC.BCO b/EXMMBC.BCO
deleted file mode 100644 (file)
index 5a6c7b0..0000000
Binary files a/EXMMBC.BCO and /dev/null differ

diff --git a/HEAP.16 b/HEAP.16
index 8b79abd641d3e9ebc95063174f0a91f22a7c7de3..35e303cffde6a81a4a93ba66e84570ea9f9c1cc1 100644 (file)
--- a/HEAP.16
+++ b/HEAP.16
@@ -1,11 +1,11 @@
 \r
        == default ==\r
 \r
-  USED block at 1d0e0016 of size 66\r
-  FREE block at 1d0e0058 of size 18\r
-  USED block at 1d0e006a of size 136\r
-  USED block at 1d0e00f2 of size 20\r
-  FREE block at 1d0e0106 of size 7926\r
+  USED block at 1bcd0016 of size 66\r
+  FREE block at 1bcd0058 of size 18\r
+  USED block at 1bcd006a of size 136\r
+  USED block at 1bcd00f2 of size 20\r
+  FREE block at 1bcd0106 of size 7926\r
 OK - end of heap\r
 \r
        == near ==\r
@@ -33,13 +33,13 @@ OK - end of heap
 Memory Type         Total      Used       Free\r
 ----------------  --------   --------   --------\r
 Default                   8166         222       7944\r
-Near              31302        834       30468\r
+Near              31302        454       30848\r
 Far               8166         222       7944\r
 ----------------  --------   --------   --------\r
-coreleft = 30466\r
-farcoreleft = 38214\r
-GetFreeSize = 7768\r
-GetNearFreeSize = 30468\r
-GetFarFreeSize = 7768\r
-memavl = 30466\r
-stackavail = 11029\r
+coreleft = 30846\r
+farcoreleft = 46786\r
+GetFreeSize = 15960\r
+GetNearFreeSize = 30848\r
+GetFarFreeSize = 15960\r
+memavl = 30846\r
+stackavail = 11031\r

diff --git a/KITTEN.BCO b/KITTEN.BCO
deleted file mode 100644 (file)
index a098a2a..0000000
Binary files a/KITTEN.BCO and /dev/null differ

diff --git a/exmmtest.exe b/exmmtest.exe
index 46f3f84558b66dda4a14f4b2007bb9147f77a6b4..c39d88f79323fb837a37be6c525cce5723629b26 100644 (file)
Binary files a/exmmtest.exe and b/exmmtest.exe differ

diff --git a/src/lib/16_mm.c b/src/lib/16_mm.c
index 5dbeaa0027c423c55577e8f04ee83f5a61446e34..11897608930c4cadff5b1644a402d6ad3a43eb5c 100644 (file)
--- a/src/lib/16_mm.c
+++ b/src/lib/16_mm.c
@@ -1351,9 +1351,10 @@ void MM_ShowMemory(global_game_variables_t *gvar,/*page_t *page, */mminfo_t *mm)
                                //printf("0     %x      %u      %lu\n", scan->next->start, w, scan->length);
                                strcat(scratch0,"0");
                        }
-                       //printf("==================\n");
-                       //printf("w=%x  start=%x        next=%x end=%u  %lu\n", w, scan->start, (scan->next->start), end+1, wwww);
-                       //printf("==================\n");
+                       printf("==================\n");
+                       printf("w=%x    start=%x        next=%x end=%u  %lu\n", w, scan->start, (scan->next->start), end+1, wwww);
+                       printf("==================\n");
+                       strcat(scratch0, "\n");
                }/*else {//if(scan->next->start <= scan->start){
                        scan->next->start=scan->start+0x1000;
                        wwww=(dword)(scan->next->start)-(dword)scan->start;
@@ -1371,7 +1372,7 @@ void MM_ShowMemory(global_game_variables_t *gvar,/*page_t *page, */mminfo_t *mm)
 //                     getch();
                }*/
                strcat(scratch0, AARESET);
-               strcat(scratch0,"\n");
+               //strcat(scratch0,"\n");
                        //for(chx=scan->next->start;chx+4>=(word)end+1;chx+=4)
                        //{
 //                             chx+=scan->next->start;

diff --git a/tsthimem.exe b/tsthimem.exe
index 282bd13ede9bc83446ee5e8bbb9a2071df50eeb4..8a00b50cab11b0320893fc840817776e74a28ef4 100644 (file)
Binary files a/tsthimem.exe and b/tsthimem.exe differ