okies ^^

	modified:   DEBUG.16
	modified:   HEAP.16
	modified:   MMDUMP.16
	modified:   exmmtest.exe
	modified:   src/exmmtest.c
	modified:   src/lib/16_mm.c
	modified:   src/lib/16_mm.h

diff --git a/DEBUG.16 b/DEBUG.16
index 05af38d200a3575f58314d5ecc2adc2628e99edb..7eaa3cc30365f41e29d05d4d107e80e19f70db88 100644 (file)
--- a/DEBUG.16
+++ b/DEBUG.16
@@ -1,8 +1,18 @@
-0      Size:5492       Owner:0x7400\r
-0      Size:5492       Owner:0x7400\r
-1574   Size:256        Owner:0x4cde\r
-Seg:1674       Size:273        Owner:0x857a\r
-Seg:1cc4       Size:49 Owner:0x62b9\r
-Seg:1cc4       Size:49 Owner:0x62b9\r
-acf5   Size:13067      Owner:0xbf80\r
-Seg:e000       Size:4294909951 Owner:0x11c\r
+0      Size:5546       Owner:0x0\r
+0      Size:5546       Owner:0x0\r
+15aa   Size:256        Owner:0x351e\r
+Seg:16aa       Size:273        Owner:0x857a\r
+Seg:1cf8       Size:49 Owner:0x0\r
+Seg:ad29       Size:8920       Owner:0x0\r
+Seg:d022       Size:4294967263 Owner:0x0\r
+Seg:d022       Size:4294967263 Owner:0x0\r
+Seg:d022       Size:4294967263 Owner:0x0\r
+Seg:d022       Size:4294967263 Owner:0x0\r
+Seg:d022       Size:4294967263 Owner:0x0\r
+Seg:d022       Size:4294967263 Owner:0x0\r
+Seg:d022       Size:4294967263 Owner:0x0\r
+Seg:d022       Size:4294967263 Owner:0x0\r
+Seg:d022       Size:4294967263 Owner:0x0\r
+Seg:d022       Size:4294967263 Owner:0x0\r
+Seg:d022       Size:419        Owner:0x0\r
+Seg:e000       Size:4294909951 Owner:0x0\r

diff --git a/HEAP.16 b/HEAP.16
index c9f32b9808204994c292ea3ad49a7a4aacca2e0b..7a50a81ff8e0959bb79c8f186893c1eb79d441af 100644 (file)
--- a/HEAP.16
+++ b/HEAP.16
@@ -1,11 +1,11 @@
 \r
        == default ==\r
 \r
-  USED block at 1ce60016 of size 136\r
-  USED block at 1ce6009e of size 66\r
-  FREE block at 1ce600e0 of size 18\r
-  USED block at 1ce600f2 of size 20\r
-  FREE block at 1ce60106 of size 7926\r
+  USED block at 1d1a0016 of size 136\r
+  USED block at 1d1a009e of size 66\r
+  FREE block at 1d1a00e0 of size 18\r
+  USED block at 1d1a00f2 of size 20\r
+  FREE block at 1d1a0106 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              31318        834     30484\r
+Near              31318        862     30456\r
 Far               8166 222     7944\r
 ----------------  --------   --------   --------\r
-coreleft = 30482\r
-farcoreleft = 38230\r
+coreleft = 30454\r
+farcoreleft = 38202\r
 GetFreeSize = 7768\r
-GetNearFreeSize = 30484\r
+GetNearFreeSize = 30456\r
 GetFarFreeSize = 7768\r
-memavl = 30482\r
-stackavail = 17129\r
+memavl = 30454\r
+stackavail = 11049\r

diff --git a/MMDUMP.16 b/MMDUMP.16
index 5ad0a04fac3d285c0bb5aec06ed4e80e398e4e00..58c6845a294eceda0a09feedb63490c52597f51a 100644 (file)
Binary files a/MMDUMP.16 and b/MMDUMP.16 differ

diff --git a/exmmtest.exe b/exmmtest.exe
index 9499bf14f0af2f27ebdbc9411c3e04577c92f40c..72f080b382981360b59fdf6a68fd3d0c676288f9 100644 (file)
Binary files a/exmmtest.exe and b/exmmtest.exe differ

diff --git a/src/exmmtest.c b/src/exmmtest.c
index 0c65a477976cdf2459a7ce75bf829f244c4af0ae..82cc6d37c6c6b4307bb177fe728a7a6101cc7a68 100644 (file)
--- a/src/exmmtest.c
+++ b/src/exmmtest.c
@@ -142,16 +142,16 @@ main(int argc, char *argv[])
        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("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("\n");\r
 #ifdef __WATCOMC__\r
        heapdump();\r
 #endif\r

diff --git a/src/lib/16_mm.c b/src/lib/16_mm.c
index fda606f270e6599df05fceed762bf0544d95cf2d..ba29d60c72b9d5191701f14c664441a37f7a93a4 100644 (file)
--- a/src/lib/16_mm.c
+++ b/src/lib/16_mm.c
@@ -478,7 +478,7 @@ boolean MML_CheckForXMS(mminfo_t *mm)
 
 void MML_SetupXMS(mminfo_t *mm, mminfotype *mmi)
 {
-       unsigned        base,size;
+       word    base,size;
 
 getmemory:
        __asm {
@@ -517,7 +517,7 @@ getmemory:
 #ifdef __WATCOMC__
        }
 #endif
-       printf("base=%u ", base); printf("size=%u\n", size);
+//     printf("base=%u ", base); printf("size=%u\n", size);
        MML_UseSpace(base,size, mm);
        mmi->XMSmem += size*16;
        mm->UMBbase[mm->numUMBs] = base;
@@ -833,9 +833,6 @@ void MM_Startup(mminfo_t *mm, mminfotype *mmi)
                        //MM_MapXEMS(mm, mmi);                                  // map in used pages
        }
 
-mmi->XMSmem=0;
-goto xmsskip;
-
 //
 // detect XMS and get upper memory blocks
 //
@@ -894,15 +891,15 @@ void MM_Shutdown(mminfo_t *mm)
        if(!(mm->mmstarted))
                return;
 
-       _ffree(mm->farheap);    printf("                far freed\n");
+       _ffree(mm->farheap);//  printf("                far freed\n");
 #ifdef __WATCOMC__
-       _nfree(mm->nearheap);   printf("                near freed\n");
+       _nfree(mm->nearheap);// printf("                near freed\n");
 #endif
 #ifdef __BORLANDC__
-       free(mm->nearheap);     printf("                near freed\n");
+       free(mm->nearheap);//   printf("                near freed\n");
 #endif
-       if(MML_CheckForEMS()){ MML_ShutdownEMS(mm); printf("            EMS freed\n"); }
-       if(MML_CheckForXMS(mm)){ MML_ShutdownXMS(mm); printf("          XMS freed\n"); }
+       if(MML_CheckForEMS()){ MML_ShutdownEMS(mm); }//printf("         EMS freed\n"); }
+       if(MML_CheckForXMS(mm)){ MML_ShutdownXMS(mm); }//printf("               XMS freed\n"); }
 }
 
 //==========================================================================
@@ -1461,8 +1458,8 @@ dword MM_UnusedMemory(mminfo_t *mm)
                scan = scan->next;
        }
 
-//     return free*16l;
-       return free;
+       return free*16lu;
+//     return free;
 }
 
 //==========================================================================
@@ -1494,8 +1491,8 @@ dword MM_TotalFree(mminfo_t *mm)
                scan = scan->next;
        }
 
-//     return free*16l;
-       return free;
+       return free*16lu;
+//     return free;
 }
 
 //==========================================================================

diff --git a/src/lib/16_mm.h b/src/lib/16_mm.h
index 9a01862a667e9c908c236a92347201ba7331fa1e..49a943fc25e9fd32438b45d99e191235c88410d1 100644 (file)
--- a/src/lib/16_mm.h
+++ b/src/lib/16_mm.h
@@ -46,7 +46,7 @@
 
 #define        BUFFERSIZE              0x1000          // miscelanious, allways available buffer
 
-#define MAXBLOCKS              720
+#define MAXBLOCKS              1024