From: sparky4 Date: Tue, 27 Jun 2017 19:13:31 +0000 (-0500) Subject: EXPERIMENTAL BROKEN BUILD please refer to older commit X-Git-Url: http://4ch.mooo.com/gitweb/?p=16.git;a=commitdiff_plain;h=0c699911e6527132d2a85ded2083c675b6ff8af0 EXPERIMENTAL BROKEN BUILD please refer to older commit --- diff --git a/DEBUG.16W b/DEBUG.16W index 7ef64269..4c87f9b6 100755 --- a/DEBUG.16W +++ b/DEBUG.16W @@ -1,209 +1,211 @@ -Seg:0 Size:8025 Owner:0x0 -+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++Seg:1f59 Size:256 Owner:0x5ddc -0 -Seg:2059 Size:256 Owner:0x1c12 +Seg:0 Size:9136 Owner:0x0 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++Seg:23b0 Size:256 Owner:0x6dd6 +000 +Seg:2541 Size:68 Owner:0x0 +0 +Seg:2585 Size:256 Owner:0x340e 0 -Seg:2159 Size:256 Owner:0x1c14 +Seg:2685 Size:256 Owner:0x3410 0 -Seg:2289 Size:76 Owner:0x0 -0 -Seg:22d5 Size:256 Owner:0x1c16 +Seg:2785 Size:256 Owner:0x3412 0 -Seg:23d5 Size:256 Owner:0x1c18 +Seg:2885 Size:256 Owner:0x3414 0 -Seg:24d5 Size:256 Owner:0x1c1a +Seg:2985 Size:256 Owner:0x3416 0 -Seg:25d5 Size:256 Owner:0x1c1c +Seg:2a85 Size:256 Owner:0x3418 0 -Seg:26d5 Size:256 Owner:0x1c1e +Seg:2b85 Size:256 Owner:0x341a 0 -Seg:27d5 Size:256 Owner:0x1c20 +Seg:2c85 Size:256 Owner:0x341c 0 -Seg:28d5 Size:256 Owner:0x1c22 +Seg:2d85 Size:256 Owner:0x341e 0 -Seg:29d5 Size:256 Owner:0x1c24 +Seg:2e85 Size:256 Owner:0x3420 0 -Seg:2ad5 Size:256 Owner:0x1c26 +Seg:2f85 Size:256 Owner:0x3422 0 -Seg:2bd5 Size:256 Owner:0x1c28 +Seg:3085 Size:256 Owner:0x3424 0 -Seg:2cd5 Size:256 Owner:0x1c2a +Seg:3185 Size:256 Owner:0x3426 0 -Seg:2dd5 Size:256 Owner:0x1c2c +Seg:3285 Size:256 Owner:0x3428 0 -Seg:2ed5 Size:256 Owner:0x1c2e +Seg:3385 Size:256 Owner:0x342a 0 -Seg:2fd5 Size:256 Owner:0x1c30 +Seg:3485 Size:256 Owner:0x342c 0 -Seg:30d5 Size:256 Owner:0x1c32 +Seg:3585 Size:256 Owner:0x342e 0 -Seg:31d5 Size:256 Owner:0x1c34 +Seg:3685 Size:256 Owner:0x3430 0 -Seg:32d5 Size:256 Owner:0x1c36 +Seg:3785 Size:256 Owner:0x3432 0 -Seg:33d5 Size:256 Owner:0x1c38 +Seg:3885 Size:256 Owner:0x3434 0 -Seg:34d5 Size:256 Owner:0x1c3a +Seg:3985 Size:256 Owner:0x3436 0 -Seg:35d5 Size:256 Owner:0x1c3c +Seg:3a85 Size:256 Owner:0x3438 0 -Seg:36d5 Size:256 Owner:0x1c3e +Seg:3b85 Size:256 Owner:0x343a 0 -Seg:37d5 Size:256 Owner:0x1c40 +Seg:3c85 Size:256 Owner:0x343c 0 -Seg:38d5 Size:256 Owner:0x1c42 +Seg:3d85 Size:256 Owner:0x343e 0 -Seg:39d5 Size:256 Owner:0x1c44 +Seg:3e85 Size:256 Owner:0x3440 0 -Seg:3ad5 Size:256 Owner:0x1c46 +Seg:3f85 Size:256 Owner:0x3442 0 -Seg:3bd5 Size:256 Owner:0x1c48 +Seg:4085 Size:256 Owner:0x3444 0 -Seg:3cd5 Size:256 Owner:0x1c4a +Seg:4185 Size:256 Owner:0x3446 0 -Seg:3dd5 Size:256 Owner:0x1c4c +Seg:4285 Size:256 Owner:0x3448 0 -Seg:3ed5 Size:256 Owner:0x1c4e +Seg:4385 Size:256 Owner:0x344a 0 -Seg:3fd5 Size:256 Owner:0x1c50 +Seg:4485 Size:256 Owner:0x344c 0 -Seg:40d5 Size:256 Owner:0x1c52 +Seg:4585 Size:256 Owner:0x344e 0 -Seg:41d5 Size:256 Owner:0x1c54 +Seg:4685 Size:256 Owner:0x3450 0 -Seg:42d5 Size:256 Owner:0x1c56 +Seg:4785 Size:256 Owner:0x3452 0 -Seg:43d5 Size:256 Owner:0x1c58 +Seg:4885 Size:256 Owner:0x3454 0 -Seg:44d5 Size:256 Owner:0x1c5a +Seg:4985 Size:256 Owner:0x3456 0 -Seg:45d5 Size:256 Owner:0x1c5c +Seg:4a85 Size:256 Owner:0x3458 0 -Seg:46d5 Size:256 Owner:0x1c5e +Seg:4b85 Size:256 Owner:0x345a 0 -Seg:47d5 Size:256 Owner:0x1c60 +Seg:4c85 Size:256 Owner:0x345c 0 -Seg:48d5 Size:256 Owner:0x1c62 +Seg:4d85 Size:256 Owner:0x345e 0 -Seg:49d5 Size:256 Owner:0x1c64 +Seg:4e85 Size:256 Owner:0x3460 0 -Seg:4ad5 Size:256 Owner:0x1c66 +Seg:4f85 Size:256 Owner:0x3462 0 -Seg:4bd5 Size:256 Owner:0x1c68 +Seg:5085 Size:256 Owner:0x3464 0 -Seg:4cd5 Size:256 Owner:0x1c6a +Seg:5185 Size:256 Owner:0x3466 0 -Seg:4dd5 Size:256 Owner:0x1c6c +Seg:5285 Size:256 Owner:0x3468 0 -Seg:4ed5 Size:256 Owner:0x1c6e +Seg:5385 Size:256 Owner:0x346a 0 -Seg:4fd5 Size:256 Owner:0x1c70 +Seg:5485 Size:256 Owner:0x346c 0 -Seg:50d5 Size:256 Owner:0x1c72 +Seg:5585 Size:256 Owner:0x346e 0 -Seg:51d5 Size:256 Owner:0x1c74 +Seg:5685 Size:256 Owner:0x3470 0 -Seg:52d5 Size:256 Owner:0x1c76 +Seg:5785 Size:256 Owner:0x3472 0 -Seg:53d5 Size:256 Owner:0x1c78 +Seg:5885 Size:256 Owner:0x3474 0 -Seg:54d5 Size:256 Owner:0x1c7a +Seg:5985 Size:256 Owner:0x3476 0 -Seg:55d5 Size:256 Owner:0x1c7c +Seg:5a85 Size:256 Owner:0x3478 0 -Seg:56d5 Size:256 Owner:0x1c7e +Seg:5b85 Size:256 Owner:0x347a 0 -Seg:57d5 Size:256 Owner:0x1c80 +Seg:5c85 Size:256 Owner:0x347c 0 -Seg:58d5 Size:256 Owner:0x1c82 +Seg:5d85 Size:256 Owner:0x347e 0 -Seg:59d5 Size:256 Owner:0x1c84 +Seg:5e85 Size:256 Owner:0x3480 0 -Seg:5ad5 Size:256 Owner:0x1c86 +Seg:5f85 Size:256 Owner:0x3482 0 -Seg:5bd5 Size:256 Owner:0x1c88 +Seg:6085 Size:256 Owner:0x3484 0 -Seg:5cd5 Size:256 Owner:0x1c8a +Seg:6185 Size:256 Owner:0x3486 0 -Seg:5dd5 Size:256 Owner:0x1c8c +Seg:6285 Size:256 Owner:0x3488 0 -Seg:5ed5 Size:256 Owner:0x1c8e +Seg:6385 Size:256 Owner:0x348a 0 -Seg:5fd5 Size:256 Owner:0x1c90 +Seg:6485 Size:256 Owner:0x348c 0 -Seg:60d5 Size:256 Owner:0x1c92 +Seg:6585 Size:256 Owner:0x348e 0 -Seg:61d5 Size:256 Owner:0x1c94 +Seg:6685 Size:256 Owner:0x3490 0 -Seg:62d5 Size:256 Owner:0x1c96 +Seg:6785 Size:256 Owner:0x3492 0 -Seg:63d5 Size:256 Owner:0x1c98 +Seg:6885 Size:256 Owner:0x3494 0 -Seg:64d5 Size:256 Owner:0x1c9a +Seg:6985 Size:256 Owner:0x3496 0 -Seg:65d5 Size:256 Owner:0x1c9c +Seg:6a85 Size:256 Owner:0x3498 0 -Seg:66d5 Size:256 Owner:0x1c9e +Seg:6b85 Size:256 Owner:0x349a 0 -Seg:67d5 Size:256 Owner:0x1ca0 +Seg:6c85 Size:256 Owner:0x349c 0 -Seg:68d5 Size:256 Owner:0x1ca2 +Seg:6d85 Size:256 Owner:0x349e 0 -Seg:69d5 Size:256 Owner:0x1ca4 +Seg:6e85 Size:256 Owner:0x34a0 0 -Seg:6ad5 Size:256 Owner:0x1ca6 +Seg:6f85 Size:256 Owner:0x34a2 0 -Seg:6bd5 Size:256 Owner:0x1ca8 +Seg:7085 Size:256 Owner:0x34a4 0 -Seg:6cd5 Size:256 Owner:0x1caa +Seg:7185 Size:256 Owner:0x34a6 0 -Seg:6dd5 Size:256 Owner:0x1cac +Seg:7285 Size:256 Owner:0x34a8 0 -Seg:6ed5 Size:256 Owner:0x1cae +Seg:7385 Size:256 Owner:0x34aa 0 -Seg:6fd5 Size:256 Owner:0x1cb0 +Seg:7485 Size:256 Owner:0x34ac 0 -Seg:70d5 Size:256 Owner:0x1cb2 +Seg:7585 Size:256 Owner:0x34ae 0 -Seg:71d5 Size:256 Owner:0x1cb4 +Seg:7685 Size:256 Owner:0x34b0 0 -Seg:72d5 Size:256 Owner:0x1cb6 +Seg:7785 Size:256 Owner:0x34b2 0 -Seg:73d5 Size:256 Owner:0x1cb8 +Seg:7885 Size:256 Owner:0x34b4 0 -Seg:74d5 Size:256 Owner:0x1cba +Seg:7985 Size:256 Owner:0x34b6 0 -Seg:75d5 Size:256 Owner:0x1cbc +Seg:7a85 Size:256 Owner:0x34b8 0 -Seg:76d5 Size:256 Owner:0x1cbe +Seg:7b85 Size:256 Owner:0x34ba 0 -Seg:77d5 Size:256 Owner:0x1cc0 +Seg:7c85 Size:256 Owner:0x34bc 0 -Seg:78d5 Size:256 Owner:0x1cc2 +Seg:7d85 Size:256 Owner:0x34be 0 -Seg:79d5 Size:256 Owner:0x1cc4 +Seg:7e85 Size:256 Owner:0x34c0 0 -Seg:7ad5 Size:256 Owner:0x1cc6 +Seg:7f85 Size:256 Owner:0x34c2 0 -Seg:7bd5 Size:256 Owner:0x1cc8 +Seg:8085 Size:256 Owner:0x34c4 0 -Seg:7cd5 Size:256 Owner:0x1cca +Seg:8185 Size:256 Owner:0x34c6 0 -Seg:7dd5 Size:256 Owner:0x1ccc +Seg:8285 Size:256 Owner:0x34c8 0 -Seg:7ed5 Size:256 Owner:0x1cce +Seg:8385 Size:256 Owner:0x34ca 0 -Seg:7fd5 Size:256 Owner:0x1cd0 +Seg:8485 Size:256 Owner:0x34cc 0 -Seg:80d5 Size:256 Owner:0x1cd2 +Seg:8585 Size:256 Owner:0x34ce 0 -Seg:81d5 Size:256 Owner:0x1cd4 +Seg:8685 Size:256 Owner:0x34d0 0 -Seg:82d5 Size:256 Owner:0x1cd6 +Seg:8785 Size:256 Owner:0x34d2 0 -Seg:83d5 Size:256 Owner:0x1cd8 +Seg:8885 Size:256 Owner:0x34d4 0 -Seg:84d5 Size:273 Owner:0x5ddc -00000000000000000000000000000000000000000000000000000000000000000000000000000000 -Seg:9ec1 Size:24894 Owner:0x0 +Seg:8985 Size:401 Owner:0xe0c6 +0 +Seg:8b16 Size:2 Owner:0x3376 +0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +Seg:b585 Size:19066 Owner:0x0  \ No newline at end of file diff --git a/HEAP.16W b/HEAP.16W index 35aa4f0d..2c6ec035 100755 --- a/HEAP.16W +++ b/HEAP.16W @@ -1,55 +1,19 @@ == near == - USED block at 1e27:da06 of size 12 - USED block at 1e27:da12 of size 320 - USED block at 1e27:db52 of size 52 - USED block at 1e27:db86 of size 20 - USED block at 1e27:db9a of size 20 - USED block at 1e27:dbae of size 20 - USED block at 1e27:dbc2 of size 20 - USED block at 1e27:dbd6 of size 20 - FREE block at 1e27:dbea of size 9234 + USED block at 0f62:d436 of size 8 + USED block at 0f62:d43e of size 322 + USED block at 0f62:d580 of size 32 + USED block at 0f62:d5a0 of size 14 + USED block at 0f62:d5ae of size 16 + USED block at 0f62:d5be of size 14 + USED block at 0f62:d5cc of size 14 + USED block at 0f62:d5da of size 16 + USED block at 0f62:d5ea of size 136 + FREE block at 0f62:d672 of size 10634 OK - end of heap == far == - USED block at 2e28:0016 of size 65342 - USED block at 2e28:ff54 of size 20 - USED block at 2e28:ff68 of size 136 - FREE block at 2e28:fff0 of size 12 - USED block at 3e29:0016 of size 66 - USED block at 3e29:0058 of size 50 - USED block at 3e29:008a of size 50 - USED block at 3e29:00bc of size 50 - USED block at 3e29:00ee of size 50 - USED block at 3e29:0120 of size 50 - USED block at 3e29:0152 of size 50 - USED block at 3e29:0184 of size 50 - USED block at 3e29:01b6 of size 50 - USED block at 3e29:01e8 of size 50 - USED block at 3e29:021a of size 50 - USED block at 3e29:024c of size 50 - USED block at 3e29:027e of size 50 - FREE block at 3e29:02b0 of size 29552 - USED block at 3e29:7620 of size 1202 - USED block at 3e29:7ad2 of size 1202 - USED block at 3e29:7f84 of size 1202 - USED block at 3e29:8436 of size 22 - FREE block at 3e29:844c of size 8202 - FREE block at 3e29:a456 of size 3148 - FREE block at 3e29:b0a2 of size 0 -ERROR - bad node in heap - -Memory Type Total Used Free ----------------- -------- -------- -------- -Near 9718 484 9234 -Far 45170 4256 40914 ----------------- -------- -------- -------- -HC_coreleft = 9232 -HC_farcoreleft = 396888 -HC_GetNearFreeSize = 9234 -HC_GetFarFreeSize = 40914 -coreleft = 9232 -farcoreleft = 396888 -stackavail = 23262 + FREE block at 1f63:0016 of size 8166 +OK - end of heap diff --git a/INPUTEST.16W b/INPUTEST.16W new file mode 100755 index 00000000..e69de29b diff --git a/MMDUMP.16W b/MMDUMP.16W index 88de7f7c..0471f82c 100755 Binary files a/MMDUMP.16W and b/MMDUMP.16W differ diff --git a/makefile b/makefile index 384e0be0..3a187c25 100755 --- a/makefile +++ b/makefile @@ -64,7 +64,7 @@ DOSLIBMAKEALL=.\build.bat !endif TARGET_OS = dos -MEMORYMODE = l +MEMORYMODE = m BUILD_ROOT=$+$(%__CWD__)$- #EXMMTESTDIR=16$(DIRSEP)exmmtest$(DIRSEP) diff --git a/ps.exe b/ps.exe index 27626767..670342e2 100755 Binary files a/ps.exe and b/ps.exe differ diff --git a/src/lib/16_hc.c b/src/lib/16_hc.c index 3c73c6e0..c3ed5373 100755 --- a/src/lib/16_hc.c +++ b/src/lib/16_hc.c @@ -549,11 +549,15 @@ dword farcoreleft() // return 0x90000UL-16UL; // #endif -//---- return 0x90000UL+16UL; +#if !defined(__LARGE__) && !defined(__COMPACT__) && !defined(__HUGE__) +//---- + return 0x90000UL+16UL; //---- return 589824UL+16UL; +#else //++++ return HC_farcoreleft(); //stack overflows return HC_GetFarFreeSize(); +#endif } dword coreleft() diff --git a/src/lib/16_head.h b/src/lib/16_head.h index 1c95d512..0d86cd24 100755 --- a/src/lib/16_head.h +++ b/src/lib/16_head.h @@ -162,7 +162,6 @@ extern int profilehandle,debughandle; //make it into game global #define nil ((void *)0) #ifdef __WATCOMC__ -//#define _FCORELEFT 0x90000UL+16UL /*static union REGS CPURegs; #define _AX CPURegs.x.ax diff --git a/src/lib/16_spri.c b/src/lib/16_spri.c index 82c83c50..70ae0e38 100755 --- a/src/lib/16_spri.c +++ b/src/lib/16_spri.c @@ -440,9 +440,9 @@ void animate_spri(entity_t *enti, video_t *video) ( x-rx, y-ry, - enti->spri.sprite_vrl_cont.vrl_header, + (struct vrl1_vgax_header *)enti->spri.sprite_vrl_cont.vrl_header, enti->spri.sprite_vrl_cont.line_offsets, - enti->spri.sprite_vrl_cont.buffer + sizeof(struct vrl1_vgax_header), + (byte *)enti->spri.sprite_vrl_cont.buffer + sizeof(struct vrl1_vgax_header), enti->spri.sprite_vrl_cont.data_size ); #endif diff --git a/src/lib/doslib b/src/lib/doslib index 54228fcf..46596c15 160000 --- a/src/lib/doslib +++ b/src/lib/doslib @@ -1 +1 @@ -Subproject commit 54228fcf96270078d6bfb8c806922e48bbb3ad89 +Subproject commit 46596c1580a9cb029ccf33ff90da3beb86d916b4