From 633bfa5a2a8416f6550866feb3bc1e027f3b19cf Mon Sep 17 00:00:00 2001 From: sparky4 Date: Wed, 5 Aug 2015 19:25:35 -0500 Subject: [PATCH] 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 --- DEBUG.16 | 26 ++++++++++++++++++-------- HEAP.16 | 22 +++++++++++----------- MMDUMP.16 | Bin 136 -> 44 bytes exmmtest.exe | Bin 43384 -> 43080 bytes src/exmmtest.c | 10 +++++----- src/lib/16_mm.c | 25 +++++++++++-------------- src/lib/16_mm.h | 2 +- 7 files changed, 46 insertions(+), 39 deletions(-) diff --git a/DEBUG.16 b/DEBUG.16 index 05af38d2..7eaa3cc3 100644 --- a/DEBUG.16 +++ b/DEBUG.16 @@ -1,8 +1,18 @@ -0 Size:5492 Owner:0x7400 -0 Size:5492 Owner:0x7400 -1574 Size:256 Owner:0x4cde -Seg:1674 Size:273 Owner:0x857a -Seg:1cc4 Size:49 Owner:0x62b9 -Seg:1cc4 Size:49 Owner:0x62b9 -acf5 Size:13067 Owner:0xbf80 -Seg:e000 Size:4294909951 Owner:0x11c +0 Size:5546 Owner:0x0 +0 Size:5546 Owner:0x0 +15aa Size:256 Owner:0x351e +Seg:16aa Size:273 Owner:0x857a +Seg:1cf8 Size:49 Owner:0x0 +Seg:ad29 Size:8920 Owner:0x0 +Seg:d022 Size:4294967263 Owner:0x0 +Seg:d022 Size:4294967263 Owner:0x0 +Seg:d022 Size:4294967263 Owner:0x0 +Seg:d022 Size:4294967263 Owner:0x0 +Seg:d022 Size:4294967263 Owner:0x0 +Seg:d022 Size:4294967263 Owner:0x0 +Seg:d022 Size:4294967263 Owner:0x0 +Seg:d022 Size:4294967263 Owner:0x0 +Seg:d022 Size:4294967263 Owner:0x0 +Seg:d022 Size:4294967263 Owner:0x0 +Seg:d022 Size:419 Owner:0x0 +Seg:e000 Size:4294909951 Owner:0x0 diff --git a/HEAP.16 b/HEAP.16 index c9f32b98..7a50a81f 100644 --- a/HEAP.16 +++ b/HEAP.16 @@ -1,11 +1,11 @@ == default == - USED block at 1ce60016 of size 136 - USED block at 1ce6009e of size 66 - FREE block at 1ce600e0 of size 18 - USED block at 1ce600f2 of size 20 - FREE block at 1ce60106 of size 7926 + USED block at 1d1a0016 of size 136 + USED block at 1d1a009e of size 66 + FREE block at 1d1a00e0 of size 18 + USED block at 1d1a00f2 of size 20 + FREE block at 1d1a0106 of size 7926 OK - end of heap == near == @@ -33,13 +33,13 @@ OK - end of heap Memory Type Total Used Free ---------------- -------- -------- -------- Default 8166 222 7944 -Near 31318 834 30484 +Near 31318 862 30456 Far 8166 222 7944 ---------------- -------- -------- -------- -coreleft = 30482 -farcoreleft = 38230 +coreleft = 30454 +farcoreleft = 38202 GetFreeSize = 7768 -GetNearFreeSize = 30484 +GetNearFreeSize = 30456 GetFarFreeSize = 7768 -memavl = 30482 -stackavail = 17129 +memavl = 30454 +stackavail = 11049 diff --git a/MMDUMP.16 b/MMDUMP.16 index 5ad0a04fac3d285c0bb5aec06ed4e80e398e4e00..58c6845a294eceda0a09feedb63490c52597f51a 100644 GIT binary patch literal 44 ocmXr0FfcGmu`)I_OjXd(WzbZxRWRV?GJuF$n3^X7MFpXv0MFM5i2wiq literal 136 zcmXr0FfcGlwlXj@Ojgj){jaHDt6*koYHZ5OWdM{hO0hCYPDusIFo0wXAfiC^W=2Vt nKv6?fQF9Xm1E6RLk|@vw3sdt%pr{~{DA0tYGz*YgZm1{#_!t~f diff --git a/exmmtest.exe b/exmmtest.exe index 9499bf14f0af2f27ebdbc9411c3e04577c92f40c..72f080b382981360b59fdf6a68fd3d0c676288f9 100644 GIT binary patch delta 11220 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 delta 11556 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 diff --git a/src/exmmtest.c b/src/exmmtest.c index 0c65a477..82cc6d37 100644 --- a/src/exmmtest.c +++ b/src/exmmtest.c @@ -142,16 +142,16 @@ main(int argc, char *argv[]) if(baka) printf("\nyay!\n"); else printf("\npoo!\n"); #endif - printf("bigbuffer= %Fp\n", bigbuffer); - printf("&bigbuffer= %Fp\n", &bigbuffer); - printf("bigbuffer= %04x\n", bigbuffer); - printf("&bigbuffer= %04x\n", &bigbuffer); + //printf("bigbuffer= %Fp\n", bigbuffer); + //printf("&bigbuffer= %Fp\n", &bigbuffer); + //printf("bigbuffer= %04x\n", bigbuffer); + //printf("&bigbuffer= %04x\n", &bigbuffer); //printf("\n\n"); //printf("Total free: %lu\n", (dword)(GetFreeSize())); //printf("Total near free: %lu\n", (dword)(GetNearFreeSize())); //printf("Total far free: %lu\n", (dword)(GetFarFreeSize())); //getch(); - printf("\n"); +// printf("\n"); #ifdef __WATCOMC__ heapdump(); #endif diff --git a/src/lib/16_mm.c b/src/lib/16_mm.c index fda606f2..ba29d60c 100644 --- 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 9a01862a..49a943fc 100644 --- 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 -- 2.39.2