From: sparky4 Date: Tue, 21 Feb 2017 18:20:37 +0000 (-0600) Subject: meh X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=6cba56b1dbbb43864494ad852fecb24f5a75df7f;p=16.git meh --- diff --git a/DEBUG.16B b/DEBUG.16B index 6b4d34fc..c1b6c655 100755 --- a/DEBUG.16B +++ b/DEBUG.16B @@ -1,209 +1,209 @@ -Seg:0 Size:4620 Owner:0x0 -++++++++++++++++++++++++++++++++++++++++++++++++++++++++++0 -Seg:120c Size:256 Owner:0x24e5 +Seg:0 Size:4830 Owner:0x0 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++0 +Seg:12de Size:256 Owner:0x2cb7 ++++ -Seg:130c Size:256 Owner:0x22ea +Seg:13de Size:256 Owner:0x2aba +++++ +Seg:14de Size:256 Owner:0x2abc +++++ +Seg:15de Size:256 Owner:0x2abe +++++ -Seg:140c Size:256 Owner:0x22ec +Seg:16de Size:256 Owner:0x2ac0 ++++ -Seg:150c Size:256 Owner:0x22ee +Seg:17de Size:256 Owner:0x2ac2 ++++ -Seg:160c Size:256 Owner:0x22f0 +Seg:18de Size:256 Owner:0x2ac4 ++++ -Seg:170c Size:256 Owner:0x22f2 +Seg:19de Size:256 Owner:0x2ac6 ++++ -Seg:180c Size:256 Owner:0x22f4 +Seg:1ade Size:256 Owner:0x2ac8 +++++ -Seg:190c Size:256 Owner:0x22f6 +Seg:1bde Size:256 Owner:0x2aca ++++ -Seg:1a0c Size:256 Owner:0x22f8 +Seg:1cde Size:256 Owner:0x2acc ++++ -Seg:1b0c Size:256 Owner:0x22fa +Seg:1dde Size:256 Owner:0x2ace ++++ -Seg:1c0c Size:256 Owner:0x22fc +Seg:1ede Size:256 Owner:0x2ad0 ++++ -Seg:1d0c Size:256 Owner:0x22fe +Seg:1fde Size:256 Owner:0x2ad2 +++++ -Seg:1e0c Size:256 Owner:0x2300 +Seg:20de Size:256 Owner:0x2ad4 ++++ -Seg:1f0c Size:256 Owner:0x2302 +Seg:21de Size:256 Owner:0x2ad6 ++++ -Seg:200c Size:256 Owner:0x2304 +Seg:22de Size:256 Owner:0x2ad8 ++++ -Seg:210c Size:256 Owner:0x2306 +Seg:23de Size:256 Owner:0x2ada ++++ -Seg:220c Size:256 Owner:0x2308 +Seg:24de Size:256 Owner:0x2adc +++++ -Seg:230c Size:256 Owner:0x230a +Seg:25de Size:256 Owner:0x2ade ++++ -Seg:240c Size:256 Owner:0x230c +Seg:26de Size:256 Owner:0x2ae0 ++++ -Seg:250c Size:256 Owner:0x230e +Seg:27de Size:256 Owner:0x2ae2 ++++ -Seg:260c Size:256 Owner:0x2310 +Seg:28de Size:256 Owner:0x2ae4 ++++ -Seg:270c Size:256 Owner:0x2312 +Seg:29de Size:256 Owner:0x2ae6 +++++ -Seg:280c Size:256 Owner:0x2314 +Seg:2ade Size:256 Owner:0x2ae8 ++++ -Seg:290c Size:256 Owner:0x2316 +Seg:2bde Size:256 Owner:0x2aea ++++ -Seg:2a0c Size:256 Owner:0x2318 +Seg:2cde Size:256 Owner:0x2aec ++++ -Seg:2b0c Size:256 Owner:0x231a +Seg:2dde Size:256 Owner:0x2aee ++++ -Seg:2c0c Size:256 Owner:0x231c +Seg:2ede Size:256 Owner:0x2af0 +++++ -Seg:2d0c Size:256 Owner:0x231e +Seg:2fde Size:256 Owner:0x2af2 ++++ -Seg:2e0c Size:256 Owner:0x2320 +Seg:30de Size:256 Owner:0x2af4 ++++ -Seg:2f0c Size:256 Owner:0x2322 +Seg:31de Size:256 Owner:0x2af6 ++++ -Seg:300c Size:256 Owner:0x2324 +Seg:32de Size:256 Owner:0x2af8 ++++ -Seg:310c Size:256 Owner:0x2326 +Seg:33de Size:256 Owner:0x2afa +++++ -Seg:320c Size:256 Owner:0x2328 +Seg:34de Size:256 Owner:0x2afc ++++ -Seg:330c Size:256 Owner:0x232a +Seg:35de Size:256 Owner:0x2afe ++++ -Seg:340c Size:256 Owner:0x232c +Seg:36de Size:256 Owner:0x2b00 ++++ -Seg:350c Size:256 Owner:0x232e +Seg:37de Size:256 Owner:0x2b02 ++++ -Seg:360c Size:256 Owner:0x2330 +Seg:38de Size:256 Owner:0x2b04 +++++ -Seg:370c Size:256 Owner:0x2332 +Seg:39de Size:256 Owner:0x2b06 ++++ -Seg:380c Size:256 Owner:0x2334 +Seg:3ade Size:256 Owner:0x2b08 ++++ -Seg:390c Size:256 Owner:0x2336 +Seg:3bde Size:256 Owner:0x2b0a ++++ -Seg:3a0c Size:256 Owner:0x2338 +Seg:3cde Size:256 Owner:0x2b0c ++++ -Seg:3b0c Size:256 Owner:0x233a +Seg:3dde Size:256 Owner:0x2b0e +++++ -Seg:3c0c Size:256 Owner:0x233c +Seg:3ede Size:256 Owner:0x2b10 ++++ -Seg:3d0c Size:256 Owner:0x233e +Seg:3fde Size:256 Owner:0x2b12 ++++ -Seg:3e0c Size:256 Owner:0x2340 +Seg:40de Size:256 Owner:0x2b14 ++++ -Seg:3f0c Size:256 Owner:0x2342 +Seg:41de Size:256 Owner:0x2b16 ++++ -Seg:400c Size:256 Owner:0x2344 +Seg:42de Size:256 Owner:0x2b18 +++++ -Seg:410c Size:256 Owner:0x2346 +Seg:43de Size:256 Owner:0x2b1a ++++ -Seg:420c Size:256 Owner:0x2348 +Seg:44de Size:256 Owner:0x2b1c ++++ -Seg:430c Size:256 Owner:0x234a +Seg:45de Size:256 Owner:0x2b1e ++++ -Seg:440c Size:256 Owner:0x234c +Seg:46de Size:256 Owner:0x2b20 ++++ -Seg:450c Size:256 Owner:0x234e +Seg:47de Size:256 Owner:0x2b22 +++++ -Seg:460c Size:256 Owner:0x2350 +Seg:48de Size:256 Owner:0x2b24 ++++ -Seg:470c Size:256 Owner:0x2352 +Seg:49de Size:256 Owner:0x2b26 ++++ -Seg:480c Size:256 Owner:0x2354 +Seg:4ade Size:256 Owner:0x2b28 ++++ -Seg:490c Size:256 Owner:0x2356 +Seg:4bde Size:256 Owner:0x2b2a ++++ -Seg:4a0c Size:256 Owner:0x2358 +Seg:4cde Size:256 Owner:0x2b2c +++++ -Seg:4b0c Size:256 Owner:0x235a +Seg:4dde Size:256 Owner:0x2b2e ++++ -Seg:4c0c Size:256 Owner:0x235c +Seg:4ede Size:256 Owner:0x2b30 ++++ -Seg:4d0c Size:256 Owner:0x235e +Seg:4fde Size:256 Owner:0x2b32 ++++ -Seg:4e0c Size:256 Owner:0x2360 +Seg:50de Size:256 Owner:0x2b34 ++++ -Seg:4f0c Size:256 Owner:0x2362 +Seg:51de Size:256 Owner:0x2b36 +++++ -Seg:500c Size:256 Owner:0x2364 +Seg:52de Size:256 Owner:0x2b38 ++++ -Seg:510c Size:256 Owner:0x2366 +Seg:53de Size:256 Owner:0x2b3a ++++ -Seg:520c Size:256 Owner:0x2368 +Seg:54de Size:256 Owner:0x2b3c ++++ -Seg:530c Size:256 Owner:0x236a +Seg:55de Size:256 Owner:0x2b3e ++++ -Seg:540c Size:256 Owner:0x236c +Seg:56de Size:256 Owner:0x2b40 +++++ -Seg:550c Size:256 Owner:0x236e +Seg:57de Size:256 Owner:0x2b42 ++++ -Seg:560c Size:256 Owner:0x2370 +Seg:58de Size:256 Owner:0x2b44 ++++ -Seg:570c Size:256 Owner:0x2372 +Seg:59de Size:256 Owner:0x2b46 ++++ -Seg:580c Size:256 Owner:0x2374 +Seg:5ade Size:256 Owner:0x2b48 ++++ -Seg:590c Size:256 Owner:0x2376 +Seg:5bde Size:256 Owner:0x2b4a +++++ -Seg:5a0c Size:256 Owner:0x2378 +Seg:5cde Size:256 Owner:0x2b4c ++++ -Seg:5b0c Size:256 Owner:0x237a +Seg:5dde Size:256 Owner:0x2b4e ++++ -Seg:5c0c Size:256 Owner:0x237c +Seg:5ede Size:256 Owner:0x2b50 ++++ -Seg:5d0c Size:256 Owner:0x237e +Seg:5fde Size:256 Owner:0x2b52 ++++ -Seg:5e0c Size:256 Owner:0x2380 +Seg:60de Size:256 Owner:0x2b54 +++++ -Seg:5f0c Size:256 Owner:0x2382 +Seg:61de Size:256 Owner:0x2b56 ++++ -Seg:600c Size:256 Owner:0x2384 +Seg:62de Size:256 Owner:0x2b58 ++++ -Seg:610c Size:256 Owner:0x2386 +Seg:63de Size:256 Owner:0x2b5a ++++ -Seg:620c Size:256 Owner:0x2388 +Seg:64de Size:256 Owner:0x2b5c ++++ -Seg:630c Size:256 Owner:0x238a +Seg:65de Size:256 Owner:0x2b5e +++++ -Seg:640c Size:256 Owner:0x238c +Seg:66de Size:256 Owner:0x2b60 ++++ -Seg:650c Size:256 Owner:0x238e +Seg:67de Size:256 Owner:0x2b62 ++++ -Seg:660c Size:256 Owner:0x2390 +Seg:68de Size:256 Owner:0x2b64 ++++ -Seg:670c Size:256 Owner:0x2392 +Seg:69de Size:256 Owner:0x2b66 ++++ -Seg:680c Size:256 Owner:0x2394 +Seg:6ade Size:256 Owner:0x2b68 +++++ -Seg:690c Size:256 Owner:0x2396 +Seg:6bde Size:256 Owner:0x2b6a ++++ -Seg:6a0c Size:256 Owner:0x2398 +Seg:6cde Size:256 Owner:0x2b6c ++++ -Seg:6b0c Size:256 Owner:0x239a +Seg:6dde Size:256 Owner:0x2b6e ++++ -Seg:6c0c Size:256 Owner:0x239c +Seg:6ede Size:256 Owner:0x2b70 ++++ -Seg:6d0c Size:256 Owner:0x239e +Seg:6fde Size:256 Owner:0x2b72 +++++ -Seg:6e0c Size:256 Owner:0x23a0 +Seg:70de Size:256 Owner:0x2b74 ++++ -Seg:6f0c Size:256 Owner:0x23a2 +Seg:71de Size:256 Owner:0x2b76 ++++ -Seg:700c Size:256 Owner:0x23a4 +Seg:72de Size:256 Owner:0x2b78 ++++ -Seg:710c Size:256 Owner:0x23a6 +Seg:73de Size:256 Owner:0x2b7a ++++ -Seg:720c Size:256 Owner:0x23a8 +Seg:74de Size:256 Owner:0x2b7c +++++ -Seg:730c Size:256 Owner:0x23aa -++++ -Seg:740c Size:256 Owner:0x23ac +Seg:75de Size:256 Owner:0x2b7e ++++ -Seg:750c Size:256 Owner:0x23ae +Seg:76de Size:256 Owner:0x2b80 ++++ -Seg:760c Size:256 Owner:0x23b0 -++++ -Seg:770c Size:273 Owner:0xfde -+++++ +Seg:77de Size:273 Owner:0x2a92 +++++ Seg:9fde Size:32802 Owner:0x0  Seg:9ffe Size:24577 Owner:0x0 diff --git a/DEBUG.16W b/DEBUG.16W new file mode 100755 index 00000000..4f0cb798 --- /dev/null +++ b/DEBUG.16W @@ -0,0 +1,210 @@ +Seg:0 Size:8959 Owner:0x0 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++00000 +Seg:23f1 Size:44 Owner:0x0 ++ +Seg:241d Size:256 Owner:0x1db4 +++++ +Seg:251d Size:256 Owner:0x1ba6 +++++ +Seg:261d Size:256 Owner:0x1ba8 ++++++ +Seg:271d Size:256 Owner:0x1baa +++++ +Seg:281d Size:256 Owner:0x1bac +++++ +Seg:291d Size:256 Owner:0x1bae +++++ +Seg:2a1d Size:256 Owner:0x1bb0 +++++ +Seg:2b1d Size:256 Owner:0x1bb2 ++++++ +Seg:2c1d Size:256 Owner:0x1bb4 +++++ +Seg:2d1d Size:256 Owner:0x1bb6 +++++ +Seg:2e1d Size:256 Owner:0x1bb8 +++++ +Seg:2f1d Size:256 Owner:0x1bba +++++ +Seg:301d Size:256 Owner:0x1bbc ++++++ +Seg:311d Size:256 Owner:0x1bbe +++++ +Seg:321d Size:256 Owner:0x1bc0 +++++ +Seg:331d Size:256 Owner:0x1bc2 +++++ +Seg:341d Size:256 Owner:0x1bc4 +++++ +Seg:351d Size:256 Owner:0x1bc6 ++++++ +Seg:361d Size:256 Owner:0x1bc8 +++++ +Seg:371d Size:256 Owner:0x1bca +++++ +Seg:381d Size:256 Owner:0x1bcc +++++ +Seg:391d Size:256 Owner:0x1bce +++++ +Seg:3a1d Size:256 Owner:0x1bd0 ++++++ +Seg:3b1d Size:256 Owner:0x1bd2 +++++ +Seg:3c1d Size:256 Owner:0x1bd4 +++++ +Seg:3d1d Size:256 Owner:0x1bd6 +++++ +Seg:3e1d Size:256 Owner:0x1bd8 +++++ +Seg:3f1d Size:256 Owner:0x1bda ++++++ +Seg:401d Size:256 Owner:0x1bdc +++++ +Seg:411d Size:256 Owner:0x1bde +++++ +Seg:421d Size:256 Owner:0x1be0 +++++ +Seg:431d Size:256 Owner:0x1be2 +++++ +Seg:441d Size:256 Owner:0x1be4 ++++++ +Seg:451d Size:256 Owner:0x1be6 +++++ +Seg:461d Size:256 Owner:0x1be8 +++++ +Seg:471d Size:256 Owner:0x1bea +++++ +Seg:481d Size:256 Owner:0x1bec +++++ +Seg:491d Size:256 Owner:0x1bee ++++++ +Seg:4a1d Size:256 Owner:0x1bf0 +++++ +Seg:4b1d Size:256 Owner:0x1bf2 +++++ +Seg:4c1d Size:256 Owner:0x1bf4 +++++ +Seg:4d1d Size:256 Owner:0x1bf6 +++++ +Seg:4e1d Size:256 Owner:0x1bf8 ++++++ +Seg:4f1d Size:256 Owner:0x1bfa +++++ +Seg:501d Size:256 Owner:0x1bfc +++++ +Seg:511d Size:256 Owner:0x1bfe +++++ +Seg:521d Size:256 Owner:0x1c00 +++++ +Seg:531d Size:256 Owner:0x1c02 ++++++ +Seg:541d Size:256 Owner:0x1c04 +++++ +Seg:551d Size:256 Owner:0x1c06 +++++ +Seg:561d Size:256 Owner:0x1c08 +++++ +Seg:571d Size:256 Owner:0x1c0a +++++ +Seg:581d Size:256 Owner:0x1c0c ++++++ +Seg:591d Size:256 Owner:0x1c0e +++++ +Seg:5a1d Size:256 Owner:0x1c10 +++++ +Seg:5b1d Size:256 Owner:0x1c12 +++++ +Seg:5c1d Size:256 Owner:0x1c14 +++++ +Seg:5d1d Size:256 Owner:0x1c16 ++++++ +Seg:5e1d Size:256 Owner:0x1c18 +++++ +Seg:5f1d Size:256 Owner:0x1c1a +++++ +Seg:601d Size:256 Owner:0x1c1c +++++ +Seg:611d Size:256 Owner:0x1c1e +++++ +Seg:621d Size:256 Owner:0x1c20 ++++++ +Seg:631d Size:256 Owner:0x1c22 +++++ +Seg:641d Size:256 Owner:0x1c24 +++++ +Seg:651d Size:256 Owner:0x1c26 +++++ +Seg:661d Size:256 Owner:0x1c28 +++++ +Seg:671d Size:256 Owner:0x1c2a ++++++ +Seg:681d Size:256 Owner:0x1c2c +++++ +Seg:691d Size:256 Owner:0x1c2e +++++ +Seg:6a1d Size:256 Owner:0x1c30 +++++ +Seg:6b1d Size:256 Owner:0x1c32 +++++ +Seg:6c1d Size:256 Owner:0x1c34 ++++++ +Seg:6d1d Size:256 Owner:0x1c36 +++++ +Seg:6e1d Size:256 Owner:0x1c38 +++++ +Seg:6f1d Size:256 Owner:0x1c3a +++++ +Seg:701d Size:256 Owner:0x1c3c +++++ +Seg:711d Size:256 Owner:0x1c3e ++++++ +Seg:721d Size:256 Owner:0x1c40 +++++ +Seg:731d Size:256 Owner:0x1c42 +++++ +Seg:741d Size:256 Owner:0x1c44 +++++ +Seg:751d Size:256 Owner:0x1c46 +++++ +Seg:761d Size:256 Owner:0x1c48 ++++++ +Seg:771d Size:256 Owner:0x1c4a +++++ +Seg:781d Size:256 Owner:0x1c4c +++++ +Seg:791d Size:256 Owner:0x1c4e +++++ +Seg:7a1d Size:256 Owner:0x1c50 +++++ +Seg:7b1d Size:256 Owner:0x1c52 ++++++ +Seg:7c1d Size:256 Owner:0x1c54 +++++ +Seg:7d1d Size:256 Owner:0x1c56 +++++ +Seg:7e1d Size:256 Owner:0x1c58 +++++ +Seg:7f1d Size:256 Owner:0x1c5a +++++ +Seg:801d Size:256 Owner:0x1c5c ++++++ +Seg:811d Size:256 Owner:0x1c5e +++++ +Seg:821d Size:256 Owner:0x1c60 +++++ +Seg:831d Size:256 Owner:0x1c62 +++++ +Seg:841d Size:256 Owner:0x1c64 +++++ +Seg:851d Size:256 Owner:0x1c66 ++++++ +Seg:861d Size:256 Owner:0x1c68 +++++ +Seg:871d Size:256 Owner:0x1c6a +++++ +Seg:881d Size:256 Owner:0x1c6c +++++ +Seg:891d Size:273 Owner:0x1b78 ++++++ +Seg:b41d Size:19426 Owner:0x0 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ \ No newline at end of file diff --git a/HEAP.16W b/HEAP.16W new file mode 100755 index 00000000..4249c5ca --- /dev/null +++ b/HEAP.16W @@ -0,0 +1,47 @@ + + == default == + + USED block at 24130016 of size 66 + USED block at 24130058 of size 66 + FREE block at 2413009a of size 18 + USED block at 241300ac of size 136 + USED block at 24130134 of size 20 + FREE block at 24130148 of size 7860 +OK - end of heap + + == near == + + USED block at 1412ecd6 of size 12 + USED block at 1412ece2 of size 332 + USED block at 1412ee2e of size 52 + USED block at 1412ee62 of size 20 + USED block at 1412ee76 of size 20 + USED block at 1412ee8a of size 20 + USED block at 1412ee9e of size 20 + USED block at 1412eeb2 of size 20 + USED block at 1412eec6 of size 4406 +OK - end of heap + + == far == + + USED block at 24130016 of size 66 + USED block at 24130058 of size 66 + USED block at 2413009a of size 18 + USED block at 241300ac of size 136 + USED block at 24130134 of size 20 + USED block at 24130148 of size 7860 +OK - end of heap + +Memory Type Total Used Free +---------------- -------- -------- -------- +Default 8166 288 7878 +Near 4902 496 4406 +Far 8166 288 7878 +---------------- -------- -------- -------- +coreleft = 4404 +farcoreleft = 44896 +GetFreeSize = 40512 +GetNearFreeSize = 4406 +GetFarFreeSize = 40512 +memavl = 4404 +stackavail = 31606 diff --git a/MEMINFO.16B b/MEMINFO.16B new file mode 100755 index 00000000..e69de29b diff --git a/MMDUMP.16B b/MMDUMP.16B index 8609c212..fdff3f7c 100755 Binary files a/MMDUMP.16B and b/MMDUMP.16B differ diff --git a/MMDUMP.16W b/MMDUMP.16W new file mode 100755 index 00000000..ae51bd97 Binary files /dev/null and b/MMDUMP.16W differ diff --git a/bcexmm.dsk b/bcexmm.dsk index 0cb42ac1..b1c97ef8 100755 Binary files a/bcexmm.dsk and b/bcexmm.dsk differ diff --git a/bcexmm.exe b/bcexmm.exe index 89419f23..675363b9 100755 Binary files a/bcexmm.exe and b/bcexmm.exe differ diff --git a/bcexmm.prj b/bcexmm.prj index d6b18657..163d724b 100755 Binary files a/bcexmm.prj and b/bcexmm.prj differ diff --git a/src/exmmtest.c b/src/exmmtest.c index c5e9b5ce..5b7123bb 100755 --- a/src/exmmtest.c +++ b/src/exmmtest.c @@ -38,8 +38,11 @@ #define FILEREAD //#define EXMMVERBOSE -void VGAmodeX(sword vq, boolean cmem, global_game_variables_t *gv){} -#define PRINTBB { printf("&main()= %Fp\n", argv[0]);printf("bigbuffer= %Fp\n", bigbuffer);printf("&bigbuffer= %Fp\n", &bigbuffer);printf("bigbuffer= %04x\n", bigbuffer);printf("&bigbuffer= %04x\n", &bigbuffer); } +void VGAmodeX(sword vq, boolean cmem, global_game_variables_t *gv) +{ + printf("VGAmodeX dummy:\n %Fp %Fp %Fp\n", &vq, &cmem, gv); +} +#define PRINTBB { printf("&main()= %Fp\n", argv[0]);printf("gvar.ca.tinf[0]= %Fp\n", gvar.ca.tinf[0]);printf("&gvar.ca.tinf[0]= %Fp\n", &gvar.ca.tinf[0]);printf("gvar.ca.tinf[0]= %04x\n", gvar.ca.tinf[0]);printf("&gvar.ca.tinf[0]= %04x\n", &gvar.ca.tinf[0]); } #ifdef __WATCOMC__ void segatesuto() @@ -73,8 +76,6 @@ main(int argc, char *argv[]) //#ifdef __WATCOMC__ // __segment sega; //#endif - memptr bigbuffer; - //static byte bakapee[64]; char *bakapee1, *bakapee2; word baka; @@ -87,8 +88,6 @@ main(int argc, char *argv[]) bakapee2 = malloc(64); //file name // - gvar.mm.mmstarted=0; - #ifdef __DEBUG_PM__ dbg_debugpm=1; //debug pm #endif @@ -109,10 +108,7 @@ main(int argc, char *argv[]) if(dbg_debugpm>0) { #endif - PM_Startup(&gvar); - //printf("pmstarted ok\n"); - //PM_CheckMainMem(&gvar); - PM_UnlockMainMem(&gvar); + PM_Startup(&gvar); PM_CheckMainMem(&gvar); PM_UnlockMainMem(&gvar); #ifdef __DEBUG_PM__ } #endif @@ -126,26 +122,26 @@ main(int argc, char *argv[]) for(w=0;w<2;w++) { // bakapeehandle = open(bakapee,O_RDONLY | O_BINARY, S_IREAD); -// printf("size of big buffer~=%u\n", _bmsize(segu, bigbuffer)); -// if(CA_FarRead(bakapeehandle,(void far *)&bigbuffer,sizeof(bigbuffer),&gvar.mm)) +// printf("size of big buffer~=%u\n", _bmsize(segu, gvar.ca.tinf[0])); +// if(CA_FarRead(bakapeehandle,(void far *)&gvar.ca.tinf[0],sizeof(gvar.ca.tinf[0]),&gvar.mm)) if(w>0) { printf(" read\n"); - if(CA_ReadFile(bakapee2, &bigbuffer, &gvar)) baka=1; else baka=0; + if(CA_ReadFile(bakapee2, &gvar.ca.tinf[0], &gvar)) baka=1; else baka=0; } #endif if(w==0) { - printf(" load\n"); - if(CA_LoadFile(bakapee1, &bigbuffer, &gvar)) baka=1; else baka=0; + printf(" load\n"); + if(CA_LoadFile(bakapee1, &gvar.ca.tinf[0], &gvar)) baka=1; else baka=0; } // close(bakapeehandle); //hmm functions in cache system use the buffered stuff //#ifdef __WATCOMC__ -// printf("\nsize of big buffer~=%u\n", _bmsize(sega, bigbuffer)); +// printf("\nsize of big buffer~=%u\n", _bmsize(sega, gvar.ca.tinf[0])); //#endif - printf("contents of the buffer\n[\n%s\n]\n", bigbuffer); + printf("contents of the buffer\n[\n%s\n]\n", gvar.ca.tinf[0]); //printf("dark purple = purgable\n"); //printf("medium blue = non purgable\n"); //printf("red = locked\n"); @@ -163,7 +159,7 @@ for(w=0;w<2;w++) MM_Report_(&gvar); //printf("bakapee1=%s\n", bakapee1); //printf("bakapee2=%s\n", bakapee2); - MM_FreePtr(&bigbuffer, &gvar); + MM_FreePtr(&gvar.ca.tinf[0], &gvar); //#ifdef __WATCOMC__ #ifdef __DEBUG_PM__ if(dbg_debugpm>0) @@ -181,11 +177,11 @@ for(w=0;w<2;w++) printf("&far= %Fp", &(gvar.mm.farheap)); printf("\n"); #ifdef EXMMVERBOSE - printf("bigb= %Fp ", bigbuffer); - //printf("bigbr= %04x", bigbuffer); + printf("bigb= %Fp ", gvar.ca.tinf[0]); + //printf("bigbr= %04x", gvar.ca.tinf[0]); //printf("\n"); - printf("&bigb=%Fp ", &bigbuffer); - //printf("&bigb=%04x", &bigbuffer); + printf("&bigb=%Fp ", &gvar.ca.tinf[0]); + //printf("&bigb=%04x", &gvar.ca.tinf[0]); printf("\n"); printf("========================================\n"); #endif diff --git a/src/lib/16_tdef.h b/src/lib/16_tdef.h index 908dd60f..10fd1eea 100755 --- a/src/lib/16_tdef.h +++ b/src/lib/16_tdef.h @@ -538,6 +538,9 @@ typedef struct //TODO: USE THIS!!!! byte far grneeded[NUMCHUNKS]; memptr/*byte _seg*/ *audiosegs[NUMSNDCHUNKS]; + //misc memptr + memptr tinf[4]; + huffnode huffnode; //TODO: extend! and learn from keen/wolf/catacomb's code wwww diff --git a/src/lib/doslib b/src/lib/doslib index 405af50f..88aab379 160000 --- a/src/lib/doslib +++ b/src/lib/doslib @@ -1 +1 @@ -Subproject commit 405af50f8d9689c01d823a5c8ee9501938a4dfb6 +Subproject commit 88aab3798f96c47b37a018f0027df0abebb4e74a