From: sparky4 <sparky4@cock.li> Date: Thu, 29 Sep 2016 20:04:45 +0000 (-0500) Subject: xms Works but it is quick and dirty and reliese on older C code with _REG defs and... X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=093c85d77838f681dee4a6cf13264a3e30b63d4f;p=16.git xms Works but it is quick and dirty and reliese on older C code with _REG defs and the Assembly translation is not smooth --- diff --git a/DEBUG.16W b/DEBUG.16W index 35c40cbf..dee25a22 100755 --- a/DEBUG.16W +++ b/DEBUG.16W @@ -1,210 +1,210 @@ -[0mSeg:0 Size:9844 Owner:0x0 +[0mSeg:0 Size:9855 Owner:0x0 [41;31m++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++[0m[42;32m0 -[0m[0mSeg:2674 Size:256 Owner:0x18a8 +[0m[0mSeg:267f Size:256 Owner:0x18a8 [44;34m++++[0m[42;32m -[0m[0mSeg:27f0 Size:44 Owner:0x0 +[0m[0mSeg:27fb Size:44 Owner:0x0 [41;31m++[0m[42;32m -[0m[0mSeg:281c Size:256 Owner:0x1696 +[0m[0mSeg:2827 Size:256 Owner:0x1696 [45;35m++++[0m[42;32m -[0m[0mSeg:291c Size:256 Owner:0x1698 +[0m[0mSeg:2927 Size:256 Owner:0x1698 [45;35m++++[0m[42;32m -[0m[0mSeg:2a1c Size:256 Owner:0x169a -[45;35m++++[0m[42;32m -[0m[0mSeg:2b1c Size:256 Owner:0x169c +[0m[0mSeg:2a27 Size:256 Owner:0x169a [45;35m+++++[0m[42;32m -[0m[0mSeg:2c1c Size:256 Owner:0x169e +[0m[0mSeg:2b27 Size:256 Owner:0x169c [45;35m++++[0m[42;32m -[0m[0mSeg:2d1c Size:256 Owner:0x16a0 +[0m[0mSeg:2c27 Size:256 Owner:0x169e [45;35m++++[0m[42;32m -[0m[0mSeg:2e1c Size:256 Owner:0x16a2 +[0m[0mSeg:2d27 Size:256 Owner:0x16a0 [45;35m++++[0m[42;32m -[0m[0mSeg:2f1c Size:256 Owner:0x16a4 +[0m[0mSeg:2e27 Size:256 Owner:0x16a2 [45;35m++++[0m[42;32m -[0m[0mSeg:301c Size:256 Owner:0x16a6 +[0m[0mSeg:2f27 Size:256 Owner:0x16a4 [45;35m+++++[0m[42;32m -[0m[0mSeg:311c Size:256 Owner:0x16a8 +[0m[0mSeg:3027 Size:256 Owner:0x16a6 [45;35m++++[0m[42;32m -[0m[0mSeg:321c Size:256 Owner:0x16aa +[0m[0mSeg:3127 Size:256 Owner:0x16a8 [45;35m++++[0m[42;32m -[0m[0mSeg:331c Size:256 Owner:0x16ac +[0m[0mSeg:3227 Size:256 Owner:0x16aa [45;35m++++[0m[42;32m -[0m[0mSeg:341c Size:256 Owner:0x16ae +[0m[0mSeg:3327 Size:256 Owner:0x16ac [45;35m++++[0m[42;32m -[0m[0mSeg:351c Size:256 Owner:0x16b0 +[0m[0mSeg:3427 Size:256 Owner:0x16ae [45;35m+++++[0m[42;32m -[0m[0mSeg:361c Size:256 Owner:0x16b2 +[0m[0mSeg:3527 Size:256 Owner:0x16b0 [45;35m++++[0m[42;32m -[0m[0mSeg:371c Size:256 Owner:0x16b4 +[0m[0mSeg:3627 Size:256 Owner:0x16b2 [45;35m++++[0m[42;32m -[0m[0mSeg:381c Size:256 Owner:0x16b6 +[0m[0mSeg:3727 Size:256 Owner:0x16b4 [45;35m++++[0m[42;32m -[0m[0mSeg:391c Size:256 Owner:0x16b8 +[0m[0mSeg:3827 Size:256 Owner:0x16b6 [45;35m++++[0m[42;32m -[0m[0mSeg:3a1c Size:256 Owner:0x16ba +[0m[0mSeg:3927 Size:256 Owner:0x16b8 [45;35m+++++[0m[42;32m -[0m[0mSeg:3b1c Size:256 Owner:0x16bc +[0m[0mSeg:3a27 Size:256 Owner:0x16ba [45;35m++++[0m[42;32m -[0m[0mSeg:3c1c Size:256 Owner:0x16be +[0m[0mSeg:3b27 Size:256 Owner:0x16bc [45;35m++++[0m[42;32m -[0m[0mSeg:3d1c Size:256 Owner:0x16c0 +[0m[0mSeg:3c27 Size:256 Owner:0x16be [45;35m++++[0m[42;32m -[0m[0mSeg:3e1c Size:256 Owner:0x16c2 +[0m[0mSeg:3d27 Size:256 Owner:0x16c0 [45;35m++++[0m[42;32m -[0m[0mSeg:3f1c Size:256 Owner:0x16c4 +[0m[0mSeg:3e27 Size:256 Owner:0x16c2 [45;35m+++++[0m[42;32m -[0m[0mSeg:401c Size:256 Owner:0x16c6 +[0m[0mSeg:3f27 Size:256 Owner:0x16c4 [45;35m++++[0m[42;32m -[0m[0mSeg:411c Size:256 Owner:0x16c8 +[0m[0mSeg:4027 Size:256 Owner:0x16c6 [45;35m++++[0m[42;32m -[0m[0mSeg:421c Size:256 Owner:0x16ca +[0m[0mSeg:4127 Size:256 Owner:0x16c8 [45;35m++++[0m[42;32m -[0m[0mSeg:431c Size:256 Owner:0x16cc +[0m[0mSeg:4227 Size:256 Owner:0x16ca [45;35m++++[0m[42;32m -[0m[0mSeg:441c Size:256 Owner:0x16ce +[0m[0mSeg:4327 Size:256 Owner:0x16cc [45;35m+++++[0m[42;32m -[0m[0mSeg:451c Size:256 Owner:0x16d0 +[0m[0mSeg:4427 Size:256 Owner:0x16ce [45;35m++++[0m[42;32m -[0m[0mSeg:461c Size:256 Owner:0x16d2 +[0m[0mSeg:4527 Size:256 Owner:0x16d0 [45;35m++++[0m[42;32m -[0m[0mSeg:471c Size:256 Owner:0x16d4 +[0m[0mSeg:4627 Size:256 Owner:0x16d2 [45;35m++++[0m[42;32m -[0m[0mSeg:481c Size:256 Owner:0x16d6 +[0m[0mSeg:4727 Size:256 Owner:0x16d4 [45;35m++++[0m[42;32m -[0m[0mSeg:491c Size:256 Owner:0x16d8 +[0m[0mSeg:4827 Size:256 Owner:0x16d6 [45;35m+++++[0m[42;32m -[0m[0mSeg:4a1c Size:256 Owner:0x16da +[0m[0mSeg:4927 Size:256 Owner:0x16d8 [45;35m++++[0m[42;32m -[0m[0mSeg:4b1c Size:256 Owner:0x16dc +[0m[0mSeg:4a27 Size:256 Owner:0x16da [45;35m++++[0m[42;32m -[0m[0mSeg:4c1c Size:256 Owner:0x16de +[0m[0mSeg:4b27 Size:256 Owner:0x16dc [45;35m++++[0m[42;32m -[0m[0mSeg:4d1c Size:256 Owner:0x16e0 +[0m[0mSeg:4c27 Size:256 Owner:0x16de [45;35m++++[0m[42;32m -[0m[0mSeg:4e1c Size:256 Owner:0x16e2 +[0m[0mSeg:4d27 Size:256 Owner:0x16e0 [45;35m+++++[0m[42;32m -[0m[0mSeg:4f1c Size:256 Owner:0x16e4 +[0m[0mSeg:4e27 Size:256 Owner:0x16e2 [45;35m++++[0m[42;32m -[0m[0mSeg:501c Size:256 Owner:0x16e6 +[0m[0mSeg:4f27 Size:256 Owner:0x16e4 [45;35m++++[0m[42;32m -[0m[0mSeg:511c Size:256 Owner:0x16e8 +[0m[0mSeg:5027 Size:256 Owner:0x16e6 [45;35m++++[0m[42;32m -[0m[0mSeg:521c Size:256 Owner:0x16ea +[0m[0mSeg:5127 Size:256 Owner:0x16e8 [45;35m++++[0m[42;32m -[0m[0mSeg:531c Size:256 Owner:0x16ec +[0m[0mSeg:5227 Size:256 Owner:0x16ea [45;35m+++++[0m[42;32m -[0m[0mSeg:541c Size:256 Owner:0x16ee +[0m[0mSeg:5327 Size:256 Owner:0x16ec [45;35m++++[0m[42;32m -[0m[0mSeg:551c Size:256 Owner:0x16f0 +[0m[0mSeg:5427 Size:256 Owner:0x16ee [45;35m++++[0m[42;32m -[0m[0mSeg:561c Size:256 Owner:0x16f2 +[0m[0mSeg:5527 Size:256 Owner:0x16f0 [45;35m++++[0m[42;32m -[0m[0mSeg:571c Size:256 Owner:0x16f4 +[0m[0mSeg:5627 Size:256 Owner:0x16f2 [45;35m++++[0m[42;32m -[0m[0mSeg:581c Size:256 Owner:0x16f6 +[0m[0mSeg:5727 Size:256 Owner:0x16f4 [45;35m+++++[0m[42;32m -[0m[0mSeg:591c Size:256 Owner:0x16f8 +[0m[0mSeg:5827 Size:256 Owner:0x16f6 [45;35m++++[0m[42;32m -[0m[0mSeg:5a1c Size:256 Owner:0x16fa +[0m[0mSeg:5927 Size:256 Owner:0x16f8 [45;35m++++[0m[42;32m -[0m[0mSeg:5b1c Size:256 Owner:0x16fc +[0m[0mSeg:5a27 Size:256 Owner:0x16fa [45;35m++++[0m[42;32m -[0m[0mSeg:5c1c Size:256 Owner:0x16fe +[0m[0mSeg:5b27 Size:256 Owner:0x16fc [45;35m++++[0m[42;32m -[0m[0mSeg:5d1c Size:256 Owner:0x1700 +[0m[0mSeg:5c27 Size:256 Owner:0x16fe [45;35m+++++[0m[42;32m -[0m[0mSeg:5e1c Size:256 Owner:0x1702 +[0m[0mSeg:5d27 Size:256 Owner:0x1700 [45;35m++++[0m[42;32m -[0m[0mSeg:5f1c Size:256 Owner:0x1704 +[0m[0mSeg:5e27 Size:256 Owner:0x1702 [45;35m++++[0m[42;32m -[0m[0mSeg:601c Size:256 Owner:0x1706 +[0m[0mSeg:5f27 Size:256 Owner:0x1704 [45;35m++++[0m[42;32m -[0m[0mSeg:611c Size:256 Owner:0x1708 +[0m[0mSeg:6027 Size:256 Owner:0x1706 [45;35m++++[0m[42;32m -[0m[0mSeg:621c Size:256 Owner:0x170a +[0m[0mSeg:6127 Size:256 Owner:0x1708 [45;35m+++++[0m[42;32m -[0m[0mSeg:631c Size:256 Owner:0x170c +[0m[0mSeg:6227 Size:256 Owner:0x170a [45;35m++++[0m[42;32m -[0m[0mSeg:641c Size:256 Owner:0x170e +[0m[0mSeg:6327 Size:256 Owner:0x170c [45;35m++++[0m[42;32m -[0m[0mSeg:651c Size:256 Owner:0x1710 +[0m[0mSeg:6427 Size:256 Owner:0x170e [45;35m++++[0m[42;32m -[0m[0mSeg:661c Size:256 Owner:0x1712 +[0m[0mSeg:6527 Size:256 Owner:0x1710 [45;35m++++[0m[42;32m -[0m[0mSeg:671c Size:256 Owner:0x1714 +[0m[0mSeg:6627 Size:256 Owner:0x1712 [45;35m+++++[0m[42;32m -[0m[0mSeg:681c Size:256 Owner:0x1716 +[0m[0mSeg:6727 Size:256 Owner:0x1714 [45;35m++++[0m[42;32m -[0m[0mSeg:691c Size:256 Owner:0x1718 +[0m[0mSeg:6827 Size:256 Owner:0x1716 [45;35m++++[0m[42;32m -[0m[0mSeg:6a1c Size:256 Owner:0x171a +[0m[0mSeg:6927 Size:256 Owner:0x1718 [45;35m++++[0m[42;32m -[0m[0mSeg:6b1c Size:256 Owner:0x171c +[0m[0mSeg:6a27 Size:256 Owner:0x171a [45;35m++++[0m[42;32m -[0m[0mSeg:6c1c Size:256 Owner:0x171e +[0m[0mSeg:6b27 Size:256 Owner:0x171c [45;35m+++++[0m[42;32m -[0m[0mSeg:6d1c Size:256 Owner:0x1720 +[0m[0mSeg:6c27 Size:256 Owner:0x171e [45;35m++++[0m[42;32m -[0m[0mSeg:6e1c Size:256 Owner:0x1722 +[0m[0mSeg:6d27 Size:256 Owner:0x1720 [45;35m++++[0m[42;32m -[0m[0mSeg:6f1c Size:256 Owner:0x1724 +[0m[0mSeg:6e27 Size:256 Owner:0x1722 [45;35m++++[0m[42;32m -[0m[0mSeg:701c Size:256 Owner:0x1726 +[0m[0mSeg:6f27 Size:256 Owner:0x1724 [45;35m++++[0m[42;32m -[0m[0mSeg:711c Size:256 Owner:0x1728 +[0m[0mSeg:7027 Size:256 Owner:0x1726 [45;35m+++++[0m[42;32m -[0m[0mSeg:721c Size:256 Owner:0x172a +[0m[0mSeg:7127 Size:256 Owner:0x1728 [45;35m++++[0m[42;32m -[0m[0mSeg:731c Size:256 Owner:0x172c +[0m[0mSeg:7227 Size:256 Owner:0x172a [45;35m++++[0m[42;32m -[0m[0mSeg:741c Size:256 Owner:0x172e +[0m[0mSeg:7327 Size:256 Owner:0x172c [45;35m++++[0m[42;32m -[0m[0mSeg:751c Size:256 Owner:0x1730 +[0m[0mSeg:7427 Size:256 Owner:0x172e [45;35m++++[0m[42;32m -[0m[0mSeg:761c Size:256 Owner:0x1732 +[0m[0mSeg:7527 Size:256 Owner:0x1730 [45;35m+++++[0m[42;32m -[0m[0mSeg:771c Size:256 Owner:0x1734 +[0m[0mSeg:7627 Size:256 Owner:0x1732 [45;35m++++[0m[42;32m -[0m[0mSeg:781c Size:256 Owner:0x1736 +[0m[0mSeg:7727 Size:256 Owner:0x1734 [45;35m++++[0m[42;32m -[0m[0mSeg:791c Size:256 Owner:0x1738 +[0m[0mSeg:7827 Size:256 Owner:0x1736 [45;35m++++[0m[42;32m -[0m[0mSeg:7a1c Size:256 Owner:0x173a +[0m[0mSeg:7927 Size:256 Owner:0x1738 [45;35m++++[0m[42;32m -[0m[0mSeg:7b1c Size:256 Owner:0x173c +[0m[0mSeg:7a27 Size:256 Owner:0x173a [45;35m+++++[0m[42;32m -[0m[0mSeg:7c1c Size:256 Owner:0x173e +[0m[0mSeg:7b27 Size:256 Owner:0x173c [45;35m++++[0m[42;32m -[0m[0mSeg:7d1c Size:256 Owner:0x1740 +[0m[0mSeg:7c27 Size:256 Owner:0x173e [45;35m++++[0m[42;32m -[0m[0mSeg:7e1c Size:256 Owner:0x1742 +[0m[0mSeg:7d27 Size:256 Owner:0x1740 [45;35m++++[0m[42;32m -[0m[0mSeg:7f1c Size:256 Owner:0x1744 +[0m[0mSeg:7e27 Size:256 Owner:0x1742 [45;35m++++[0m[42;32m -[0m[0mSeg:801c Size:256 Owner:0x1746 +[0m[0mSeg:7f27 Size:256 Owner:0x1744 [45;35m+++++[0m[42;32m -[0m[0mSeg:811c Size:256 Owner:0x1748 +[0m[0mSeg:8027 Size:256 Owner:0x1746 [45;35m++++[0m[42;32m -[0m[0mSeg:821c Size:256 Owner:0x174a +[0m[0mSeg:8127 Size:256 Owner:0x1748 [45;35m++++[0m[42;32m -[0m[0mSeg:831c Size:256 Owner:0x174c +[0m[0mSeg:8227 Size:256 Owner:0x174a [45;35m++++[0m[42;32m -[0m[0mSeg:841c Size:256 Owner:0x174e +[0m[0mSeg:8327 Size:256 Owner:0x174c [45;35m++++[0m[42;32m -[0m[0mSeg:851c Size:256 Owner:0x1750 +[0m[0mSeg:8427 Size:256 Owner:0x174e [45;35m+++++[0m[42;32m -[0m[0mSeg:861c Size:256 Owner:0x1752 +[0m[0mSeg:8527 Size:256 Owner:0x1750 [45;35m++++[0m[42;32m -[0m[0mSeg:871c Size:256 Owner:0x1754 +[0m[0mSeg:8627 Size:256 Owner:0x1752 [45;35m++++[0m[42;32m -[0m[0mSeg:881c Size:256 Owner:0x1756 +[0m[0mSeg:8727 Size:256 Owner:0x1754 [45;35m++++[0m[42;32m -[0m[0mSeg:891c Size:256 Owner:0x1758 +[0m[0mSeg:8827 Size:256 Owner:0x1756 [45;35m++++[0m[42;32m -[0m[0mSeg:8a1c Size:256 Owner:0x175a +[0m[0mSeg:8927 Size:256 Owner:0x1758 [45;35m+++++[0m[42;32m -[0m[0mSeg:8b1c Size:256 Owner:0x175c +[0m[0mSeg:8a27 Size:256 Owner:0x175a +[45;35m++++[0m[42;32m +[0m[0mSeg:8b27 Size:256 Owner:0x175c [45;35m++++[0m[42;32m -[0m[0mSeg:8c1c Size:273 Owner:0xe400 +[0m[0mSeg:8c27 Size:273 Owner:0xe400 [44;34m++++[0m[42;32m -[0m[0mSeg:b81c Size:18403 Owner:0x0 +[0m[0mSeg:b827 Size:18392 Owner:0x0 [41;31m+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++[0m \ No newline at end of file diff --git a/HEAP.16W b/HEAP.16W index df0e710e..bbcc2ad3 100755 --- a/HEAP.16W +++ b/HEAP.16W @@ -1,35 +1,35 @@ == default == - USED block at 28120016 of size 66 - USED block at 28120058 of size 66 - FREE block at 2812009a of size 18 - USED block at 281200ac of size 136 - USED block at 28120134 of size 20 - FREE block at 28120148 of size 7860 + USED block at 281d0016 of size 66 + USED block at 281d0058 of size 66 + FREE block at 281d009a of size 18 + USED block at 281d00ac of size 136 + USED block at 281d0134 of size 20 + FREE block at 281d0148 of size 7860 OK - end of heap == near == - USED block at 1811e436 of size 12 - USED block at 1811e442 of size 332 - USED block at 1811e58e of size 52 - USED block at 1811e5c2 of size 20 - USED block at 1811e5d6 of size 20 - USED block at 1811e5ea of size 20 - USED block at 1811e5fe of size 20 - USED block at 1811e612 of size 20 - USED block at 1811e626 of size 6614 + USED block at 181ce436 of size 12 + USED block at 181ce442 of size 332 + USED block at 181ce58e of size 52 + USED block at 181ce5c2 of size 20 + USED block at 181ce5d6 of size 20 + USED block at 181ce5ea of size 20 + USED block at 181ce5fe of size 20 + USED block at 181ce612 of size 20 + USED block at 181ce626 of size 6614 OK - end of heap == far == - USED block at 28120016 of size 66 - USED block at 28120058 of size 66 - USED block at 2812009a of size 18 - USED block at 281200ac of size 136 - USED block at 28120134 of size 20 - USED block at 28120148 of size 7860 + USED block at 281d0016 of size 66 + USED block at 281d0058 of size 66 + USED block at 281d009a of size 18 + USED block at 281d00ac of size 136 + USED block at 281d0134 of size 20 + USED block at 281d0148 of size 7860 OK - end of heap Memory Type Total Used Free diff --git a/src/exmmtest.c b/src/exmmtest.c index 6d6e9a85..f68d148e 100755 --- a/src/exmmtest.c +++ b/src/exmmtest.c @@ -177,12 +177,12 @@ for(w=0;w<2;w++) printf("&bigb=%Fp ", &bigbuffer); //printf("&bigb=%04x", &bigbuffer); printf("\n"); -#endif printf("========================================\n"); +#endif #ifdef __WATCOMC__ //this is far printf("Total free: %lu\n", (dword)(GetFreeSize())); - printf("Total near free: %lu\n", (dword)(GetNearFreeSize())); - printf("Total far free: %lu\n", (dword)(GetFarFreeSize())); + printf("Total near free: %lub\n", (dword)(GetNearFreeSize())); + printf("Total far free: %lub\n", (dword)(GetFarFreeSize())); heapdump(&gvar); segatesuto(); #endif diff --git a/src/lib/16_mm.c b/src/lib/16_mm.c index 51b4925a..282814bd 100755 --- a/src/lib/16_mm.c +++ b/src/lib/16_mm.c @@ -1616,25 +1616,24 @@ void MM_Report_(global_game_variables_t *gvar) printf("========================================\n"); if(MML_CheckForEMS()) { - printf(" LIMEMS\n"); - printf(" EMM v%x.%x available\n", gvar->pm.emm.EMSVer>>4,gvar->pm.emm.EMSVer&0x0F); - printf(" totalEMSpages: %u ", gvar->pm.emm.totalEMSpages); printf("freeEMSpages: %u\n", gvar->pm.emm.freeEMSpages); - printf(" EMSPageFrame: %04x\n", gvar->pm.emm.EMSPageFrame); + printf(" %cLIMEMS %u\n", 0xC9, gvar->pm.emm.EMSPresent); + printf(" %c%cEMM v%x.%x available\n", 0xC7, 0xC4, gvar->pm.emm.EMSVer>>4,gvar->pm.emm.EMSVer&0x0F); + printf(" %c%ctotalEMSpages: %u ", 0xC7, 0xC4, gvar->pm.emm.totalEMSpages); printf("freeEMSpages: %u\n", gvar->pm.emm.freeEMSpages); + printf(" %c%cEMSPageFrame: %04x\n", 0xD3, 0xC4, gvar->pm.emm.EMSPageFrame); } if(MML_CheckForXMS()) { - printf(" XMS\n"); + printf(" %cXMS %u\n", 0xC9, gvar->pm.xmm.XMSPresent); //++++ printf(" XMS v%x.%x available\n", gvar->pm.xmm.XMSVer>>4,gvar->pm.xmm.XMSVer&0x0F); - printf(" XMSDriver: %Fp\n", XMSDriver); - printf(" XMSHandle: %04x\n", gvar->pm.xmm.XMSHandle); + printf(" %c%cXMSDriver: %Fp\n", 0xC7, 0xC4, XMSDriver); + printf(" %c%cXMSHandle: %04x\n", 0xD3, 0xC4, gvar->pm.xmm.XMSHandle); } - printf("nearheap: %lu ", gvar->mmi.nearheap); printf("farheap: %lu\n", gvar->mmi.farheap); - if(MML_CheckForEMS()) printf("EMSmem: %lu ", gvar->mmi.EMSmem); if(MML_CheckForXMS()) printf("XMSmem: %lu", gvar->mmi.XMSmem); printf("\n"); - printf("convmem:\n"); DebugMemory_(gvar, 0); + printf(" %cConv. %u\n", 0xC9, gvar->pm.mm.MainPresent); DebugMemory_(gvar, 0); //printf("mainmem: %lu\n", gvar->mmi.mainmem); //printf("Total convmem: %lu ", gvar->mmi.mainmem); printf("TotalFree: %lu ", MM_TotalFree(gvar)+gvar->mmi.EMSmem+gvar->mmi.XMSmem+gvar->mmi.XMSmem); printf("TotalUsed: %lu\n", gvar->mmi.mainmem); //printf(" UnusedMemory: %lu\n", MM_UnusedMemory(gvar)); - + printf("nearheap: %lu ", gvar->mmi.nearheap); printf("farheap: %lu\n", gvar->mmi.farheap); + if(MML_CheckForEMS()) printf("EMSmem: %lu ", gvar->mmi.EMSmem); if(MML_CheckForXMS()) printf("XMSmem: %lu", gvar->mmi.XMSmem); printf("\n"); } //========================================================================== diff --git a/src/lib/16_pm.c b/src/lib/16_pm.c index 191061f0..c7488a2a 100755 --- a/src/lib/16_pm.c +++ b/src/lib/16_pm.c @@ -1546,14 +1546,14 @@ PM_Startup(global_game_variables_t *gvar) PML_StartupEMS(gvar); if (!noxms && MML_CheckForXMS()) PML_StartupXMS(gvar); + if(!nomain) + PML_StartupMainMem(gvar); - if (!nomain && !gvar->pm.emm.EMSPresent) + if (!gvar->pm.mm.MainPresent && !gvar->pm.emm.EMSPresent && !gvar->pm.xmm.XMSPresent) { - printf("PM_Startup: No main or EMS\n"); - exit(-5); + Quit("PM_Startup: No main or EMS\n"); //return; } - PML_StartupMainMem(gvar); PM_Reset(gvar); diff --git a/src/lib/16_tail.c b/src/lib/16_tail.c index f9f6fb56..8ebc0c35 100755 --- a/src/lib/16_tail.c +++ b/src/lib/16_tail.c @@ -55,7 +55,7 @@ void DebugMemory_(global_game_variables_t *gvar, boolean q) printf(" DebugMemory_\n"); printf("========================================\n");} if(q) { printf("Memory Usage\n"); - printf("------------\n"); }else printf(" "); + printf("------------\n"); }else printf(" %c%c", 0xD3, 0xC4); printf("Total: "); if(q) printf(" "); printf("%uk", gvar->mmi.mainmem/1024); if(q) printf("\n"); else printf(" "); printf("Free: "); if(q) printf(" "); printf("%uk", MM_UnusedMemory(gvar)/1024);