From: sparky4 Date: Mon, 14 Nov 2016 18:12:11 +0000 (-0600) Subject: wwww X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;ds=sidebyside;h=0a20122c69db40134055fec030af5a468eb266a3;p=16.git wwww --- diff --git a/DEBUG.16W b/DEBUG.16W index cb918143..1d9a2adc 100755 --- a/DEBUG.16W +++ b/DEBUG.16W @@ -1,210 +1,210 @@ -Seg:0 Size:10247 Owner:0x0 -+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++0 -Seg:2807 Size:256 Owner:0x1630 +Seg:0 Size:11694 Owner:0x0 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++0000 +Seg:2e9b Size:37 Owner:0x0 ++ +Seg:2ec0 Size:256 Owner:0x1650 ++++ -Seg:29c9 Size:44 Owner:0x0 -++ -Seg:29f5 Size:256 Owner:0x1422 +Seg:2fc0 Size:256 Owner:0x1442 ++++ -Seg:2af5 Size:256 Owner:0x1424 +Seg:30c0 Size:256 Owner:0x1444 ++++ -Seg:2bf5 Size:256 Owner:0x1426 +Seg:31c0 Size:256 Owner:0x1446 ++++ -Seg:2cf5 Size:256 Owner:0x1428 -+++++ -Seg:2df5 Size:256 Owner:0x142a +Seg:32c0 Size:256 Owner:0x1448 ++++ -Seg:2ef5 Size:256 Owner:0x142c +Seg:33c0 Size:256 Owner:0x144a ++++ -Seg:2ff5 Size:256 Owner:0x142e +Seg:34c0 Size:256 Owner:0x144c ++++ -Seg:30f5 Size:256 Owner:0x1430 +Seg:35c0 Size:256 Owner:0x144e ++++ -Seg:31f5 Size:256 Owner:0x1432 -+++++ -Seg:32f5 Size:256 Owner:0x1434 +Seg:36c0 Size:256 Owner:0x1450 ++++ -Seg:33f5 Size:256 Owner:0x1436 +Seg:37c0 Size:256 Owner:0x1452 ++++ -Seg:34f5 Size:256 Owner:0x1438 +Seg:38c0 Size:256 Owner:0x1454 ++++ -Seg:35f5 Size:256 Owner:0x143a +Seg:39c0 Size:256 Owner:0x1456 ++++ -Seg:36f5 Size:256 Owner:0x143c -+++++ -Seg:37f5 Size:256 Owner:0x143e +Seg:3ac0 Size:256 Owner:0x1458 ++++ -Seg:38f5 Size:256 Owner:0x1440 +Seg:3bc0 Size:256 Owner:0x145a ++++ -Seg:39f5 Size:256 Owner:0x1442 +Seg:3cc0 Size:256 Owner:0x145c ++++ -Seg:3af5 Size:256 Owner:0x1444 +Seg:3dc0 Size:256 Owner:0x145e ++++ -Seg:3bf5 Size:256 Owner:0x1446 -+++++ -Seg:3cf5 Size:256 Owner:0x1448 +Seg:3ec0 Size:256 Owner:0x1460 ++++ -Seg:3df5 Size:256 Owner:0x144a +Seg:3fc0 Size:256 Owner:0x1462 ++++ -Seg:3ef5 Size:256 Owner:0x144c +Seg:40c0 Size:256 Owner:0x1464 ++++ -Seg:3ff5 Size:256 Owner:0x144e +Seg:41c0 Size:256 Owner:0x1466 ++++ -Seg:40f5 Size:256 Owner:0x1450 -+++++ -Seg:41f5 Size:256 Owner:0x1452 +Seg:42c0 Size:256 Owner:0x1468 ++++ -Seg:42f5 Size:256 Owner:0x1454 +Seg:43c0 Size:256 Owner:0x146a ++++ -Seg:43f5 Size:256 Owner:0x1456 +Seg:44c0 Size:256 Owner:0x146c ++++ -Seg:44f5 Size:256 Owner:0x1458 +Seg:45c0 Size:256 Owner:0x146e ++++ -Seg:45f5 Size:256 Owner:0x145a -+++++ -Seg:46f5 Size:256 Owner:0x145c +Seg:46c0 Size:256 Owner:0x1470 ++++ -Seg:47f5 Size:256 Owner:0x145e +Seg:47c0 Size:256 Owner:0x1472 ++++ -Seg:48f5 Size:256 Owner:0x1460 +Seg:48c0 Size:256 Owner:0x1474 ++++ -Seg:49f5 Size:256 Owner:0x1462 +Seg:49c0 Size:256 Owner:0x1476 ++++ -Seg:4af5 Size:256 Owner:0x1464 -+++++ -Seg:4bf5 Size:256 Owner:0x1466 +Seg:4ac0 Size:256 Owner:0x1478 ++++ -Seg:4cf5 Size:256 Owner:0x1468 +Seg:4bc0 Size:256 Owner:0x147a ++++ -Seg:4df5 Size:256 Owner:0x146a +Seg:4cc0 Size:256 Owner:0x147c ++++ -Seg:4ef5 Size:256 Owner:0x146c +Seg:4dc0 Size:256 Owner:0x147e ++++ -Seg:4ff5 Size:256 Owner:0x146e -+++++ -Seg:50f5 Size:256 Owner:0x1470 +Seg:4ec0 Size:256 Owner:0x1480 ++++ -Seg:51f5 Size:256 Owner:0x1472 +Seg:4fc0 Size:256 Owner:0x1482 ++++ -Seg:52f5 Size:256 Owner:0x1474 +Seg:50c0 Size:256 Owner:0x1484 ++++ -Seg:53f5 Size:256 Owner:0x1476 +Seg:51c0 Size:256 Owner:0x1486 ++++ -Seg:54f5 Size:256 Owner:0x1478 -+++++ -Seg:55f5 Size:256 Owner:0x147a +Seg:52c0 Size:256 Owner:0x1488 ++++ -Seg:56f5 Size:256 Owner:0x147c +Seg:53c0 Size:256 Owner:0x148a ++++ -Seg:57f5 Size:256 Owner:0x147e +Seg:54c0 Size:256 Owner:0x148c ++++ -Seg:58f5 Size:256 Owner:0x1480 +Seg:55c0 Size:256 Owner:0x148e ++++ -Seg:59f5 Size:256 Owner:0x1482 -+++++ -Seg:5af5 Size:256 Owner:0x1484 +Seg:56c0 Size:256 Owner:0x1490 ++++ -Seg:5bf5 Size:256 Owner:0x1486 +Seg:57c0 Size:256 Owner:0x1492 ++++ -Seg:5cf5 Size:256 Owner:0x1488 +Seg:58c0 Size:256 Owner:0x1494 ++++ -Seg:5df5 Size:256 Owner:0x148a +Seg:59c0 Size:256 Owner:0x1496 ++++ -Seg:5ef5 Size:256 Owner:0x148c -+++++ -Seg:5ff5 Size:256 Owner:0x148e +Seg:5ac0 Size:256 Owner:0x1498 ++++ -Seg:60f5 Size:256 Owner:0x1490 +Seg:5bc0 Size:256 Owner:0x149a ++++ -Seg:61f5 Size:256 Owner:0x1492 +Seg:5cc0 Size:256 Owner:0x149c ++++ -Seg:62f5 Size:256 Owner:0x1494 +Seg:5dc0 Size:256 Owner:0x149e ++++ -Seg:63f5 Size:256 Owner:0x1496 -+++++ -Seg:64f5 Size:256 Owner:0x1498 +Seg:5ec0 Size:256 Owner:0x14a0 ++++ -Seg:65f5 Size:256 Owner:0x149a +Seg:5fc0 Size:256 Owner:0x14a2 ++++ -Seg:66f5 Size:256 Owner:0x149c +Seg:60c0 Size:256 Owner:0x14a4 ++++ -Seg:67f5 Size:256 Owner:0x149e +Seg:61c0 Size:256 Owner:0x14a6 ++++ -Seg:68f5 Size:256 Owner:0x14a0 -+++++ -Seg:69f5 Size:256 Owner:0x14a2 +Seg:62c0 Size:256 Owner:0x14a8 ++++ -Seg:6af5 Size:256 Owner:0x14a4 +Seg:63c0 Size:256 Owner:0x14aa ++++ -Seg:6bf5 Size:256 Owner:0x14a6 +Seg:64c0 Size:256 Owner:0x14ac ++++ -Seg:6cf5 Size:256 Owner:0x14a8 +Seg:65c0 Size:256 Owner:0x14ae ++++ -Seg:6df5 Size:256 Owner:0x14aa -+++++ -Seg:6ef5 Size:256 Owner:0x14ac +Seg:66c0 Size:256 Owner:0x14b0 ++++ -Seg:6ff5 Size:256 Owner:0x14ae +Seg:67c0 Size:256 Owner:0x14b2 ++++ -Seg:70f5 Size:256 Owner:0x14b0 +Seg:68c0 Size:256 Owner:0x14b4 ++++ -Seg:71f5 Size:256 Owner:0x14b2 +Seg:69c0 Size:256 Owner:0x14b6 ++++ -Seg:72f5 Size:256 Owner:0x14b4 -+++++ -Seg:73f5 Size:256 Owner:0x14b6 +Seg:6ac0 Size:256 Owner:0x14b8 ++++ -Seg:74f5 Size:256 Owner:0x14b8 +Seg:6bc0 Size:256 Owner:0x14ba ++++ -Seg:75f5 Size:256 Owner:0x14ba +Seg:6cc0 Size:256 Owner:0x14bc ++++ -Seg:76f5 Size:256 Owner:0x14bc +Seg:6dc0 Size:256 Owner:0x14be ++++ -Seg:77f5 Size:256 Owner:0x14be -+++++ -Seg:78f5 Size:256 Owner:0x14c0 +Seg:6ec0 Size:256 Owner:0x14c0 ++++ -Seg:79f5 Size:256 Owner:0x14c2 +Seg:6fc0 Size:256 Owner:0x14c2 ++++ -Seg:7af5 Size:256 Owner:0x14c4 +Seg:70c0 Size:256 Owner:0x14c4 ++++ -Seg:7bf5 Size:256 Owner:0x14c6 +Seg:71c0 Size:256 Owner:0x14c6 ++++ -Seg:7cf5 Size:256 Owner:0x14c8 -+++++ -Seg:7df5 Size:256 Owner:0x14ca +Seg:72c0 Size:256 Owner:0x14c8 ++++ -Seg:7ef5 Size:256 Owner:0x14cc +Seg:73c0 Size:256 Owner:0x14ca ++++ -Seg:7ff5 Size:256 Owner:0x14ce +Seg:74c0 Size:256 Owner:0x14cc ++++ -Seg:80f5 Size:256 Owner:0x14d0 +Seg:75c0 Size:256 Owner:0x14ce ++++ -Seg:81f5 Size:256 Owner:0x14d2 -+++++ -Seg:82f5 Size:256 Owner:0x14d4 +Seg:76c0 Size:256 Owner:0x14d0 ++++ -Seg:83f5 Size:256 Owner:0x14d6 +Seg:77c0 Size:256 Owner:0x14d2 ++++ -Seg:84f5 Size:256 Owner:0x14d8 +Seg:78c0 Size:256 Owner:0x14d4 ++++ -Seg:85f5 Size:256 Owner:0x14da +Seg:79c0 Size:256 Owner:0x14d6 ++++ -Seg:86f5 Size:256 Owner:0x14dc -+++++ -Seg:87f5 Size:256 Owner:0x14de +Seg:7ac0 Size:256 Owner:0x14d8 ++++ -Seg:88f5 Size:256 Owner:0x14e0 +Seg:7bc0 Size:256 Owner:0x14da ++++ -Seg:89f5 Size:256 Owner:0x14e2 +Seg:7cc0 Size:256 Owner:0x14dc ++++ -Seg:8af5 Size:256 Owner:0x14e4 +Seg:7dc0 Size:256 Owner:0x14de ++++ -Seg:8bf5 Size:256 Owner:0x14e6 -+++++ -Seg:8cf5 Size:256 Owner:0x14e8 +Seg:7ec0 Size:256 Owner:0x14e0 ++++ -Seg:8df5 Size:273 Owner:0xdec0 -++++ -Seg:b9f5 Size:17930 Owner:0x0 -+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ \ No newline at end of file +Seg:7fc0 Size:256 Owner:0x14e2 +++++ +Seg:80c0 Size:256 Owner:0x14e4 +++++ +Seg:81c0 Size:256 Owner:0x14e6 +++++ +Seg:82c0 Size:256 Owner:0x14e8 +++++ +Seg:83c0 Size:256 Owner:0x14ea +++++ +Seg:84c0 Size:256 Owner:0x14ec +++++ +Seg:85c0 Size:256 Owner:0x14ee +++++ +Seg:86c0 Size:256 Owner:0x14f0 +++++ +Seg:87c0 Size:256 Owner:0x14f2 +++++ +Seg:88c0 Size:256 Owner:0x14f4 +++++ +Seg:89c0 Size:256 Owner:0x14f6 +++++ +Seg:8ac0 Size:256 Owner:0x14f8 +++++ +Seg:8bc0 Size:256 Owner:0x14fa +++++ +Seg:8cc0 Size:256 Owner:0x14fc +++++ +Seg:8dc0 Size:256 Owner:0x14fe +++++ +Seg:8ec0 Size:256 Owner:0x1500 +++++ +Seg:8fc0 Size:256 Owner:0x1502 +++++ +Seg:90c0 Size:256 Owner:0x1504 +++++ +Seg:91c0 Size:256 Owner:0x1506 +++++ +Seg:92c0 Size:256 Owner:0x1508 +++++ +Seg:93c0 Size:401 Owner:0xebf6 +++++++ +Seg:bec0 Size:16703 Owner:0x0 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ \ No newline at end of file diff --git a/HEAP.16W b/HEAP.16W index cd3821b5..7aa4d04f 100755 --- a/HEAP.16W +++ b/HEAP.16W @@ -1,47 +1,71 @@ == default == - USED block at 29eb0016 of size 66 - USED block at 29eb0058 of size 66 - FREE block at 29eb009a of size 18 - USED block at 29eb00ac of size 136 - USED block at 29eb0134 of size 20 - FREE block at 29eb0148 of size 7860 + FREE block at 2ebe0016 of size 18 + USED block at 2ebe0028 of size 50 + USED block at 2ebe005a of size 50 + USED block at 2ebe008c of size 50 + USED block at 2ebe00be of size 50 + USED block at 2ebe00f0 of size 50 + USED block at 2ebe0122 of size 50 + USED block at 2ebe0154 of size 50 + USED block at 2ebe0186 of size 50 + USED block at 2ebe01b8 of size 50 + USED block at 2ebe01ea of size 50 + USED block at 2ebe021c of size 50 + USED block at 2ebe024e of size 50 + USED block at 2ebe0280 of size 50 + FREE block at 2ebe02b2 of size 14 + USED block at 2ebe02c0 of size 20 + USED block at 2ebe02d4 of size 136 + FREE block at 2ebe035c of size 7328 OK - end of heap == near == - USED block at 19eadef6 of size 12 - USED block at 19eadf02 of size 530 - USED block at 19eae114 of size 72 - USED block at 19eae15c of size 20 - USED block at 19eae170 of size 20 - USED block at 19eae184 of size 20 - USED block at 19eae198 of size 20 - USED block at 19eae1ac of size 20 - USED block at 19eae1c0 of size 7740 + USED block at 1ebdec46 of size 12 + USED block at 1ebdec52 of size 528 + USED block at 1ebdee62 of size 72 + USED block at 1ebdeeaa of size 20 + USED block at 1ebdeebe of size 20 + USED block at 1ebdeed2 of size 20 + USED block at 1ebdeee6 of size 20 + USED block at 1ebdeefa of size 20 + USED block at 1ebdef0e of size 4334 OK - end of heap == far == - USED block at 29eb0016 of size 66 - USED block at 29eb0058 of size 66 - USED block at 29eb009a of size 18 - USED block at 29eb00ac of size 136 - USED block at 29eb0134 of size 20 - USED block at 29eb0148 of size 7860 + USED block at 2ebe0016 of size 18 + USED block at 2ebe0028 of size 50 + USED block at 2ebe005a of size 50 + USED block at 2ebe008c of size 50 + USED block at 2ebe00be of size 50 + USED block at 2ebe00f0 of size 50 + USED block at 2ebe0122 of size 50 + USED block at 2ebe0154 of size 50 + USED block at 2ebe0186 of size 50 + USED block at 2ebe01b8 of size 50 + USED block at 2ebe01ea of size 50 + USED block at 2ebe021c of size 50 + USED block at 2ebe024e of size 50 + USED block at 2ebe0280 of size 50 + USED block at 2ebe02b2 of size 14 + USED block at 2ebe02c0 of size 20 + USED block at 2ebe02d4 of size 136 + USED block at 2ebe035c of size 7328 OK - end of heap Memory Type Total Used Free ---------------- -------- -------- -------- -Default 8166 288 7878 -Near 8454 714 7740 -Far 8166 288 7878 +Default 8166 806 7360 +Near 5046 712 4334 +Far 8166 806 7360 ---------------- -------- -------- -------- -coreleft = 7738 -farcoreleft = 31846 -GetFreeSize = 24128 -GetNearFreeSize = 7740 -GetFarFreeSize = 24128 -memavl = 7738 -stackavail = 31588 +coreleft = 4332 +farcoreleft = 3326 +GetFreeSize = 64548 +GetNearFreeSize = 4334 +GetFarFreeSize = 64548 +memavl = 4332 +stackavail = 31515 diff --git a/MMDUMP.16W b/MMDUMP.16W index 0ee513f1..8e17e88f 100755 Binary files a/MMDUMP.16W and b/MMDUMP.16W differ diff --git a/data/g.pal b/data/g.pal index 0f417c49..e67dd143 100755 Binary files a/data/g.pal and b/data/g.pal differ diff --git a/make-lowercase b/make-lowercase index 4e586f22..2cd4e2a2 100755 --- a/make-lowercase +++ b/make-lowercase @@ -2,62 +2,62 @@ my $top=`pwd`; chomp $top; sub vfat_rename($$) { - my $from,$to; - ($from,$to) = @_; + my $from,$to; + ($from,$to) = @_; - # uppercase DOS names with the vfat driver need some forceful convincing - # to actually make them lowercase - rename($from,"$to.xxx.xx"); - rename("$to.xxx.xx",$to); + # uppercase DOS names with the vfat driver need some forceful convincing + # to actually make them lowercase + rename($from,"$to.xxx.xx"); + rename("$to.xxx.xx",$to); } sub scan($) { - my $old = `pwd`; chomp $old; - my $cur = shift @_; - my @x; - - print "scanning $cur\n"; - chdir($cur) || die; - - opendir(X,".") || return; - while (my $name = readdir(X)) { - next unless -f $name; - my $n = lc($name); - next if $n eq $name; - print "$name\n"; - rename($name,$n) || die; - vfat_rename($name,$n); - } - closedir(X); - - opendir(X,".") || return; - while (my $name = readdir(X)) { - next if $name =~ m/^\.+$/; - next if $name eq ".git"; - next if $name eq ".GIT"; - next unless -d $name; - my $n = lc($name); - next if $n eq $name; - print "$name\n"; - rename($name,$n) || die; - vfat_rename($name,$n); - } - closedir(X); - - opendir(X,".") || return; - while (my $name = readdir(X)) { - next if $name =~ m/^\.+$/; - next if $name eq ".git"; - next if $name eq ".GIT"; - next unless -d $name; - push(@x,$name); - } - closedir(X); - foreach my $name (@x) { - scan("$cur/$name"); - } - - chdir($old) || die; + my $old = `pwd`; chomp $old; + my $cur = shift @_; + my @x; + + print "scanning $cur\n"; + chdir($cur) || die; + + opendir(X,".") || return; + while (my $name = readdir(X)) { + next unless -f $name; + my $n = lc($name); + next if $n eq $name; + print "$name\n"; + rename($name,$n) || die; + vfat_rename($name,$n); + } + closedir(X); + + opendir(X,".") || return; + while (my $name = readdir(X)) { + next if $name =~ m/^\.+$/; + next if $name eq ".git"; + next if $name eq ".GIT"; + next unless -d $name; + my $n = lc($name); + next if $n eq $name; + print "$name\n"; + rename($name,$n) || die; + vfat_rename($name,$n); + } + closedir(X); + + opendir(X,".") || return; + while (my $name = readdir(X)) { + next if $name =~ m/^\.+$/; + next if $name eq ".git"; + next if $name eq ".GIT"; + next unless -d $name; + push(@x,$name); + } + closedir(X); + foreach my $name (@x) { + scan("$cur/$name"); + } + + chdir($old) || die; } scan($top); diff --git a/src/lib/16_ca.c b/src/lib/16_ca.c index acc4598f..7298ca3f 100755 --- a/src/lib/16_ca.c +++ b/src/lib/16_ca.c @@ -503,10 +503,10 @@ void CAL_HuffExpand (byte huge *source, byte huge *dest, { // unsigned bit,byte,node,code; unsigned sourceseg,sourceoff,destseg,destoff,endoff; -//// huffnode *headptr; + huffnode *headptr; // huffnode *nodeon; -//// headptr = hufftable+254; // head node is allways node 254 + headptr = hufftable+254; // head node is allways node 254 source++; // normalize source--; @@ -533,7 +533,7 @@ void CAL_HuffExpand (byte huge *source, byte huge *dest, //-------------------------- __asm { -//// mov bx,[headptr] + mov bx,[word ptr headptr] mov si,[sourceoff] mov di,[destoff] @@ -597,7 +597,7 @@ storebyteshort: #endif mov [es:di],dl inc di // write a decopmpressed byte out -//// mov bx,[headptr] // back to the head node for next bit + mov bx,[word ptr headptr] // back to the head node for next bit cmp di,ax // done? jne expandshort @@ -613,7 +613,7 @@ storebyteshort: length--; __asm { -//// mov bx,[headptr] + mov bx,[word ptr headptr] mov cl,1 mov si,[sourceoff] @@ -685,7 +685,7 @@ storebyte: #endif mov [es:di],dl inc di // write a decopmpressed byte out -//// mov bx,[headptr] // back to the head node for next bit + mov bx,[word ptr headptr] // back to the head node for next bit cmp di,0x10 // normalize es:di jb dinorm diff --git a/src/lib/bitmap.c b/src/lib/bitmap.c index 1e4a8d5b..7f9df1f0 100755 --- a/src/lib/bitmap.c +++ b/src/lib/bitmap.c @@ -46,10 +46,10 @@ static struct pcxHeader { } head; static void loadPcxStage1(FILE *file, bitmap_t *result) { - long bufSize; - int index; - byte count, val; - long int pos; + //long bufSize; + //int index; + //byte count, val; + //long int pos; /* read the header */ fread(&head, sizeof(char), sizeof(struct pcxHeader), file); diff --git a/src/lib/doslib b/src/lib/doslib index 6660661e..78e4c07a 160000 --- a/src/lib/doslib +++ b/src/lib/doslib @@ -1 +1 @@ -Subproject commit 6660661e24924b7d2a5a3613a8a14cdd872c4432 +Subproject commit 78e4c07a110b8e840acbd177433ddb0e426a2a40 diff --git a/src/lib/mapread.c b/src/lib/mapread.c index 039e0a01..a13a370d 100755 --- a/src/lib/mapread.c +++ b/src/lib/mapread.c @@ -237,9 +237,9 @@ again: } } - free(js); - free(tok); - fclose(fh); + //free(js); + //free(tok); + //fclose(fh); return 0; } diff --git a/wbuild.sh b/wbuild.sh index 67df5751..fa6245cd 100755 --- a/wbuild.sh +++ b/wbuild.sh @@ -6,7 +6,7 @@ wmake -h comp #then # echo dumping *.err #cat *.err - wmake vomitchan + wmake -h vomitchan #fi #if [ -f 16_head.o ] #then