From: sparky4 Date: Sat, 10 Sep 2016 21:20:15 +0000 (-0500) Subject: wwww format of showmem edited X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=ecd709958227c333978aae2f21f7d96797bfd015;p=16.git wwww format of showmem edited --- diff --git a/DEBUG.16B b/DEBUG.16B index d10b5a80..546573cb 100755 --- a/DEBUG.16B +++ b/DEBUG.16B @@ -1,17 +1,12 @@ -Seg:0 Size:2898 Owner:0xe8be -+++++++++++++++++++++++++++++++++++++_ -0 -Seg:b52 Size:256 Owner:0xcf80 -++++_ - -Seg:c52 Size:273 Owner:0xfe0 -++++_ -00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +Seg:0 Size:2982 Owner:0x6574 +++++++++++++++++++++++++++++++++++++++0 +Seg:ba6 Size:256 Owner:0xcf7a +++++ +Seg:ca6 Size:273 Owner:0xfde +++++000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 Seg:9fde Size:28706 Owner:0x0 -_ - + Seg:9ffe Size:16386 Owner:0x0 -++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++_ - +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Seg:e000 Size:8191 Owner:0x0 -++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++_ \ No newline at end of file +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ \ No newline at end of file diff --git a/DEBUG.16W b/DEBUG.16W index eb376e65..8f3ffe4d 100755 --- a/DEBUG.16W +++ b/DEBUG.16W @@ -1,17 +1,12 @@ -Seg:0 Size:8041 Owner:0x0 -+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++_ -0 -Seg:1f69 Size:256 Owner:0x5274 -++++_ - -Seg:2069 Size:273 Owner:0x92cc -+++++_ - -Seg:25ea Size:44 Owner:0x0 -+_ -00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Seg:b616 Size:10730 Owner:0x0 -+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++_ - +Seg:0 Size:7812 Owner:0x6568 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++0 +Seg:1e84 Size:256 Owner:0x5274 +++++ +Seg:1f84 Size:273 Owner:0x92cc ++++++ +Seg:2513 Size:44 Owner:0x0 +++0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +Seg:b53f Size:10945 Owner:0x0 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Seg:e000 Size:8191 Owner:0x0 -++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++_ \ No newline at end of file +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ \ No newline at end of file diff --git a/HEAP.16W b/HEAP.16W index d4ef59d0..d873f507 100755 --- a/HEAP.16W +++ b/HEAP.16W @@ -1,47 +1,47 @@ == default == - USED block at 260c0016 of size 66 - USED block at 260c0058 of size 66 - FREE block at 260c009a of size 18 - USED block at 260c00ac of size 136 - USED block at 260c0134 of size 20 - FREE block at 260c0148 of size 7860 + USED block at 25350016 of size 66 + USED block at 25350058 of size 66 + FREE block at 2535009a of size 18 + USED block at 253500ac of size 136 + USED block at 25350134 of size 20 + FREE block at 25350148 of size 7860 OK - end of heap == near == - USED block at 160b9306 of size 12 - USED block at 160b9312 of size 530 - USED block at 160b9524 of size 72 - USED block at 160b956c of size 20 - USED block at 160b9580 of size 20 - USED block at 160b9594 of size 20 - USED block at 160b95a8 of size 20 - USED block at 160b95bc of size 20 - USED block at 160b95d0 of size 27180 + USED block at 15349306 of size 12 + USED block at 15349312 of size 332 + USED block at 1534945e of size 52 + USED block at 15349492 of size 20 + USED block at 153494a6 of size 20 + USED block at 153494ba of size 20 + USED block at 153494ce of size 20 + USED block at 153494e2 of size 20 + USED block at 153494f6 of size 27398 OK - end of heap == far == - USED block at 260c0016 of size 66 - USED block at 260c0058 of size 66 - USED block at 260c009a of size 18 - USED block at 260c00ac of size 136 - USED block at 260c0134 of size 20 - USED block at 260c0148 of size 7860 + USED block at 25350016 of size 66 + USED block at 25350058 of size 66 + USED block at 2535009a of size 18 + USED block at 253500ac of size 136 + USED block at 25350134 of size 20 + USED block at 25350148 of size 7860 OK - end of heap Memory Type Total Used Free ---------------- -------- -------- -------- Default 8166 288 7878 -Near 27894 714 27180 +Near 27894 496 27398 Far 8166 288 7878 ---------------- -------- -------- -------- -coreleft = 27178 -farcoreleft = 59464 -GetFreeSize = 32304 -GetNearFreeSize = 27180 -GetFarFreeSize = 32304 -memavl = 27178 +coreleft = 27396 +farcoreleft = 2352 +GetFreeSize = 40512 +GetNearFreeSize = 27398 +GetFarFreeSize = 40512 +memavl = 27396 stackavail = 11792 diff --git a/MMDUMP.16B b/MMDUMP.16B index f8f409f2..2e06a768 100755 Binary files a/MMDUMP.16B and b/MMDUMP.16B differ diff --git a/MMDUMP.16W b/MMDUMP.16W index 9aae7dc2..0270a6db 100755 Binary files a/MMDUMP.16W and b/MMDUMP.16W differ diff --git a/bcexmm.dsk b/bcexmm.dsk index a7d7bc63..9d1c2ae5 100755 Binary files a/bcexmm.dsk and b/bcexmm.dsk differ diff --git a/bcexmm.exe b/bcexmm.exe index 2cdb4e56..d4ca4af8 100755 Binary files a/bcexmm.exe and b/bcexmm.exe differ diff --git a/bcexmm.prj b/bcexmm.prj index bf5ac135..6a7ef631 100755 Binary files a/bcexmm.prj and b/bcexmm.prj differ diff --git a/modex.lib b/modex.lib deleted file mode 100755 index 560a1c68..00000000 Binary files a/modex.lib and /dev/null differ diff --git a/src/lib/16_mm.c b/src/lib/16_mm.c index 66271124..add7707e 100755 --- 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 5323222e..fdf96a27 100755 --- a/src/lib/typdefst.h +++ b/src/lib/typdefst.h @@ -194,9 +194,9 @@ typedef struct typedef struct { int mapon, mapnum; - __segment *mapsegs[4]; - __segment *mapheaderseg[NUMMAPS]; - __segment *tinf; + __SEGA *mapsegs[4]; + __SEGA *mapheaderseg[NUMMAPS]; + __SEGA *tinf; } ca_mapinfo_t; typedef struct diff --git a/src/lib/types.h b/src/lib/types.h index e147ecec..9d0e7b3b 100755 --- a/src/lib/types.h +++ b/src/lib/types.h @@ -50,9 +50,11 @@ MK_FP(segment value, 0)*/ #ifdef __WATCOMC__ typedef void __based( void ) * memptr; ////old //----typedef void __based(__self) * memptr; typedef unsigned short _seg; // it will contains segment value (as Borland _seg) +#define __SEGA __segment #endif #ifdef __BORLANDC__ typedef void _seg * memptr; +#define __SEGA _seg #endif #endif/*_TYPE_H_*/