From: sparky4 <sparky4@cock.li>
Date: Tue, 4 Oct 2016 15:01:36 +0000 (-0500)
Subject: revertede back but fixup xms startup
X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=2dcd5a983922df452bd7dc56044bfbd2ad07341b;p=16.git
revertede back but fixup xms startup
---
diff --git a/DEBUG.16W b/DEBUG.16W
index 503c7fd2..72245a61 100755
--- a/DEBUG.16W
+++ b/DEBUG.16W
@@ -1,210 +1,212 @@
-[0mSeg:0 Size:9874 Owner:0x0
-[41;31m++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++[0m[42;32m0
-[0m[0mSeg:2692 Size:256 Owner:0x18a8
-[44;34m++++[0m[42;32m
-[0m[0mSeg:280e Size:44 Owner:0x0
+[0mSeg:0 Size:11735 Owner:0x0
+[41;31m+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++[0m[42;32m000
+[0m[0mSeg:2e4c Size:36 Owner:0x0
[41;31m+[0m[42;32m
-[0m[0mSeg:283a Size:256 Owner:0x1696
+[0m[0mSeg:2e70 Size:256 Owner:0x1988
+[44;34m++++[0m[42;32m
+[0m[0mSeg:2f70 Size:256 Owner:0x1776
+[45;35m++++[0m[42;32m
+[0m[0mSeg:3070 Size:256 Owner:0x1778
+[45;35m++++[0m[42;32m
+[0m[0mSeg:3170 Size:256 Owner:0x177a
+[45;35m++++[0m[42;32m
+[0m[0mSeg:3270 Size:256 Owner:0x177c
+[45;35m++++[0m[42;32m
+[0m[0mSeg:3370 Size:256 Owner:0x177e
+[45;35m++++[0m[42;32m
+[0m[0mSeg:3470 Size:256 Owner:0x1780
+[45;35m++++[0m[42;32m
+[0m[0mSeg:3570 Size:256 Owner:0x1782
+[45;35m++++[0m[42;32m
+[0m[0mSeg:3670 Size:256 Owner:0x1784
+[45;35m++++[0m[42;32m
+[0m[0mSeg:3770 Size:256 Owner:0x1786
+[45;35m++++[0m[42;32m
+[0m[0mSeg:3870 Size:256 Owner:0x1788
+[45;35m++++[0m[42;32m
+[0m[0mSeg:3970 Size:256 Owner:0x178a
+[45;35m++++[0m[42;32m
+[0m[0mSeg:3a70 Size:256 Owner:0x178c
+[45;35m++++[0m[42;32m
+[0m[0mSeg:3b70 Size:256 Owner:0x178e
+[45;35m++++[0m[42;32m
+[0m[0mSeg:3c70 Size:256 Owner:0x1790
+[45;35m++++[0m[42;32m
+[0m[0mSeg:3d70 Size:256 Owner:0x1792
+[45;35m++++[0m[42;32m
+[0m[0mSeg:3e70 Size:256 Owner:0x1794
+[45;35m++++[0m[42;32m
+[0m[0mSeg:3f70 Size:256 Owner:0x1796
+[45;35m++++[0m[42;32m
+[0m[0mSeg:4070 Size:256 Owner:0x1798
+[45;35m++++[0m[42;32m
+[0m[0mSeg:4170 Size:256 Owner:0x179a
+[45;35m++++[0m[42;32m
+[0m[0mSeg:4270 Size:256 Owner:0x179c
+[45;35m++++[0m[42;32m
+[0m[0mSeg:4370 Size:256 Owner:0x179e
[45;35m++++[0m[42;32m
-[0m[0mSeg:293a Size:256 Owner:0x1698
-[45;35m+++++[0m[42;32m
-[0m[0mSeg:2a3a Size:256 Owner:0x169a
+[0m[0mSeg:4470 Size:256 Owner:0x17a0
[45;35m++++[0m[42;32m
-[0m[0mSeg:2b3a Size:256 Owner:0x169c
+[0m[0mSeg:4570 Size:256 Owner:0x17a2
[45;35m++++[0m[42;32m
-[0m[0mSeg:2c3a Size:256 Owner:0x169e
+[0m[0mSeg:4670 Size:256 Owner:0x17a4
[45;35m++++[0m[42;32m
-[0m[0mSeg:2d3a Size:256 Owner:0x16a0
+[0m[0mSeg:4770 Size:256 Owner:0x17a6
[45;35m++++[0m[42;32m
-[0m[0mSeg:2e3a Size:256 Owner:0x16a2
-[45;35m+++++[0m[42;32m
-[0m[0mSeg:2f3a Size:256 Owner:0x16a4
+[0m[0mSeg:4870 Size:256 Owner:0x17a8
[45;35m++++[0m[42;32m
-[0m[0mSeg:303a Size:256 Owner:0x16a6
+[0m[0mSeg:4970 Size:256 Owner:0x17aa
[45;35m++++[0m[42;32m
-[0m[0mSeg:313a Size:256 Owner:0x16a8
+[0m[0mSeg:4a70 Size:256 Owner:0x17ac
[45;35m++++[0m[42;32m
-[0m[0mSeg:323a Size:256 Owner:0x16aa
+[0m[0mSeg:4b70 Size:256 Owner:0x17ae
[45;35m++++[0m[42;32m
-[0m[0mSeg:333a Size:256 Owner:0x16ac
-[45;35m+++++[0m[42;32m
-[0m[0mSeg:343a Size:256 Owner:0x16ae
+[0m[0mSeg:4c70 Size:256 Owner:0x17b0
[45;35m++++[0m[42;32m
-[0m[0mSeg:353a Size:256 Owner:0x16b0
+[0m[0mSeg:4d70 Size:256 Owner:0x17b2
[45;35m++++[0m[42;32m
-[0m[0mSeg:363a Size:256 Owner:0x16b2
+[0m[0mSeg:4e70 Size:256 Owner:0x17b4
[45;35m++++[0m[42;32m
-[0m[0mSeg:373a Size:256 Owner:0x16b4
+[0m[0mSeg:4f70 Size:256 Owner:0x17b6
[45;35m++++[0m[42;32m
-[0m[0mSeg:383a Size:256 Owner:0x16b6
-[45;35m+++++[0m[42;32m
-[0m[0mSeg:393a Size:256 Owner:0x16b8
+[0m[0mSeg:5070 Size:256 Owner:0x17b8
[45;35m++++[0m[42;32m
-[0m[0mSeg:3a3a Size:256 Owner:0x16ba
+[0m[0mSeg:5170 Size:256 Owner:0x17ba
[45;35m++++[0m[42;32m
-[0m[0mSeg:3b3a Size:256 Owner:0x16bc
+[0m[0mSeg:5270 Size:256 Owner:0x17bc
[45;35m++++[0m[42;32m
-[0m[0mSeg:3c3a Size:256 Owner:0x16be
+[0m[0mSeg:5370 Size:256 Owner:0x17be
[45;35m++++[0m[42;32m
-[0m[0mSeg:3d3a Size:256 Owner:0x16c0
-[45;35m+++++[0m[42;32m
-[0m[0mSeg:3e3a Size:256 Owner:0x16c2
+[0m[0mSeg:5470 Size:256 Owner:0x17c0
[45;35m++++[0m[42;32m
-[0m[0mSeg:3f3a Size:256 Owner:0x16c4
+[0m[0mSeg:5570 Size:256 Owner:0x17c2
[45;35m++++[0m[42;32m
-[0m[0mSeg:403a Size:256 Owner:0x16c6
+[0m[0mSeg:5670 Size:256 Owner:0x17c4
[45;35m++++[0m[42;32m
-[0m[0mSeg:413a Size:256 Owner:0x16c8
+[0m[0mSeg:5770 Size:256 Owner:0x17c6
[45;35m++++[0m[42;32m
-[0m[0mSeg:423a Size:256 Owner:0x16ca
-[45;35m+++++[0m[42;32m
-[0m[0mSeg:433a Size:256 Owner:0x16cc
+[0m[0mSeg:5870 Size:256 Owner:0x17c8
[45;35m++++[0m[42;32m
-[0m[0mSeg:443a Size:256 Owner:0x16ce
+[0m[0mSeg:5970 Size:256 Owner:0x17ca
[45;35m++++[0m[42;32m
-[0m[0mSeg:453a Size:256 Owner:0x16d0
+[0m[0mSeg:5a70 Size:256 Owner:0x17cc
[45;35m++++[0m[42;32m
-[0m[0mSeg:463a Size:256 Owner:0x16d2
+[0m[0mSeg:5b70 Size:256 Owner:0x17ce
[45;35m++++[0m[42;32m
-[0m[0mSeg:473a Size:256 Owner:0x16d4
-[45;35m+++++[0m[42;32m
-[0m[0mSeg:483a Size:256 Owner:0x16d6
+[0m[0mSeg:5c70 Size:256 Owner:0x17d0
[45;35m++++[0m[42;32m
-[0m[0mSeg:493a Size:256 Owner:0x16d8
+[0m[0mSeg:5d70 Size:256 Owner:0x17d2
[45;35m++++[0m[42;32m
-[0m[0mSeg:4a3a Size:256 Owner:0x16da
+[0m[0mSeg:5e70 Size:256 Owner:0x17d4
[45;35m++++[0m[42;32m
-[0m[0mSeg:4b3a Size:256 Owner:0x16dc
+[0m[0mSeg:5f70 Size:256 Owner:0x17d6
[45;35m++++[0m[42;32m
-[0m[0mSeg:4c3a Size:256 Owner:0x16de
-[45;35m+++++[0m[42;32m
-[0m[0mSeg:4d3a Size:256 Owner:0x16e0
+[0m[0mSeg:6070 Size:256 Owner:0x17d8
[45;35m++++[0m[42;32m
-[0m[0mSeg:4e3a Size:256 Owner:0x16e2
+[0m[0mSeg:6170 Size:256 Owner:0x17da
[45;35m++++[0m[42;32m
-[0m[0mSeg:4f3a Size:256 Owner:0x16e4
+[0m[0mSeg:6270 Size:256 Owner:0x17dc
[45;35m++++[0m[42;32m
-[0m[0mSeg:503a Size:256 Owner:0x16e6
+[0m[0mSeg:6370 Size:256 Owner:0x17de
[45;35m++++[0m[42;32m
-[0m[0mSeg:513a Size:256 Owner:0x16e8
-[45;35m+++++[0m[42;32m
-[0m[0mSeg:523a Size:256 Owner:0x16ea
+[0m[0mSeg:6470 Size:256 Owner:0x17e0
[45;35m++++[0m[42;32m
-[0m[0mSeg:533a Size:256 Owner:0x16ec
+[0m[0mSeg:6570 Size:256 Owner:0x17e2
[45;35m++++[0m[42;32m
-[0m[0mSeg:543a Size:256 Owner:0x16ee
+[0m[0mSeg:6670 Size:256 Owner:0x17e4
[45;35m++++[0m[42;32m
-[0m[0mSeg:553a Size:256 Owner:0x16f0
+[0m[0mSeg:6770 Size:256 Owner:0x17e6
[45;35m++++[0m[42;32m
-[0m[0mSeg:563a Size:256 Owner:0x16f2
-[45;35m+++++[0m[42;32m
-[0m[0mSeg:573a Size:256 Owner:0x16f4
+[0m[0mSeg:6870 Size:256 Owner:0x17e8
[45;35m++++[0m[42;32m
-[0m[0mSeg:583a Size:256 Owner:0x16f6
+[0m[0mSeg:6970 Size:256 Owner:0x17ea
[45;35m++++[0m[42;32m
-[0m[0mSeg:593a Size:256 Owner:0x16f8
+[0m[0mSeg:6a70 Size:256 Owner:0x17ec
[45;35m++++[0m[42;32m
-[0m[0mSeg:5a3a Size:256 Owner:0x16fa
+[0m[0mSeg:6b70 Size:256 Owner:0x17ee
[45;35m++++[0m[42;32m
-[0m[0mSeg:5b3a Size:256 Owner:0x16fc
-[45;35m+++++[0m[42;32m
-[0m[0mSeg:5c3a Size:256 Owner:0x16fe
+[0m[0mSeg:6c70 Size:256 Owner:0x17f0
[45;35m++++[0m[42;32m
-[0m[0mSeg:5d3a Size:256 Owner:0x1700
+[0m[0mSeg:6d70 Size:256 Owner:0x17f2
[45;35m++++[0m[42;32m
-[0m[0mSeg:5e3a Size:256 Owner:0x1702
+[0m[0mSeg:6e70 Size:256 Owner:0x17f4
[45;35m++++[0m[42;32m
-[0m[0mSeg:5f3a Size:256 Owner:0x1704
+[0m[0mSeg:6f70 Size:256 Owner:0x17f6
[45;35m++++[0m[42;32m
-[0m[0mSeg:603a Size:256 Owner:0x1706
-[45;35m+++++[0m[42;32m
-[0m[0mSeg:613a Size:256 Owner:0x1708
+[0m[0mSeg:7070 Size:256 Owner:0x17f8
[45;35m++++[0m[42;32m
-[0m[0mSeg:623a Size:256 Owner:0x170a
+[0m[0mSeg:7170 Size:256 Owner:0x17fa
[45;35m++++[0m[42;32m
-[0m[0mSeg:633a Size:256 Owner:0x170c
+[0m[0mSeg:7270 Size:256 Owner:0x17fc
[45;35m++++[0m[42;32m
-[0m[0mSeg:643a Size:256 Owner:0x170e
+[0m[0mSeg:7370 Size:256 Owner:0x17fe
[45;35m++++[0m[42;32m
-[0m[0mSeg:653a Size:256 Owner:0x1710
-[45;35m+++++[0m[42;32m
-[0m[0mSeg:663a Size:256 Owner:0x1712
+[0m[0mSeg:7470 Size:256 Owner:0x1800
[45;35m++++[0m[42;32m
-[0m[0mSeg:673a Size:256 Owner:0x1714
+[0m[0mSeg:7570 Size:256 Owner:0x1802
[45;35m++++[0m[42;32m
-[0m[0mSeg:683a Size:256 Owner:0x1716
+[0m[0mSeg:7670 Size:256 Owner:0x1804
[45;35m++++[0m[42;32m
-[0m[0mSeg:693a Size:256 Owner:0x1718
+[0m[0mSeg:7770 Size:256 Owner:0x1806
[45;35m++++[0m[42;32m
-[0m[0mSeg:6a3a Size:256 Owner:0x171a
-[45;35m+++++[0m[42;32m
-[0m[0mSeg:6b3a Size:256 Owner:0x171c
+[0m[0mSeg:7870 Size:256 Owner:0x1808
[45;35m++++[0m[42;32m
-[0m[0mSeg:6c3a Size:256 Owner:0x171e
+[0m[0mSeg:7970 Size:256 Owner:0x180a
[45;35m++++[0m[42;32m
-[0m[0mSeg:6d3a Size:256 Owner:0x1720
+[0m[0mSeg:7a70 Size:256 Owner:0x180c
[45;35m++++[0m[42;32m
-[0m[0mSeg:6e3a Size:256 Owner:0x1722
+[0m[0mSeg:7b70 Size:256 Owner:0x180e
[45;35m++++[0m[42;32m
-[0m[0mSeg:6f3a Size:256 Owner:0x1724
-[45;35m+++++[0m[42;32m
-[0m[0mSeg:703a Size:256 Owner:0x1726
+[0m[0mSeg:7c70 Size:256 Owner:0x1810
[45;35m++++[0m[42;32m
-[0m[0mSeg:713a Size:256 Owner:0x1728
+[0m[0mSeg:7d70 Size:256 Owner:0x1812
[45;35m++++[0m[42;32m
-[0m[0mSeg:723a Size:256 Owner:0x172a
+[0m[0mSeg:7e70 Size:256 Owner:0x1814
[45;35m++++[0m[42;32m
-[0m[0mSeg:733a Size:256 Owner:0x172c
+[0m[0mSeg:7f70 Size:256 Owner:0x1816
[45;35m++++[0m[42;32m
-[0m[0mSeg:743a Size:256 Owner:0x172e
-[45;35m+++++[0m[42;32m
-[0m[0mSeg:753a Size:256 Owner:0x1730
+[0m[0mSeg:8070 Size:256 Owner:0x1818
[45;35m++++[0m[42;32m
-[0m[0mSeg:763a Size:256 Owner:0x1732
+[0m[0mSeg:8170 Size:256 Owner:0x181a
[45;35m++++[0m[42;32m
-[0m[0mSeg:773a Size:256 Owner:0x1734
+[0m[0mSeg:8270 Size:256 Owner:0x181c
[45;35m++++[0m[42;32m
-[0m[0mSeg:783a Size:256 Owner:0x1736
+[0m[0mSeg:8370 Size:256 Owner:0x181e
[45;35m++++[0m[42;32m
-[0m[0mSeg:793a Size:256 Owner:0x1738
-[45;35m+++++[0m[42;32m
-[0m[0mSeg:7a3a Size:256 Owner:0x173a
+[0m[0mSeg:8470 Size:256 Owner:0x1820
[45;35m++++[0m[42;32m
-[0m[0mSeg:7b3a Size:256 Owner:0x173c
+[0m[0mSeg:8570 Size:256 Owner:0x1822
[45;35m++++[0m[42;32m
-[0m[0mSeg:7c3a Size:256 Owner:0x173e
+[0m[0mSeg:8670 Size:256 Owner:0x1824
[45;35m++++[0m[42;32m
-[0m[0mSeg:7d3a Size:256 Owner:0x1740
+[0m[0mSeg:8770 Size:256 Owner:0x1826
[45;35m++++[0m[42;32m
-[0m[0mSeg:7e3a Size:256 Owner:0x1742
-[45;35m+++++[0m[42;32m
-[0m[0mSeg:7f3a Size:256 Owner:0x1744
+[0m[0mSeg:8870 Size:256 Owner:0x1828
[45;35m++++[0m[42;32m
-[0m[0mSeg:803a Size:256 Owner:0x1746
+[0m[0mSeg:8970 Size:256 Owner:0x182a
[45;35m++++[0m[42;32m
-[0m[0mSeg:813a Size:256 Owner:0x1748
+[0m[0mSeg:8a70 Size:256 Owner:0x182c
[45;35m++++[0m[42;32m
-[0m[0mSeg:823a Size:256 Owner:0x174a
+[0m[0mSeg:8b70 Size:256 Owner:0x182e
[45;35m++++[0m[42;32m
-[0m[0mSeg:833a Size:256 Owner:0x174c
-[45;35m+++++[0m[42;32m
-[0m[0mSeg:843a Size:256 Owner:0x174e
+[0m[0mSeg:8c70 Size:256 Owner:0x1830
[45;35m++++[0m[42;32m
-[0m[0mSeg:853a Size:256 Owner:0x1750
+[0m[0mSeg:8d70 Size:256 Owner:0x1832
[45;35m++++[0m[42;32m
-[0m[0mSeg:863a Size:256 Owner:0x1752
+[0m[0mSeg:8e70 Size:256 Owner:0x1834
[45;35m++++[0m[42;32m
-[0m[0mSeg:873a Size:256 Owner:0x1754
+[0m[0mSeg:8f70 Size:256 Owner:0x1836
[45;35m++++[0m[42;32m
-[0m[0mSeg:883a Size:256 Owner:0x1756
-[45;35m+++++[0m[42;32m
-[0m[0mSeg:893a Size:256 Owner:0x1758
+[0m[0mSeg:9070 Size:256 Owner:0x1838
[45;35m++++[0m[42;32m
-[0m[0mSeg:8a3a Size:256 Owner:0x175a
+[0m[0mSeg:9170 Size:256 Owner:0x183a
[45;35m++++[0m[42;32m
-[0m[0mSeg:8b3a Size:256 Owner:0x175c
+[0m[0mSeg:9270 Size:256 Owner:0x183c
[45;35m++++[0m[42;32m
-[0m[0mSeg:8c3a Size:273 Owner:0xe400
-[44;34m+++++[0m[42;32m
-[0m[0mSeg:b83a Size:18373 Owner:0x0
-[41;31m+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++[0m
\ No newline at end of file
+[0m[0mSeg:9370 Size:401 Owner:0xf45a
+[44;34m++++++[0m[42;32m
+[0m[0mSeg:be70 Size:8592 Owner:0x0
+[41;31m++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++[0m[42;32m
+[0m[0mSeg:e000 Size:8191 Owner:0x0
+[41;31m++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++[0m
\ No newline at end of file
diff --git a/HEAP.16W b/HEAP.16W
index 1c82fec5..78ae75ec 100755
--- a/HEAP.16W
+++ b/HEAP.16W
@@ -1,47 +1,57 @@
== default ==
- USED block at 28300016 of size 66
- USED block at 28300058 of size 66
- FREE block at 2830009a of size 18
- USED block at 283000ac of size 136
- USED block at 28300134 of size 20
- FREE block at 28300148 of size 7860
+ FREE block at 2e6e0016 of size 18
+ USED block at 2e6e0028 of size 136
+ USED block at 2e6e00b0 of size 50
+ USED block at 2e6e00e2 of size 50
+ USED block at 2e6e0114 of size 50
+ USED block at 2e6e0146 of size 50
+ USED block at 2e6e0178 of size 50
+ USED block at 2e6e01aa of size 50
+ USED block at 2e6e01dc of size 50
+ USED block at 2e6e020e of size 50
+ USED block at 2e6e0240 of size 50
+ USED block at 2e6e0272 of size 50
+ USED block at 2e6e02a4 of size 50
+ USED block at 2e6e02d6 of size 50
+ USED block at 2e6e0308 of size 50
+ FREE block at 2e6e033a of size 14
+ USED block at 2e6e0348 of size 20
+ FREE block at 2e6e035c of size 7328
OK - end of heap
== near ==
- USED block at 182fe436 of size 12
- USED block at 182fe442 of size 332
- USED block at 182fe58e of size 52
- USED block at 182fe5c2 of size 20
- USED block at 182fe5d6 of size 20
- USED block at 182fe5ea of size 20
- USED block at 182fe5fe of size 20
- USED block at 182fe612 of size 20
- USED block at 182fe626 of size 6614
+ USED block at 1e6df4a6 of size 12
+ USED block at 1e6df4b2 of size 330
+ USED block at 1e6df5fc of size 52
+ USED block at 1e6df630 of size 20
+ USED block at 1e6df644 of size 20
+ USED block at 1e6df658 of size 20
+ USED block at 1e6df66c of size 20
+ USED block at 1e6df680 of size 20
+ USED block at 1e6df694 of size 2408
OK - end of heap
== far ==
- USED block at 28300016 of size 66
- USED block at 28300058 of size 66
- USED block at 2830009a of size 18
- USED block at 283000ac of size 136
- USED block at 28300134 of size 20
- USED block at 28300148 of size 7860
+ USED block at 2e6e0016 of size 18
+ USED block at 2e6e0028 of size 136
+ USED block at 2e6e00b0 of size 50
+ USED block at 2e6e00e2 of size 50
+ USED block at 2e6e0114 of size 50
+ USED block at 2e6e0146 of size 50
+ USED block at 2e6e0178 of size 50
+ USED block at 2e6e01aa of size 50
+ USED block at 2e6e01dc of size 50
+ USED block at 2e6e020e of size 50
+ USED block at 2e6e0240 of size 50
+ USED block at 2e6e0272 of size 50
+ USED block at 2e6e02a4 of size 50
+ USED block at 2e6e02d6 of size 50
+ USED block at 2e6e0308 of size 50
+ USED block at 2e6e033a of size 14
+ USED block at 2e6e0348 of size 20
+ USED block at 2e6e035c of size 7328
OK - end of heap
-
-Memory Type Total Used Free
----------------- -------- -------- --------
-Default 8166 288 7878
-Near 7110 496 6614
-Far 8166 0 7878
----------------- -------- -------- --------
-coreleft = 6612
-farcoreleft = 30720
-GetFreeSize = 24128
-GetNearFreeSize = 6614
-GetFarFreeSize = 24128
-memavl = 6612
-stackavail = 31588
diff --git a/MMDUMP.16W b/MMDUMP.16W
index cb01f5be..91ef291f 100755
Binary files a/MMDUMP.16W and b/MMDUMP.16W differ
diff --git a/src/lib/16_head.h b/src/lib/16_head.h
index 2d080d52..aab4c033 100755
--- a/src/lib/16_head.h
+++ b/src/lib/16_head.h
@@ -152,7 +152,7 @@ static word far* clockw= (word far*) 0x046C; /* 18.2hz clock */
extern int profilehandle,debughandle; //make it into game global
#define __DEBUG__
-#define __DEBUG_PM__
+//#define __DEBUG_PM__
//#define __DEBUG_MM__
#define nil ((void *)0)
diff --git a/src/lib/16_pm.c b/src/lib/16_pm.c
index 3b19c0ae..3b37ec62 100755
--- a/src/lib/16_pm.c
+++ b/src/lib/16_pm.c
@@ -356,6 +356,7 @@ PML_StartupXMS(global_game_variables_t *gvar)
{
//#define STARTUPXMSASM
byte err;
+ #define BRACKETXMS
word XMSAvail, XMSHandle;
#define XMSAVI XMSAvail
#define XMSHAN XMSHandle
@@ -383,10 +384,14 @@ PML_StartupXMS(global_game_variables_t *gvar)
#ifdef STARTUPXMSASM
mov ah,XMS_QUERYFREE // Find out how much XMS is available
- call [DWORD PTR XMSDriver]
+ call [DWORD PTR XMSDriver]//DWORD PTR
+#ifndef BRACKETXMS
mov XMSAVI,ax
- cmp bl,0xa0 // AJR: bugfix 10/8/92
- je error1
+#else
+ mov [XMSAVI],ax
+#endif
+ or ax,ax // AJR: bugfix 10/8/92
+ jz error1
mov e,3
#endif
jmp End1
@@ -411,7 +416,7 @@ End1:
#ifndef STARTUPXMSASM
XMS_CALL(XMS_QUERYFREE); // Find out how much XMS is available
XMSAVI = _AX;
- if (_BL) // AJR: bugfix 10/8/92
+ if (!_AX) // AJR: bugfix 10/8/92
{
errorflag = true;
err = _BL;
@@ -422,8 +427,7 @@ End1:
#ifdef __DEBUG_PM__
//++++ printf("XMSVer=%02X ", XMSVer);
- printf("XMSAvail=%u\n", (XMSAVI));
- getch();
+ printf("XMSAvail=%u\n", XMSAVI);
#endif
XMSAVI &= ~(PMPageSizeKB - 1); // Round off to nearest page size
if (XMSAVI < (PMPageSizeKB * 2)) // Need at least 2 pages
@@ -433,16 +437,20 @@ End1:
}
#ifdef STARTUPXMSASM
__asm {
+#ifndef BRACKETXMS
mov dx,XMSAVI
+#else
+ mov dx,[XMSAVI]
+#endif
mov ah,XMS_ALLOC // And do the allocation
- call [DWORD PTR XMSDriver]
+ call [DWORD PTR XMSDriver]//DWORD PTR
#ifndef BRACKETXMS
mov XMSHAN,dx
#else
mov [XMSHAN],dx
#endif
- cmp ax,0 // AJR: bugfix 10/8/92
- je error2
+ or ax,ax // AJR: bugfix 10/8/92
+ jz error2
mov e,4
jmp End2
#ifdef __BORLANDC__
@@ -477,8 +485,8 @@ End2:
error:
if(errorflag==false)
{
- gvar->mmi.XMSmem = (XMSAVI) * 1024ul;
- gvar->pm.xmm.XMSAvail = (word)XMSAVI;
+ gvar->mmi.XMSmem = (dword)(XMSAVI) * 1024;
+ gvar->pm.xmm.XMSAvail = XMSAVI;
gvar->pm.xmm.XMSHandle = XMSHAN;
//++++ gvar->pm.xmm.XMSVer = XMSVer;
gvar->pm.xmm.XMSPresent = true;
@@ -493,10 +501,7 @@ error:
//printf(" 1=%u 2=%u 3=%u 4=%u\n", XMSHandle1, XMSHandle2, XMSHandle3, XMSHandle4);
//printf(" 2=%u ", XMSHandle);
//printf(" %u", gvar->pm.xmm.XMSHandle);
- printf("XMSerr\n");
- printf(" %u, %lu\n", (word)XMSAVI, (dword)XMSAVI);
- printf(" err=%02X e=%u\n", err, e);
- getch();
+ printf("err=%02X e=%u\n", err, e);
#endif
}
return(gvar->pm.xmm.XMSPresent);
diff --git a/src/lib/typdefst.h b/src/lib/typdefst.h
index 41c6b069..6c5ca4e3 100755
--- a/src/lib/typdefst.h
+++ b/src/lib/typdefst.h
@@ -257,7 +257,7 @@ typedef struct
typedef struct
{
boolean XMSPresent;
- word XMSAvail,XMSPagesAvail,XMSHandle;//++++,XMSVer;
+ word XMSAvail,XMSPagesAvail,XMSHandle;//++++,XMSVer;
dword XMSDriver;
int XMSProtectPage;// = -1;
} pm_xmmi_t;