From: sparky4 Date: Tue, 27 Sep 2016 19:09:00 +0000 (-0500) Subject: ====PM WORKS! XMS PORTING IS NEXT! BCEXMM is broke==== X-Git-Url: http://git.osdn.net/view?p=proj16%2F16.git;a=commitdiff_plain;h=d5a5d1ca371995fc05a2890fb0ef1acc02840a4b ====PM WORKS! XMS PORTING IS NEXT! BCEXMM is broke==== --- diff --git a/DEBUG.16W b/DEBUG.16W index a55c6fa8..3a8eca69 100755 --- a/DEBUG.16W +++ b/DEBUG.16W @@ -1,210 +1,210 @@ -Seg:0 Size:9834 Owner:0x0 +Seg:0 Size:9835 Owner:0x0 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++0 -Seg:266a Size:256 Owner:0x18a8 +Seg:266b Size:256 Owner:0x18a8 +++++ -Seg:27e7 Size:53 Owner:0x0 +Seg:27e8 Size:53 Owner:0x0 ++ -Seg:281c Size:256 Owner:0x1696 +Seg:281d Size:256 Owner:0x1696 ++++ -Seg:291c Size:256 Owner:0x1698 +Seg:291d Size:256 Owner:0x1698 ++++ -Seg:2a1c Size:256 Owner:0x169a +Seg:2a1d Size:256 Owner:0x169a ++++ -Seg:2b1c Size:256 Owner:0x169c +Seg:2b1d Size:256 Owner:0x169c +++++ -Seg:2c1c Size:256 Owner:0x169e +Seg:2c1d Size:256 Owner:0x169e ++++ -Seg:2d1c Size:256 Owner:0x16a0 +Seg:2d1d Size:256 Owner:0x16a0 ++++ -Seg:2e1c Size:256 Owner:0x16a2 +Seg:2e1d Size:256 Owner:0x16a2 ++++ -Seg:2f1c Size:256 Owner:0x16a4 +Seg:2f1d Size:256 Owner:0x16a4 ++++ -Seg:301c Size:256 Owner:0x16a6 +Seg:301d Size:256 Owner:0x16a6 +++++ -Seg:311c Size:256 Owner:0x16a8 +Seg:311d Size:256 Owner:0x16a8 ++++ -Seg:321c Size:256 Owner:0x16aa +Seg:321d Size:256 Owner:0x16aa ++++ -Seg:331c Size:256 Owner:0x16ac +Seg:331d Size:256 Owner:0x16ac ++++ -Seg:341c Size:256 Owner:0x16ae +Seg:341d Size:256 Owner:0x16ae ++++ -Seg:351c Size:256 Owner:0x16b0 +Seg:351d Size:256 Owner:0x16b0 +++++ -Seg:361c Size:256 Owner:0x16b2 +Seg:361d Size:256 Owner:0x16b2 ++++ -Seg:371c Size:256 Owner:0x16b4 +Seg:371d Size:256 Owner:0x16b4 ++++ -Seg:381c Size:256 Owner:0x16b6 +Seg:381d Size:256 Owner:0x16b6 ++++ -Seg:391c Size:256 Owner:0x16b8 +Seg:391d Size:256 Owner:0x16b8 ++++ -Seg:3a1c Size:256 Owner:0x16ba +Seg:3a1d Size:256 Owner:0x16ba +++++ -Seg:3b1c Size:256 Owner:0x16bc +Seg:3b1d Size:256 Owner:0x16bc ++++ -Seg:3c1c Size:256 Owner:0x16be +Seg:3c1d Size:256 Owner:0x16be ++++ -Seg:3d1c Size:256 Owner:0x16c0 +Seg:3d1d Size:256 Owner:0x16c0 ++++ -Seg:3e1c Size:256 Owner:0x16c2 +Seg:3e1d Size:256 Owner:0x16c2 ++++ -Seg:3f1c Size:256 Owner:0x16c4 +Seg:3f1d Size:256 Owner:0x16c4 +++++ -Seg:401c Size:256 Owner:0x16c6 +Seg:401d Size:256 Owner:0x16c6 ++++ -Seg:411c Size:256 Owner:0x16c8 +Seg:411d Size:256 Owner:0x16c8 ++++ -Seg:421c Size:256 Owner:0x16ca +Seg:421d Size:256 Owner:0x16ca ++++ -Seg:431c Size:256 Owner:0x16cc +Seg:431d Size:256 Owner:0x16cc ++++ -Seg:441c Size:256 Owner:0x16ce +Seg:441d Size:256 Owner:0x16ce +++++ -Seg:451c Size:256 Owner:0x16d0 +Seg:451d Size:256 Owner:0x16d0 ++++ -Seg:461c Size:256 Owner:0x16d2 +Seg:461d Size:256 Owner:0x16d2 ++++ -Seg:471c Size:256 Owner:0x16d4 +Seg:471d Size:256 Owner:0x16d4 ++++ -Seg:481c Size:256 Owner:0x16d6 +Seg:481d Size:256 Owner:0x16d6 ++++ -Seg:491c Size:256 Owner:0x16d8 +Seg:491d Size:256 Owner:0x16d8 +++++ -Seg:4a1c Size:256 Owner:0x16da +Seg:4a1d Size:256 Owner:0x16da ++++ -Seg:4b1c Size:256 Owner:0x16dc +Seg:4b1d Size:256 Owner:0x16dc ++++ -Seg:4c1c Size:256 Owner:0x16de +Seg:4c1d Size:256 Owner:0x16de ++++ -Seg:4d1c Size:256 Owner:0x16e0 +Seg:4d1d Size:256 Owner:0x16e0 ++++ -Seg:4e1c Size:256 Owner:0x16e2 +Seg:4e1d Size:256 Owner:0x16e2 +++++ -Seg:4f1c Size:256 Owner:0x16e4 +Seg:4f1d Size:256 Owner:0x16e4 ++++ -Seg:501c Size:256 Owner:0x16e6 +Seg:501d Size:256 Owner:0x16e6 ++++ -Seg:511c Size:256 Owner:0x16e8 +Seg:511d Size:256 Owner:0x16e8 ++++ -Seg:521c Size:256 Owner:0x16ea +Seg:521d Size:256 Owner:0x16ea ++++ -Seg:531c Size:256 Owner:0x16ec +Seg:531d Size:256 Owner:0x16ec +++++ -Seg:541c Size:256 Owner:0x16ee +Seg:541d Size:256 Owner:0x16ee ++++ -Seg:551c Size:256 Owner:0x16f0 +Seg:551d Size:256 Owner:0x16f0 ++++ -Seg:561c Size:256 Owner:0x16f2 +Seg:561d Size:256 Owner:0x16f2 ++++ -Seg:571c Size:256 Owner:0x16f4 +Seg:571d Size:256 Owner:0x16f4 ++++ -Seg:581c Size:256 Owner:0x16f6 +Seg:581d Size:256 Owner:0x16f6 +++++ -Seg:591c Size:256 Owner:0x16f8 +Seg:591d Size:256 Owner:0x16f8 ++++ -Seg:5a1c Size:256 Owner:0x16fa +Seg:5a1d Size:256 Owner:0x16fa ++++ -Seg:5b1c Size:256 Owner:0x16fc +Seg:5b1d Size:256 Owner:0x16fc ++++ -Seg:5c1c Size:256 Owner:0x16fe +Seg:5c1d Size:256 Owner:0x16fe ++++ -Seg:5d1c Size:256 Owner:0x1700 +Seg:5d1d Size:256 Owner:0x1700 +++++ -Seg:5e1c Size:256 Owner:0x1702 +Seg:5e1d Size:256 Owner:0x1702 ++++ -Seg:5f1c Size:256 Owner:0x1704 +Seg:5f1d Size:256 Owner:0x1704 ++++ -Seg:601c Size:256 Owner:0x1706 +Seg:601d Size:256 Owner:0x1706 ++++ -Seg:611c Size:256 Owner:0x1708 +Seg:611d Size:256 Owner:0x1708 ++++ -Seg:621c Size:256 Owner:0x170a +Seg:621d Size:256 Owner:0x170a +++++ -Seg:631c Size:256 Owner:0x170c +Seg:631d Size:256 Owner:0x170c ++++ -Seg:641c Size:256 Owner:0x170e +Seg:641d Size:256 Owner:0x170e ++++ -Seg:651c Size:256 Owner:0x1710 +Seg:651d Size:256 Owner:0x1710 ++++ -Seg:661c Size:256 Owner:0x1712 +Seg:661d Size:256 Owner:0x1712 ++++ -Seg:671c Size:256 Owner:0x1714 +Seg:671d Size:256 Owner:0x1714 +++++ -Seg:681c Size:256 Owner:0x1716 +Seg:681d Size:256 Owner:0x1716 ++++ -Seg:691c Size:256 Owner:0x1718 +Seg:691d Size:256 Owner:0x1718 ++++ -Seg:6a1c Size:256 Owner:0x171a +Seg:6a1d Size:256 Owner:0x171a ++++ -Seg:6b1c Size:256 Owner:0x171c +Seg:6b1d Size:256 Owner:0x171c ++++ -Seg:6c1c Size:256 Owner:0x171e +Seg:6c1d Size:256 Owner:0x171e +++++ -Seg:6d1c Size:256 Owner:0x1720 +Seg:6d1d Size:256 Owner:0x1720 ++++ -Seg:6e1c Size:256 Owner:0x1722 +Seg:6e1d Size:256 Owner:0x1722 ++++ -Seg:6f1c Size:256 Owner:0x1724 +Seg:6f1d Size:256 Owner:0x1724 ++++ -Seg:701c Size:256 Owner:0x1726 +Seg:701d Size:256 Owner:0x1726 ++++ -Seg:711c Size:256 Owner:0x1728 +Seg:711d Size:256 Owner:0x1728 +++++ -Seg:721c Size:256 Owner:0x172a +Seg:721d Size:256 Owner:0x172a ++++ -Seg:731c Size:256 Owner:0x172c +Seg:731d Size:256 Owner:0x172c ++++ -Seg:741c Size:256 Owner:0x172e +Seg:741d Size:256 Owner:0x172e ++++ -Seg:751c Size:256 Owner:0x1730 +Seg:751d Size:256 Owner:0x1730 ++++ -Seg:761c Size:256 Owner:0x1732 +Seg:761d Size:256 Owner:0x1732 +++++ -Seg:771c Size:256 Owner:0x1734 +Seg:771d Size:256 Owner:0x1734 ++++ -Seg:781c Size:256 Owner:0x1736 +Seg:781d Size:256 Owner:0x1736 ++++ -Seg:791c Size:256 Owner:0x1738 +Seg:791d Size:256 Owner:0x1738 ++++ -Seg:7a1c Size:256 Owner:0x173a +Seg:7a1d Size:256 Owner:0x173a ++++ -Seg:7b1c Size:256 Owner:0x173c +Seg:7b1d Size:256 Owner:0x173c +++++ -Seg:7c1c Size:256 Owner:0x173e +Seg:7c1d Size:256 Owner:0x173e ++++ -Seg:7d1c Size:256 Owner:0x1740 +Seg:7d1d Size:256 Owner:0x1740 ++++ -Seg:7e1c Size:256 Owner:0x1742 +Seg:7e1d Size:256 Owner:0x1742 ++++ -Seg:7f1c Size:256 Owner:0x1744 +Seg:7f1d Size:256 Owner:0x1744 ++++ -Seg:801c Size:256 Owner:0x1746 +Seg:801d Size:256 Owner:0x1746 +++++ -Seg:811c Size:256 Owner:0x1748 +Seg:811d Size:256 Owner:0x1748 ++++ -Seg:821c Size:256 Owner:0x174a +Seg:821d Size:256 Owner:0x174a ++++ -Seg:831c Size:256 Owner:0x174c +Seg:831d Size:256 Owner:0x174c ++++ -Seg:841c Size:256 Owner:0x174e +Seg:841d Size:256 Owner:0x174e ++++ -Seg:851c Size:256 Owner:0x1750 +Seg:851d Size:256 Owner:0x1750 +++++ -Seg:861c Size:256 Owner:0x1752 +Seg:861d Size:256 Owner:0x1752 ++++ -Seg:871c Size:256 Owner:0x1754 +Seg:871d Size:256 Owner:0x1754 ++++ -Seg:881c Size:256 Owner:0x1756 +Seg:881d Size:256 Owner:0x1756 ++++ -Seg:891c Size:256 Owner:0x1758 +Seg:891d Size:256 Owner:0x1758 ++++ -Seg:8a1c Size:256 Owner:0x175a +Seg:8a1d Size:256 Owner:0x175a +++++ -Seg:8b1c Size:256 Owner:0x175c +Seg:8b1d Size:256 Owner:0x175c ++++ -Seg:8c1c Size:273 Owner:0xe3f0 +Seg:8c1d Size:273 Owner:0xe3f0 ++++ -Seg:b81c Size:18403 Owner:0x0 +Seg:b81d Size:18402 Owner:0x0 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ \ No newline at end of file diff --git a/HEAP.16W b/HEAP.16W index b3a19848..eee55bfd 100755 --- a/HEAP.16W +++ b/HEAP.16W @@ -1,35 +1,35 @@ == default == - USED block at 28090016 of size 66 - USED block at 28090058 of size 66 - USED block at 2809009a of size 136 - FREE block at 28090122 of size 18 - USED block at 28090134 of size 20 - FREE block at 28090148 of size 7860 + USED block at 280a0016 of size 66 + USED block at 280a0058 of size 66 + USED block at 280a009a of size 136 + FREE block at 280a0122 of size 18 + USED block at 280a0134 of size 20 + FREE block at 280a0148 of size 7860 OK - end of heap == near == - USED block at 1808e426 of size 12 - USED block at 1808e432 of size 332 - USED block at 1808e57e of size 52 - USED block at 1808e5b2 of size 20 - USED block at 1808e5c6 of size 20 - USED block at 1808e5da of size 20 - USED block at 1808e5ee of size 20 - USED block at 1808e602 of size 20 - USED block at 1808e616 of size 6630 + USED block at 1809e426 of size 12 + USED block at 1809e432 of size 332 + USED block at 1809e57e of size 52 + USED block at 1809e5b2 of size 20 + USED block at 1809e5c6 of size 20 + USED block at 1809e5da of size 20 + USED block at 1809e5ee of size 20 + USED block at 1809e602 of size 20 + USED block at 1809e616 of size 6630 OK - end of heap == far == - USED block at 28090016 of size 66 - USED block at 28090058 of size 66 - USED block at 2809009a of size 136 - USED block at 28090122 of size 18 - USED block at 28090134 of size 20 - USED block at 28090148 of size 7860 + USED block at 280a0016 of size 66 + USED block at 280a0058 of size 66 + USED block at 280a009a of size 136 + USED block at 280a0122 of size 18 + USED block at 280a0134 of size 20 + USED block at 280a0148 of size 7860 OK - end of heap Memory Type Total Used Free diff --git a/src/lib/16_mm.c b/src/lib/16_mm.c index 561c67f1..fb77b8e1 100755 --- a/src/lib/16_mm.c +++ b/src/lib/16_mm.c @@ -1626,7 +1626,7 @@ void MM_Report_(global_game_variables_t *gvar) printf(" XMS\n"); printf(" XMSaddr: %X\n", *XMSaddr); } - printf("near: %lu ", gvar->mmi.nearheap); printf("far: %lu\n", gvar->mmi.farheap); if(MML_CheckForEMS()) + printf("near: %lu ", gvar->mmi.nearheap); printf("far: %lu\n", gvar->mmi.farheap); if(MML_CheckForEMS()) printf("EMSmem: %lu ", gvar->mmi.EMSmem); if(MML_CheckForXMS(gvar)) printf("XMSmem: %lu", gvar->mmi.XMSmem); printf("\n"); //printf("mainmem: %lu\n", gvar->mmi.mainmem); printf("Total convmem: %lu ", gvar->mmi.mainmem); printf("TotalFree: %lu ", MM_TotalFree(gvar)); printf("TotalUsed: %lu\n", gvar->mmi.mainmem+gvar->mmi.EMSmem+gvar->mmi.XMSmem+gvar->mmi.XMSmem); diff --git a/src/lib/16_pm.c b/src/lib/16_pm.c index 75ad2aae..2f21482d 100755 --- a/src/lib/16_pm.c +++ b/src/lib/16_pm.c @@ -266,7 +266,7 @@ End2: if(errorflag==false) { - gvar->mmi.EMSmem += gvar->pm.emm.EMSAvail * (long)EMSPageSize; + gvar->mmi.EMSmem = EMSAvail * (dword)EMSPageSize; // Initialize EMS mapping cache for (i = 0;i < EMSFrameCount;i++)