Plan 9 from Bell Labs 2005-12-26

amd64/include/u.h

@@ -7,6 +7,7 @@ typedef   signed char	schar;
 typedef	long long	vlong;
 typedef	unsigned long long uvlong;
 typedef unsigned long long uintptr;
+typedef unsigned long	usize;
 typedef	ushort		Rune;
 typedef union FPdbleword FPdbleword;
 typedef uvlong		jmp_buf[2];

dist/replica/_plan9.db

@@ -524,7 +524,7 @@
 386/ld.com - 775 sys sys 1131317344 72524
 386/lib - 20000000775 sys sys 1016826328 0
 386/lib/ape - 20000000775 sys sys 944969312 0
-386/lib/ape/lib9.a - 664 sys sys 1132506894 6988
+386/lib/ape/lib9.a - 664 sys sys 1135531447 6906
 386/lib/ape/libap.a - 664 sys sys 1134151363 809462
 386/lib/ape/libbsd.a - 664 sys sys 1122001336 179308
 386/lib/ape/libdraw.a - 664 sys sys 1131646653 574552
@@ -540,7 +540,7 @@
 386/lib/libauthsrv.a - 664 sys sys 1117249746 34098
 386/lib/libbin.a - 664 sys sys 1115950150 2534
 386/lib/libbio.a - 664 sys sys 1125346045 26064
-386/lib/libc.a - 664 sys sys 1134389885 502902
+386/lib/libc.a - 664 sys sys 1135531448 502758
 386/lib/libcomplete.a - 664 sys sys 1115950151 6370
 386/lib/libcontrol.a - 664 sys sys 1131646654 274922
 386/lib/libdisk.a - 664 sys sys 1126321691 42236
@@ -563,7 +563,7 @@
 386/lib/libsec.a - 664 sys sys 1127360621 646908
 386/lib/libstdio.a - 664 sys sys 1115950159 126206
 386/lib/libsunrpc.a - 664 sys sys 1115950160 355994
-386/lib/libthread.a - 664 sys sys 1127405452 72374
+386/lib/libthread.a - 664 sys sys 1135531448 71308
 386/lib/libventi.a - 664 sys sys 1124766772 97708
 386/mbr - 775 sys sys 1131317338 407
 386/mkfile - 664 sys sys 948141303 46
@@ -828,7 +828,7 @@ alpha/mkfile - 664 sys sys 948141303 46
 amd64 - 20000000775 sys sys 1114458599 0
 amd64/bin - 20000000775 sys sys 1114458475 0
 amd64/include - 20000000775 sys sys 1114458660 0
-amd64/include/u.h - 664 sys sys 1115941544 1669
+amd64/include/u.h - 664 sys sys 1135487949 1698
 amd64/include/ureg.h - 664 sys sys 1114458660 454
 amd64/lib - 20000000775 sys sys 1114458490 0
 amd64/mkfile - 664 sys sys 1114458599 46
@@ -5635,7 +5635,7 @@ sys/doc/docfonts - 664 sys sys 1038117516 208
 sys/doc/fonts - 664 sys sys 944959649 137
 sys/doc/fossil.ms - 664 sys sys 1063856349 31400
 sys/doc/fossil.pdf - 664 sys sys 1042123169 63200
-sys/doc/fossil.ps - 664 sys sys 1042123131 313750
+sys/doc/fossil.ps - 664 sys sys 1135487951 313552
 sys/doc/fs - 20000000775 sys sys 945616779 0
 sys/doc/fs/fs.html - 664 sys sys 1020013937 21345
 sys/doc/fs/fs.pdf - 664 sys sys 1020384351 47177
@@ -6028,7 +6028,7 @@ sys/include/html.h - 664 sys sys 1128662123 15232
 sys/include/httpd.h - 664 sys sys 1091904418 5771
 sys/include/ip.h - 664 sys sys 1103554773 2989
 sys/include/keyboard.h - 664 sys sys 1131637696 865
-sys/include/libc.h - 664 sys sys 1115925565 19623
+sys/include/libc.h - 664 sys sys 1135487938 19627
 sys/include/libsec.h - 664 sys sys 1124709121 9345
 sys/include/mach.h - 664 sys sys 1131289126 8586
 sys/include/memdraw.h - 664 sys sys 1091904419 5645
@@ -7506,7 +7506,7 @@ sys/man/2/readcolmap - 664 sys sys 950892803 1529
 sys/man/2/readv - 664 sys sys 1017423721 1454
 sys/man/2/regexp - 664 sys sys 988225293 3548
 sys/man/2/remove - 664 sys sys 958249504 518
-sys/man/2/rendezvous - 664 sys sys 950593497 1322
+sys/man/2/rendezvous - 664 sys sys 1135487949 1322
 sys/man/2/rsa - 664 sys sys 1087829658 4245
 sys/man/2/rune - 664 sys sys 1015091526 3069
 sys/man/2/runestrcat - 664 sys sys 969499889 1086
@@ -7514,8 +7514,8 @@ sys/man/2/scribble - 664 sys sys 985638584 3847
 sys/man/2/scsi - 664 sys sys 969499889 3171
 sys/man/2/sechash - 664 sys sys 1046042040 3016
 sys/man/2/seek - 664 sys sys 944959696 671
-sys/man/2/segattach - 664 sys sys 1130387203 4302
-sys/man/2/segbrk - 664 sys sys 944959696 825
+sys/man/2/segattach - 664 sys sys 1135487945 4166
+sys/man/2/segbrk - 664 sys sys 1135487945 1195
 sys/man/2/segflush - 664 sys sys 944959695 944
 sys/man/2/setjmp - 664 sys sys 1125540984 1857
 sys/man/2/sin - 664 sys sys 944959694 967
@@ -8006,7 +8006,7 @@ sys/src/9/pc/sdata.c - 664 sys sys 1131290578 52168
 sys/src/9/pc/sdmv50xx.c - 664 sys sys 1131290638 25780
 sys/src/9/pc/sdmylex.c - 664 sys sys 1133068062 27806
 sys/src/9/pc/sdscsi.c - 664 sys sys 1131293342 7133
-sys/src/9/pc/trap.c - 664 sys sys 1132341484 21278
+sys/src/9/pc/trap.c - 664 sys sys 1135487942 21257
 sys/src/9/pc/uarti8250.c - 664 sys sys 1102820421 13958
 sys/src/9/pc/uartisa.c - 664 sys sys 1127126907 1777
 sys/src/9/pc/uartpci.c - 664 sys sys 1096379063 2891
@@ -8022,7 +8022,7 @@ sys/src/9/pc/vgact65545.c - 664 sys sys 1131290600 2249
 sys/src/9/pc/vgacyber938x.c - 664 sys sys 1131290601 3707
 sys/src/9/pc/vgaet4000.c - 664 sys sys 1131290601 5111
 sys/src/9/pc/vgahiqvideo.c - 664 sys sys 1131290601 4098
-sys/src/9/pc/vgai81x.c - 664 sys sys 1131290601 4030
+sys/src/9/pc/vgai81x.c - 664 sys sys 1135487942 4421
 sys/src/9/pc/vgamach64xx.c - 664 sys sys 1131290601 28257
 sys/src/9/pc/vgamga2164w.c - 664 sys sys 1132331257 4769
 sys/src/9/pc/vgamga4xx.c - 664 sys sys 1131290602 10201
@@ -8105,7 +8105,7 @@ sys/src/9/port/page.c - 664 sys sys 1131636090 11128
 sys/src/9/port/parse.c - 664 sys sys 1014931177 2026
 sys/src/9/port/pgrp.c - 664 sys sys 1072704671 3940
 sys/src/9/port/portclock.c - 664 sys sys 1102093397 4556
-sys/src/9/port/portdat.h - 664 sys sys 1134042902 22558
+sys/src/9/port/portdat.h - 664 sys sys 1135487943 22547
 sys/src/9/port/portfns.h - 664 sys sys 1131537254 11022
 sys/src/9/port/portmkfile - 664 sys sys 1131907975 2062
 sys/src/9/port/print.c - 664 sys sys 1014931178 227
@@ -8363,7 +8363,7 @@ sys/src/ape/config - 664 sys sys 1014921996 573
 sys/src/ape/lib - 20000000775 sys sys 1014921994 0
 sys/src/ape/lib/9 - 20000000775 sys sys 1014921994 0
 sys/src/ape/lib/9/386 - 20000000775 sys sys 1014921994 0
-sys/src/ape/lib/9/386/getcallerpc.c - 664 sys sys 1132450766 76
+sys/src/ape/lib/9/386/getcallerpc.s - 664 sys sys 1135488131 65
 sys/src/ape/lib/9/386/getfcr.s - 664 sys sys 1014921994 256
 sys/src/ape/lib/9/68020 - 20000000775 sys sys 1014921994 0
 sys/src/ape/lib/9/68020/getcallerpc.s - 664 sys sys 1132450766 50
@@ -8835,7 +8835,7 @@ sys/src/ape/lib/bsd/strncasecmp.c - 664 sys sys 1051635385 385
 sys/src/ape/lib/bsd/writev.c - 664 sys sys 1014921995 908
 sys/src/ape/lib/draw - 20000000775 sys sys 1070327097 0
 sys/src/ape/lib/draw/colors.c - 664 sys sys 1070327097 3607
-sys/src/ape/lib/draw/libc.h - 664 sys sys 1070660715 3456
+sys/src/ape/lib/draw/libc.h - 664 sys sys 1135547921 3530
 sys/src/ape/lib/draw/mkfile - 664 sys sys 1070327097 1176
 sys/src/ape/lib/fmt - 20000000775 sys sys 1070327381 0
 sys/src/ape/lib/fmt/charstod.c - 664 sys sys 1070327066 1995
@@ -8960,13 +8960,13 @@ sys/src/boot/alphapc/u.h - 664 sys sys 954267450 687
 sys/src/boot/arm - 20000000775 sys sys 1017696239 0
 sys/src/boot/arm/dat.h - 664 sys sys 985642785 0
 sys/src/boot/arm/donprint.c - 664 sys sys 985642785 4089
-sys/src/boot/arm/fns.h - 664 sys sys 985642785 167
+sys/src/boot/arm/fns.h - 664 sys sys 1135487939 197
 sys/src/boot/arm/il.s - 664 sys sys 1015007998 2185
 sys/src/boot/arm/imain.c - 664 sys sys 985642785 603
 sys/src/boot/arm/inflate.c - 664 sys sys 1018029973 2907
 sys/src/boot/arm/io.h - 664 sys sys 985642786 6324
 sys/src/boot/arm/l.s - 664 sys sys 985642786 10805
-sys/src/boot/arm/lib.h - 664 sys sys 985642786 3380
+sys/src/boot/arm/lib.h - 664 sys sys 1135487939 3382
 sys/src/boot/arm/map - 664 sys sys 985642786 236
 sys/src/boot/arm/mem.h - 664 sys sys 985642786 7421
 sys/src/boot/arm/mkfile - 664 sys sys 985642960 578
@@ -9027,8 +9027,8 @@ sys/src/boot/pc/kbd.c - 664 sys sys 1015007952 10188
 sys/src/boot/pc/kfs.h - 664 sys sys 1032215924 861
 sys/src/boot/pc/kfsboot.c - 664 sys sys 1032215914 4788
 sys/src/boot/pc/l.s - 664 sys sys 1130887225 18115
-sys/src/boot/pc/lib.h - 664 sys sys 1094674487 2794
-sys/src/boot/pc/load.c - 664 sys sys 1130887225 8932
+sys/src/boot/pc/lib.h - 664 sys sys 1135487939 2796
+sys/src/boot/pc/load.c - 664 sys sys 1135487939 8923
 sys/src/boot/pc/mbr.s - 664 sys sys 1015007953 6234
 sys/src/boot/pc/mem.h - 664 sys sys 1130887225 3371
 sys/src/boot/pc/memory.c - 664 sys sys 1019533021 10272
@@ -9292,7 +9292,7 @@ sys/src/cmd/acme/ecmd.c - 664 sys sys 1111606460 24205
 sys/src/cmd/acme/edit.c - 664 sys sys 1124993578 12019
 sys/src/cmd/acme/edit.h - 664 sys sys 1124993577 2369
 sys/src/cmd/acme/elog.c - 664 sys sys 1111607796 7294
-sys/src/cmd/acme/exec.c - 664 sys sys 1124993578 28255
+sys/src/cmd/acme/exec.c - 664 sys sys 1135487943 28257
 sys/src/cmd/acme/file.c - 664 sys sys 1044626079 5717
 sys/src/cmd/acme/fns.h - 664 sys sys 1107154481 2916
 sys/src/cmd/acme/fsys.c - 664 sys sys 1111171699 13097
@@ -9372,7 +9372,7 @@ sys/src/cmd/auth/factotum/rpc.c - 664 sys sys 1107633794 11167
 sys/src/cmd/auth/factotum/rsa.c - 664 sys sys 1107706104 3416
 sys/src/cmd/auth/factotum/secstore.c - 664 sys sys 1107633794 14935
 sys/src/cmd/auth/factotum/sshrsa.c - 664 sys sys 1107633793 3416
-sys/src/cmd/auth/factotum/util.c - 664 sys sys 1134500240 18043
+sys/src/cmd/auth/factotum/util.c - 664 sys sys 1135487936 18042
 sys/src/cmd/auth/factotum/wep.c - 664 sys sys 1107706104 2140
 sys/src/cmd/auth/guard.srv.c - 664 sys sys 1032497638 2334
 sys/src/cmd/auth/iam.c - 664 sys sys 1015008430 841
@@ -9546,7 +9546,7 @@ sys/src/cmd/aux/flashfs/mkfs.c - 664 sys sys 1015009082 1072
 sys/src/cmd/aux/flashfs/mkit - 775 sys sys 1015009082 86
 sys/src/cmd/aux/flashfs/request.c - 664 sys sys 1019507619 5739
 sys/src/cmd/aux/flashfs/testld.c - 664 sys sys 1015009082 1043
-sys/src/cmd/aux/flashfs/utils.c - 664 sys sys 1019498850 1097
+sys/src/cmd/aux/flashfs/utils.c - 664 sys sys 1135487936 1094
 sys/src/cmd/aux/gps - 20000000775 sys sys 1107448949 0
 sys/src/cmd/aux/gps/dat.h - 664 sys sys 1107448949 287
 sys/src/cmd/aux/gps/gpsevermore.c - 664 sys sys 1107448815 4501
@@ -9594,7 +9594,7 @@ sys/src/cmd/aux/vga/att21c498.c - 664 sys sys 1014925007 3209
 sys/src/cmd/aux/vga/bt485.c - 664 sys sys 1014925007 4904
 sys/src/cmd/aux/vga/ch9294.c - 664 sys sys 1014925007 2120
 sys/src/cmd/aux/vga/clgd542x.c - 664 sys sys 1014925007 6916
-sys/src/cmd/aux/vga/clgd546x.c - 664 sys sys 1014925007 7996
+sys/src/cmd/aux/vga/clgd546x.c - 664 sys sys 1135487946 8001
 sys/src/cmd/aux/vga/ct65540.c - 664 sys sys 1014925007 5355
 sys/src/cmd/aux/vga/cyber938x.c - 664 sys sys 1087406072 6543
 sys/src/cmd/aux/vga/data.c - 664 sys sys 1114453579 2249
@@ -9603,7 +9603,7 @@ sys/src/cmd/aux/vga/error.c - 664 sys sys 1014925008 745
 sys/src/cmd/aux/vga/et4000.c - 664 sys sys 1014925008 6720
 sys/src/cmd/aux/vga/et4000hwgc.c - 664 sys sys 1014925008 552
 sys/src/cmd/aux/vga/hiqvideo.c - 664 sys sys 1048635653 9211
-sys/src/cmd/aux/vga/i81x.c - 664 sys sys 1134390001 12036
+sys/src/cmd/aux/vga/i81x.c - 664 sys sys 1135487946 11780
 sys/src/cmd/aux/vga/ibm8514.c - 664 sys sys 1014925009 2389
 sys/src/cmd/aux/vga/icd2061a.c - 664 sys sys 1014925009 2152
 sys/src/cmd/aux/vga/ics2494.c - 664 sys sys 1014925009 2000
@@ -9613,12 +9613,12 @@ sys/src/cmd/aux/vga/mach32.c - 664 sys sys 1014925009 6004
 sys/src/cmd/aux/vga/mach64.c - 664 sys sys 1014925009 8279
 sys/src/cmd/aux/vga/mach64xx.c - 664 sys sys 1097900455 30266
 sys/src/cmd/aux/vga/main.c - 664 sys sys 1131741978 9725
-sys/src/cmd/aux/vga/mga2164w.c - 664 sys sys 1014925010 13196
-sys/src/cmd/aux/vga/mga4xx.c - 664 sys sys 1014925010 35895
+sys/src/cmd/aux/vga/mga2164w.c - 664 sys sys 1135487945 13173
+sys/src/cmd/aux/vga/mga4xx.c - 664 sys sys 1135487948 35804
 sys/src/cmd/aux/vga/mkfile - 664 sys sys 1115734903 927
 sys/src/cmd/aux/vga/neomagic.c - 664 sys sys 1104430499 8975
 sys/src/cmd/aux/vga/notes.txt - 664 sys sys 1028334647 14376
-sys/src/cmd/aux/vga/nvidia.c - 664 sys sys 1115734903 31499
+sys/src/cmd/aux/vga/nvidia.c - 664 sys sys 1135487946 31487
 sys/src/cmd/aux/vga/palette.c - 664 sys sys 1014925010 2201
 sys/src/cmd/aux/vga/pci.c - 664 sys sys 1014925011 8659
 sys/src/cmd/aux/vga/pci.h - 664 sys sys 1014925011 3290
@@ -9632,7 +9632,7 @@ sys/src/cmd/aux/vga/s3generic.c - 664 sys sys 1048640344 7472
 sys/src/cmd/aux/vga/s3hwgc.c - 664 sys sys 1014925012 1359
 sys/src/cmd/aux/vga/sc15025.c - 664 sys sys 1014925012 1876
 sys/src/cmd/aux/vga/stg1702.c - 664 sys sys 1014925012 3263
-sys/src/cmd/aux/vga/t2r4.c - 664 sys sys 1014925012 8258
+sys/src/cmd/aux/vga/t2r4.c - 664 sys sys 1135487941 8291
 sys/src/cmd/aux/vga/template.c - 664 sys sys 1014925012 633
 sys/src/cmd/aux/vga/trio64.c - 664 sys sys 1014925012 6132
 sys/src/cmd/aux/vga/tvp3020.c - 664 sys sys 1014925012 5817
@@ -9925,7 +9925,7 @@ sys/src/cmd/disk/mkext.c - 664 sys sys 1107957513 5806
 sys/src/cmd/disk/mkfile - 664 sys sys 1022385851 500
 sys/src/cmd/disk/mkfs.c - 664 sys sys 1108000852 14697
 sys/src/cmd/disk/prep - 20000000775 sys sys 988249968 0
-sys/src/cmd/disk/prep/calc.y - 664 sys sys 958519682 2378
+sys/src/cmd/disk/prep/calc.y - 664 sys sys 1135487935 2406
 sys/src/cmd/disk/prep/edit.c - 664 sys sys 1017854327 9714
 sys/src/cmd/disk/prep/edit.h - 664 sys sys 1015009215 994
 sys/src/cmd/disk/prep/fdisk.c - 664 sys sys 1126623191 21983
@@ -9997,8 +9997,8 @@ sys/src/cmd/execnet/mkfile - 664 sys sys 1032059543 208
 sys/src/cmd/execnet/note.c - 664 sys sys 1019855740 2315
 sys/src/cmd/exportfs - 20000000775 sys sys 988249971 0
 sys/src/cmd/exportfs/exportfs.c - 664 sys sys 1115314269 16357
-sys/src/cmd/exportfs/exportfs.h - 664 sys sys 1066823091 2800
-sys/src/cmd/exportfs/exportsrv.c - 664 sys sys 1134316119 11914
+sys/src/cmd/exportfs/exportfs.h - 664 sys sys 1135487971 2809
+sys/src/cmd/exportfs/exportsrv.c - 664 sys sys 1135488028 11946
 sys/src/cmd/exportfs/mkfile - 664 sys sys 1066825703 194
 sys/src/cmd/exportfs/pattern.c - 664 sys sys 1066823092 2960
 sys/src/cmd/ext2srv - 20000000775 sys sys 1055687763 0
@@ -10062,12 +10062,12 @@ sys/src/cmd/fossil/archive.c - 664 sys sys 1087005594 10230
 sys/src/cmd/fossil/build - 664 sys sys 1042005505 449
 sys/src/cmd/fossil/buildsh - 775 sys sys 1042005505 561
 sys/src/cmd/fossil/bwatch.c - 664 sys sys 1042005505 6754
-sys/src/cmd/fossil/cache.c - 664 sys sys 1087005594 42827
+sys/src/cmd/fossil/cache.c - 664 sys sys 1135487938 42824
 sys/src/cmd/fossil/check.c - 664 sys sys 1091904423 17315
 sys/src/cmd/fossil/conf.rc - 775 sys sys 1084333190 1416
-sys/src/cmd/fossil/dat.h - 664 sys sys 1091904423 7580
+sys/src/cmd/fossil/dat.h - 664 sys sys 1135487938 7582
 sys/src/cmd/fossil/deadlock - 775 sys sys 1042005506 413
-sys/src/cmd/fossil/disk.c - 664 sys sys 1087005595 6424
+sys/src/cmd/fossil/disk.c - 664 sys sys 1135487937 6426
 sys/src/cmd/fossil/dump.c - 664 sys sys 1042005506 1340
 sys/src/cmd/fossil/epoch.c - 664 sys sys 1045600021 997
 sys/src/cmd/fossil/error.c - 664 sys sys 1073851927 1450
@@ -10129,10 +10129,10 @@ sys/src/cmd/graph/mkfile - 664 sys sys 944960999 108
 sys/src/cmd/graph/subr.c - 664 sys sys 985051276 321
 sys/src/cmd/graph/whoami.c - 664 sys sys 944960999 62
 sys/src/cmd/grep - 20000000775 sys sys 1018466661 0
-sys/src/cmd/grep/comp.c - 664 sys sys 944961351 4102
+sys/src/cmd/grep/comp.c - 664 sys sys 1135487941 4177
 sys/src/cmd/grep/grep.h - 664 sys sys 1068478083 2176
 sys/src/cmd/grep/grep.y - 664 sys sys 944961351 2804
-sys/src/cmd/grep/main.c - 664 sys sys 1091936379 4676
+sys/src/cmd/grep/main.c - 664 sys sys 1135487941 4677
 sys/src/cmd/grep/mkfile - 664 sys sys 944961351 153
 sys/src/cmd/grep/sub.c - 664 sys sys 984789207 3896
 sys/src/cmd/gs - 20000000775 sys sys 1017695101 0
@@ -11882,14 +11882,14 @@ sys/src/cmd/gs/zlib/zutil.c - 664 sys sys 1015035350 5015
 sys/src/cmd/gs/zlib/zutil.h - 664 sys sys 1015035350 4945
 sys/src/cmd/gview.c - 664 sys sys 1123348216 50812
 sys/src/cmd/gzip - 20000000775 sys sys 984789976 0
-sys/src/cmd/gzip/gunzip.c - 664 sys sys 1014924864 6039
-sys/src/cmd/gzip/gzip.c - 664 sys sys 1014924864 3646
+sys/src/cmd/gzip/gunzip.c - 664 sys sys 1135487934 6048
+sys/src/cmd/gzip/gzip.c - 664 sys sys 1135487934 3655
 sys/src/cmd/gzip/gzip.h - 664 sys sys 954778718 1058
 sys/src/cmd/gzip/mkfile - 664 sys sys 1124884920 124
-sys/src/cmd/gzip/unzip.c - 664 sys sys 1124839686 13816
-sys/src/cmd/gzip/zip.c - 664 sys sys 1033183074 7054
+sys/src/cmd/gzip/unzip.c - 664 sys sys 1135487934 13825
+sys/src/cmd/gzip/zip.c - 664 sys sys 1135487935 7063
 sys/src/cmd/gzip/zip.h - 664 sys sys 954778719 1428
-sys/src/cmd/hget.c - 664 sys sys 1130423854 25846
+sys/src/cmd/hget.c - 664 sys sys 1135487943 25850
 sys/src/cmd/history.c - 664 sys sys 1121977159 6052
 sys/src/cmd/hoc - 20000000775 sys sys 954036932 0
 sys/src/cmd/hoc/code.c - 664 sys sys 1132451870 10050
@@ -11914,8 +11914,8 @@ sys/src/cmd/init.c - 664 sys sys 1121977160 4462
 sys/src/cmd/iostats - 20000000775 sys sys 944962001 0
 sys/src/cmd/iostats/iostats.c - 664 sys sys 1134305453 9616
 sys/src/cmd/iostats/mkfile - 664 sys sys 1014925727 122
-sys/src/cmd/iostats/statfs.h - 664 sys sys 1127431876 2617
-sys/src/cmd/iostats/statsrv.c - 664 sys sys 1127431876 10745
+sys/src/cmd/iostats/statfs.h - 664 sys sys 1135487971 2626
+sys/src/cmd/iostats/statsrv.c - 664 sys sys 1135487954 10770
 sys/src/cmd/ip - 20000000775 sys sys 1015096228 0
 sys/src/cmd/ip/arp.h - 664 sys sys 944961005 751
 sys/src/cmd/ip/dhcp.h - 664 sys sys 1051206271 3368
@@ -11998,7 +11998,7 @@ sys/src/cmd/ip/ppp/dotest - 775 sys sys 944961006 152
 sys/src/cmd/ip/ppp/ipaux.c - 664 sys sys 1125529107 2328
 sys/src/cmd/ip/ppp/mkfile - 664 sys sys 1063897576 352
 sys/src/cmd/ip/ppp/mppc.c - 664 sys sys 1015090267 16624
-sys/src/cmd/ip/ppp/ppp.c - 664 sys sys 1125530039 59897
+sys/src/cmd/ip/ppp/ppp.c - 664 sys sys 1135487952 59911
 sys/src/cmd/ip/ppp/ppp.h - 664 sys sys 1091904423 8284
 sys/src/cmd/ip/ppp/testppp.c - 664 sys sys 1045505281 3011
 sys/src/cmd/ip/ppp/thw.c - 664 sys sys 1015090268 5962
@@ -12007,7 +12007,7 @@ sys/src/cmd/ip/ppp/thwack.h - 664 sys sys 964662210 2052
 sys/src/cmd/ip/ppp/unthwack.c - 664 sys sys 1015090268 5883
 sys/src/cmd/ip/pppoe.c - 664 sys sys 1125530113 12516
 sys/src/cmd/ip/pptp.c - 664 sys sys 1050360938 16575
-sys/src/cmd/ip/pptpd.c - 664 sys sys 1015701128 23548
+sys/src/cmd/ip/pptpd.c - 664 sys sys 1135487970 23548
 sys/src/cmd/ip/rarpd.c - 664 sys sys 1084470989 3389
 sys/src/cmd/ip/rexexec.c - 664 sys sys 1121977160 742
 sys/src/cmd/ip/rip.c - 664 sys sys 1050760698 12424
@@ -12050,9 +12050,9 @@ sys/src/cmd/ip/snoopy/rtp.c - 664 sys sys 1128179540 1166
 sys/src/cmd/ip/snoopy/tcp.c - 664 sys sys 1128179540 3602
 sys/src/cmd/ip/snoopy/ttls.c - 664 sys sys 1128179540 1451
 sys/src/cmd/ip/snoopy/udp.c - 664 sys sys 1128179540 1999
-sys/src/cmd/ip/telnet.c - 664 sys sys 1127523945 8573
+sys/src/cmd/ip/telnet.c - 664 sys sys 1135487946 8624
 sys/src/cmd/ip/telnet.h - 664 sys sys 1015090250 5902
-sys/src/cmd/ip/telnetd.c - 664 sys sys 1127523098 11721
+sys/src/cmd/ip/telnetd.c - 664 sys sys 1135487948 11772
 sys/src/cmd/ip/tftpd.c - 664 sys sys 1106943821 7646
 sys/src/cmd/ip/traceroute.c - 664 sys sys 1032060124 9370
 sys/src/cmd/ip/udpecho.c - 664 sys sys 1050714674 855
@@ -12140,17 +12140,17 @@ sys/src/cmd/kl/pass.c - 664 sys sys 1132451576 9340
 sys/src/cmd/kl/sched.c - 664 sys sys 1089299170 10796
 sys/src/cmd/kl/span.c - 664 sys sys 1045503970 10146
 sys/src/cmd/kprof.c - 664 sys sys 1123244004 2550
-sys/src/cmd/ktrace.c - 664 sys sys 1131293224 5885
+sys/src/cmd/ktrace.c - 664 sys sys 1135487942 7224
 sys/src/cmd/lens.c - 664 sys sys 1130425803 5109
 sys/src/cmd/lex - 20000000775 sys sys 944961017 0
 sys/src/cmd/lex/header.c - 664 sys sys 1032060383 3368
-sys/src/cmd/lex/ldefs.h - 664 sys sys 944961017 4053
-sys/src/cmd/lex/lmain.c - 664 sys sys 1098121111 6046
+sys/src/cmd/lex/ldefs.h - 664 sys sys 1135487942 4101
+sys/src/cmd/lex/lmain.c - 664 sys sys 1135487944 6059
 sys/src/cmd/lex/mkfile - 664 sys sys 1032060382 328
 sys/src/cmd/lex/ncform - 664 sys sys 944961017 4060
-sys/src/cmd/lex/parser.y - 664 sys sys 1063855045 14194
-sys/src/cmd/lex/sub1.c - 664 sys sys 1098121111 9795
-sys/src/cmd/lex/sub2.c - 664 sys sys 944961016 17125
+sys/src/cmd/lex/parser.y - 664 sys sys 1135487944 14215
+sys/src/cmd/lex/sub1.c - 664 sys sys 1135487942 10099
+sys/src/cmd/lex/sub2.c - 664 sys sys 1135487944 17109
 sys/src/cmd/lnfs.c - 664 sys sys 1094156765 13332
 sys/src/cmd/look.c - 664 sys sys 944961619 5994
 sys/src/cmd/lp - 20000000775 sys sys 953344617 0
@@ -12268,7 +12268,7 @@ sys/src/cmd/ndb/dnarea.c - 664 sys sys 1121977162 2128
 sys/src/cmd/ndb/dnnotify.c - 664 sys sys 1055701929 3062
 sys/src/cmd/ndb/dnresolve.c - 664 sys sys 1079747687 15363
 sys/src/cmd/ndb/dns.c - 664 sys sys 1134305452 15248
-sys/src/cmd/ndb/dns.h - 664 sys sys 1127392642 10141
+sys/src/cmd/ndb/dns.h - 664 sys sys 1135487937 10143
 sys/src/cmd/ndb/dnsdebug.c - 664 sys sys 1079747685 8488
 sys/src/cmd/ndb/dnserver.c - 664 sys sys 1021579994 3687
 sys/src/cmd/ndb/dnsquery.c - 664 sys sys 1120564714 2198
@@ -12676,7 +12676,7 @@ sys/src/cmd/qi/symbols.c - 664 sys sys 1121978130 1742
 sys/src/cmd/qi/syscall.c - 664 sys sys 1124229161 14420
 sys/src/cmd/qi/timing - 664 sys sys 1076688570 641
 sys/src/cmd/ql - 20000000775 sys sys 954037972 0
-sys/src/cmd/ql/asm.c - 664 sys sys 1089299167 13059
+sys/src/cmd/ql/asm.c - 664 sys sys 1135487949 13021
 sys/src/cmd/ql/asmout.c - 664 sys sys 1089299167 35642
 sys/src/cmd/ql/cnam.c - 664 sys sys 1089299167 335
 sys/src/cmd/ql/compat.c - 664 sys sys 944961082 445
@@ -12760,7 +12760,7 @@ sys/src/cmd/rio/xfid.c - 664 sys sys 1103205531 17446
 sys/src/cmd/rm.c - 664 sys sys 1014926615 1563
 sys/src/cmd/rx.c - 664 sys sys 1099760378 4382
 sys/src/cmd/sam - 20000000775 sys sys 944961629 0
-sys/src/cmd/sam/acid.lib - 664 sys sys 1127393265 1536
+sys/src/cmd/sam/acid.lib - 664 sys sys 1135487949 1516
 sys/src/cmd/sam/address.c - 664 sys sys 944961628 3985
 sys/src/cmd/sam/buff.c - 664 sys sys 1014926937 5161
 sys/src/cmd/sam/cmd.c - 664 sys sys 1132448975 10774
@@ -12803,7 +12803,7 @@ sys/src/cmd/samterm/syms - 664 sys sys 944961351 17698
 sys/src/cmd/scat - 20000000775 sys sys 964307379 0
 sys/src/cmd/scat/bitinput.c - 664 sys sys 944961465 1358
 sys/src/cmd/scat/desc.c - 664 sys sys 944961465 7022
-sys/src/cmd/scat/display.c - 664 sys sys 1121977163 1475
+sys/src/cmd/scat/display.c - 664 sys sys 1135487935 1479
 sys/src/cmd/scat/dssread.c - 664 sys sys 964307378 2205
 sys/src/cmd/scat/header.c - 664 sys sys 1121977163 5917
 sys/src/cmd/scat/hinv.c - 664 sys sys 964307378 4447
@@ -12903,7 +12903,7 @@ sys/src/cmd/srvold9p/9p1.h - 664 sys sys 1016921010 2413
 sys/src/cmd/srvold9p/9p1lib.c - 664 sys sys 1134305452 11453
 sys/src/cmd/srvold9p/fcall.c - 664 sys sys 1016921010 2571
 sys/src/cmd/srvold9p/mkfile - 664 sys sys 1016921011 132
-sys/src/cmd/srvold9p/srvold9p.c - 664 sys sys 1045505578 19752
+sys/src/cmd/srvold9p/srvold9p.c - 664 sys sys 1135487956 19754
 sys/src/cmd/ssh - 20000000775 sys sys 1016927305 0
 sys/src/cmd/ssh/agent.c - 664 sys sys 1119985570 9054
 sys/src/cmd/ssh/authpasswd.c - 664 sys sys 1119985570 729
@@ -12926,7 +12926,7 @@ sys/src/cmd/ssh/smsg.c - 664 sys sys 1092516575 6374
 sys/src/cmd/ssh/ssh.c - 664 sys sys 1133821217 9671
 sys/src/cmd/ssh/ssh.h - 664 sys sys 1091904420 6086
 sys/src/cmd/ssh/sshnet.c - 664 sys sys 1078840016 17641
-sys/src/cmd/ssh/sshserve.c - 664 sys sys 1062091020 5786
+sys/src/cmd/ssh/sshserve.c - 664 sys sys 1135487956 5772
 sys/src/cmd/ssh/util.c - 664 sys sys 1063858753 4478
 sys/src/cmd/stats.c - 664 sys sys 1127974208 28128
 sys/src/cmd/strings.c - 664 sys sys 944961364 1216
@@ -12935,7 +12935,7 @@ sys/src/cmd/sum.c - 664 sys sys 1014926615 5548
 sys/src/cmd/swap.c - 664 sys sys 1014926662 1141
 sys/src/cmd/syscall - 20000000775 sys sys 944961236 0
 sys/src/cmd/syscall/mkfile - 664 sys sys 1037122264 549
-sys/src/cmd/syscall/syscall.c - 664 sys sys 1091803376 3929
+sys/src/cmd/syscall/syscall.c - 664 sys sys 1135487934 3951
 sys/src/cmd/tail.c - 664 sys sys 1123123922 6034
 sys/src/cmd/tapefs - 20000000775 sys sys 944962012 0
 sys/src/cmd/tapefs/32vfs.c - 664 sys sys 1014926384 3688
@@ -12980,7 +12980,7 @@ sys/src/cmd/tbl/tv.c - 664 sys sys 944961244 3329
 sys/src/cmd/tcs - 20000000775 sys sys 954034511 0
 sys/src/cmd/tcs/big5.c - 664 sys sys 944961288 99606
 sys/src/cmd/tcs/big5.h - 664 sys sys 944961287 112
-sys/src/cmd/tcs/conv.h - 664 sys sys 944961287 834
+sys/src/cmd/tcs/conv.h - 664 sys sys 1135487940 941
 sys/src/cmd/tcs/conv_big5.c - 664 sys sys 944961288 2821
 sys/src/cmd/tcs/conv_gb.c - 664 sys sys 944961287 2210
 sys/src/cmd/tcs/conv_jis.c - 664 sys sys 944961289 10998
@@ -13016,9 +13016,9 @@ sys/src/cmd/tcs/kuten208.c - 664 sys sys 948046995 59960
 sys/src/cmd/tcs/kuten208.h - 664 sys sys 944961287 94
 sys/src/cmd/tcs/kuten212.c - 664 sys sys 944961289 55407
 sys/src/cmd/tcs/kuten212.h - 664 sys sys 944961287 94
-sys/src/cmd/tcs/mkfile - 664 sys sys 1036724422 532
+sys/src/cmd/tcs/mkfile - 664 sys sys 1135487940 542
 sys/src/cmd/tcs/plan9.h - 664 sys sys 944961287 751
-sys/src/cmd/tcs/tcs.c - 664 sys sys 1044661975 51805
+sys/src/cmd/tcs/tcs.c - 664 sys sys 1135487940 54089
 sys/src/cmd/tcs/utf.c - 664 sys sys 1125501123 7962
 sys/src/cmd/tee.c - 664 sys sys 954970286 1062
 sys/src/cmd/telco - 20000000775 sys sys 1015701205 0
@@ -13597,13 +13597,13 @@ sys/src/cmd/vl/sched.c - 664 sys sys 1014936060 11363
 sys/src/cmd/vl/span.c - 664 sys sys 1045503977 12015
 sys/src/cmd/vnc - 20000000775 sys sys 1014926000 0
 sys/src/cmd/vnc/auth.c - 664 sys sys 1044880749 4245
-sys/src/cmd/vnc/chan.c - 664 sys sys 1044880749 2624
+sys/src/cmd/vnc/chan.c - 664 sys sys 1135487937 2623
 sys/src/cmd/vnc/color.c - 664 sys sys 1044880749 3088
-sys/src/cmd/vnc/compat.c - 664 sys sys 1132454890 3122
-sys/src/cmd/vnc/compat.h - 664 sys sys 1047512521 3425
+sys/src/cmd/vnc/compat.c - 664 sys sys 1135487951 3150
+sys/src/cmd/vnc/compat.h - 664 sys sys 1135487937 3459
 sys/src/cmd/vnc/dev.c - 664 sys sys 1044880749 5496
 sys/src/cmd/vnc/devcons.c - 664 sys sys 1132456488 6786
-sys/src/cmd/vnc/devdraw.c - 664 sys sys 1134305451 41974
+sys/src/cmd/vnc/devdraw.c - 664 sys sys 1135487935 41976
 sys/src/cmd/vnc/devmouse.c - 664 sys sys 1091816253 7389
 sys/src/cmd/vnc/draw.c - 664 sys sys 1044880749 6974
 sys/src/cmd/vnc/error.h - 664 sys sys 1044880749 2482
@@ -13631,7 +13631,7 @@ sys/src/cmd/vnc/vncv.h - 664 sys sys 1044880750 643
 sys/src/cmd/vnc/wsys.c - 664 sys sys 1102429521 4052
 sys/src/cmd/vt - 20000000775 sys sys 954038635 0
 sys/src/cmd/vt/cons.h - 664 sys sys 1133808292 1792
-sys/src/cmd/vt/consctl.c - 664 sys sys 1127425716 1796
+sys/src/cmd/vt/consctl.c - 664 sys sys 1135487947 1845
 sys/src/cmd/vt/event.c - 664 sys sys 1133808292 1071
 sys/src/cmd/vt/event.h - 664 sys sys 944961620 192
 sys/src/cmd/vt/hp.c - 664 sys sys 1133808292 3362
@@ -13951,7 +13951,7 @@ sys/src/libauthsrv/opasstokey.c - 664 sys sys 1015091654 448
 sys/src/libauthsrv/passtokey.c - 664 sys sys 1015091654 517
 sys/src/libauthsrv/readnvram.c - 664 sys sys 1117193209 8752
 sys/src/libbin - 20000000775 sys sys 984777332 0
-sys/src/libbin/bin.c - 664 sys sys 1045502972 1811
+sys/src/libbin/bin.c - 664 sys sys 1135487932 1829
 sys/src/libbin/mkfile - 664 sys sys 1035389776 197
 sys/src/libbio - 20000000775 sys sys 1014927637 0
 sys/src/libbio/bbuffered.c - 664 sys sys 950315725 309
@@ -13987,7 +13987,7 @@ sys/src/libc/386/387/sqrt.s - 664 sys sys 944961709 128
 sys/src/libc/386/387/tan.s - 664 sys sys 944961709 91
 sys/src/libc/386/argv0.s - 664 sys sys 1067718932 88
 sys/src/libc/386/cycles.s - 664 sys sys 1067718932 213
-sys/src/libc/386/getcallerpc.c - 664 sys sys 944961709 94
+sys/src/libc/386/getcallerpc.s - 664 sys sys 1135488131 65
 sys/src/libc/386/getfcr.s - 664 sys sys 944961710 282
 sys/src/libc/386/main9.s - 664 sys sys 1067718933 373
 sys/src/libc/386/main9p.s - 664 sys sys 1067718933 698
@@ -14110,7 +14110,7 @@ sys/src/libc/9sys/privalloc.c - 664 sys sys 984709402 606
 sys/src/libc/9sys/pushssl.c - 664 sys sys 1014927338 905
 sys/src/libc/9sys/pushtls.c - 664 sys sys 1067718964 2023
 sys/src/libc/9sys/putenv.c - 664 sys sys 985023079 398
-sys/src/libc/9sys/qlock.c - 664 sys sys 1049426327 5060
+sys/src/libc/9sys/qlock.c - 664 sys sys 1135487955 5102
 sys/src/libc/9sys/read.c - 664 sys sys 1014927339 108
 sys/src/libc/9sys/read9pmsg.c - 664 sys sys 1014927339 462
 sys/src/libc/9sys/readv.c - 664 sys sys 1014927339 645
@@ -14192,22 +14192,22 @@ sys/src/libc/fmt/runesmprint.c - 664 sys sys 1014927316 176
 sys/src/libc/fmt/runesnprint.c - 664 sys sys 1014927316 203
 sys/src/libc/fmt/runesprint.c - 664 sys sys 1014927316 192
 sys/src/libc/fmt/runevseprint.c - 664 sys sys 1014927316 313
-sys/src/libc/fmt/runevsmprint.c - 664 sys sys 1050433061 1043
+sys/src/libc/fmt/runevsmprint.c - 664 sys sys 1135487933 1052
 sys/src/libc/fmt/runevsnprint.c - 664 sys sys 1014927316 330
 sys/src/libc/fmt/seprint.c - 664 sys sys 1014927317 196
 sys/src/libc/fmt/smprint.c - 664 sys sys 1132331535 205
 sys/src/libc/fmt/snprint.c - 664 sys sys 1014927317 195
 sys/src/libc/fmt/sprint.c - 664 sys sys 1015088665 236
-sys/src/libc/fmt/vfprint.c - 664 sys sys 1014927317 518
+sys/src/libc/fmt/vfprint.c - 664 sys sys 1135487933 527
 sys/src/libc/fmt/vseprint.c - 664 sys sys 1014927317 309
-sys/src/libc/fmt/vsmprint.c - 664 sys sys 1048801042 997
+sys/src/libc/fmt/vsmprint.c - 664 sys sys 1135487933 1006
 sys/src/libc/fmt/vsnprint.c - 664 sys sys 1014927318 326
 sys/src/libc/mips - 20000000775 sys sys 984709299 0
 sys/src/libc/mips/argv0.s - 664 sys sys 1067719028 88
 sys/src/libc/mips/cycles.c - 664 sys sys 1067719028 71
 sys/src/libc/mips/getcallerpc.s - 664 sys sys 944961714 47
 sys/src/libc/mips/getfcr.s - 664 sys sys 944961714 167
-sys/src/libc/mips/lock.c - 664 sys sys 952888257 2313
+sys/src/libc/mips/lock.c - 664 sys sys 1135487947 2305
 sys/src/libc/mips/main9.s - 664 sys sys 1067719029 426
 sys/src/libc/mips/main9p.s - 664 sys sys 1067719029 619
 sys/src/libc/mips/memccpy.s - 664 sys sys 944961714 282
@@ -14252,7 +14252,7 @@ sys/src/libc/port/floor.c - 664 sys sys 1014927397 305
 sys/src/libc/port/fmod.c - 664 sys sys 1014927397 439
 sys/src/libc/port/frand.c - 664 sys sys 1035832916 210
 sys/src/libc/port/frexp.c - 664 sys sys 1014927397 1830
-sys/src/libc/port/getcallerpc.c - 664 sys sys 1014927397 74
+sys/src/libc/port/getcallerpc.c - 664 sys sys 1135487937 76
 sys/src/libc/port/getfields.c - 664 sys sys 1039201446 516
 sys/src/libc/port/getuser.c - 664 sys sys 1014927397 282
 sys/src/libc/port/hangup.c - 664 sys sys 1014927397 189
@@ -14262,7 +14262,7 @@ sys/src/libc/port/lock.c - 664 sys sys 1014927398 493
 sys/src/libc/port/log.c - 664 sys sys 1014927398 1026
 sys/src/libc/port/lrand.c - 664 sys sys 1035832917 1109
 sys/src/libc/port/malloc.acid - 664 sys sys 1014927398 6227
-sys/src/libc/port/malloc.c - 664 sys sys 1117193316 5713
+sys/src/libc/port/malloc.c - 664 sys sys 1135487948 5715
 sys/src/libc/port/memccpy.c - 664 sys sys 1014927398 216
 sys/src/libc/port/memchr.c - 664 sys sys 1014927398 182
 sys/src/libc/port/memcmp.c - 664 sys sys 1014927398 259
@@ -14432,7 +14432,7 @@ sys/src/libdraw/event.c - 664 sys sys 1097973929 8983
 sys/src/libdraw/fmt.c - 664 sys sys 1070344369 270
 sys/src/libdraw/font.c - 664 sys sys 1115916587 7623
 sys/src/libdraw/freesubfont.c - 664 sys sys 984709664 259
-sys/src/libdraw/getdefont.c - 664 sys sys 944961724 1082
+sys/src/libdraw/getdefont.c - 664 sys sys 1135547941 1108
 sys/src/libdraw/getrect.c - 664 sys sys 1014927875 3046
 sys/src/libdraw/getsubfont.c - 664 sys sys 1131637696 807
 sys/src/libdraw/icossin.c - 664 sys sys 944961724 2117
@@ -14907,7 +14907,7 @@ sys/src/libthread/386.c - 664 sys sys 1014928156 448
 sys/src/libthread/alpha.c - 664 sys sys 1014928156 664
 sys/src/libthread/amd64.c - 664 sys sys 1127405453 579
 sys/src/libthread/arm.c - 664 sys sys 1014928156 582
-sys/src/libthread/channel.c - 664 sys sys 1045502115 8519
+sys/src/libthread/channel.c - 664 sys sys 1135487955 8519
 sys/src/libthread/chanprint.c - 664 sys sys 1014928156 328
 sys/src/libthread/create.c - 664 sys sys 1014928156 2829
 sys/src/libthread/debug.c - 664 sys sys 1014928157 832
@@ -14926,16 +14926,16 @@ sys/src/libthread/iosleep.c - 664 sys sys 1044429929 240
 sys/src/libthread/iowrite.c - 664 sys sys 1030537963 342
 sys/src/libthread/kill.c - 664 sys sys 1014928157 1336
 sys/src/libthread/lib.c - 664 sys sys 1014928158 709
-sys/src/libthread/main.c - 664 sys sys 1017679321 3079
+sys/src/libthread/main.c - 664 sys sys 1135487954 3150
 sys/src/libthread/mips.c - 664 sys sys 1014928158 583
 sys/src/libthread/mkfile - 664 sys sys 1127405452 1012
 sys/src/libthread/note.c - 664 sys sys 1055700452 2265
 sys/src/libthread/power.c - 664 sys sys 1014928159 585
 sys/src/libthread/ref.c - 664 sys sys 1014928159 168
-sys/src/libthread/rendez.c - 664 sys sys 1014928159 1895
-sys/src/libthread/sched.c - 664 sys sys 1032633301 3099
+sys/src/libthread/rendez.c - 664 sys sys 1135487954 1909
+sys/src/libthread/sched.c - 664 sys sys 1135487951 3094
 sys/src/libthread/test.c - 664 sys sys 1014928159 228
-sys/src/libthread/threadimpl.h - 664 sys sys 1055700447 4689
+sys/src/libthread/threadimpl.h - 664 sys sys 1135487955 4689
 sys/src/libthread/tprimes.c - 664 sys sys 1014928160 798
 sys/src/libthread/xinc386.s - 664 sys sys 1014928160 417
 sys/src/libthread/xincalpha.s - 664 sys sys 1015088758 344
@@ -14954,9 +14954,9 @@ sys/src/libventi/pack.c - 664 sys sys 1045502094 2851
 sys/src/libventi/packet.c - 664 sys sys 1019678692 13253
 sys/src/libventi/packet.h - 664 sys sys 1019678692 641
 sys/src/libventi/parsescore.c - 664 sys sys 1045502095 516
-sys/src/libventi/plan9-io.c - 664 sys sys 1045502095 1754
+sys/src/libventi/plan9-io.c - 664 sys sys 1135487933 1758
 sys/src/libventi/plan9-sha1.c - 664 sys sys 1045502095 1058
-sys/src/libventi/plan9-thread.c - 664 sys sys 1045502074 6699
+sys/src/libventi/plan9-thread.c - 664 sys sys 1135487955 6713
 sys/src/libventi/readfully.c - 664 sys sys 1045502095 237
 sys/src/libventi/rpc.c - 664 sys sys 1063853748 7319
 sys/src/libventi/scorefmt.c - 664 sys sys 1045502096 255
@@ -14987,3 +14987,292 @@ usr/glenda/lib/profile - 664 glenda glenda 1105128663 890
 usr/glenda/readme.acme - 664 glenda glenda 1019860628 4753
 usr/glenda/readme.rio - 664 glenda glenda 1019860628 6370
 usr/glenda/tmp - 20000000775 glenda glenda 1018802620 0
+386/bin/8a - 775 sys sys 1135570766 116009
+386/bin/8c - 775 sys sys 1135570766 362140
+386/bin/9660srv - 775 sys sys 1135570766 104023
+386/bin/aan - 775 sys sys 1135570767 130761
+386/bin/acid - 775 sys sys 1135570768 400931
+386/bin/acme - 775 sys sys 1135570768 429211
+386/bin/ar - 775 sys sys 1135570769 111942
+386/bin/archfs - 775 sys sys 1135570769 146849
+386/bin/ascii - 775 sys sys 1135570770 64641
+386/bin/awd - 775 sys sys 1135570793 58734
+386/bin/bc - 775 sys sys 1135570793 81760
+386/bin/bind - 775 sys sys 1135570793 59562
+386/bin/bitsy/bitsyload - 775 sys sys 1135570793 63359
+386/bin/bitsy/keyboard - 775 sys sys 1135570794 306153
+386/bin/bitsy/params - 775 sys sys 1135570794 58772
+386/bin/bitsy/pencal - 775 sys sys 1135570794 117257
+386/bin/bitsy/prompter - 775 sys sys 1135570795 286441
+386/bin/bunzip2 - 775 sys sys 1135570796 97484
+386/bin/bzip2 - 775 sys sys 1135570796 114019
+386/bin/cal - 775 sys sys 1135570796 67869
+386/bin/calendar - 775 sys sys 1135570797 80216
+386/bin/cdfs - 775 sys sys 1135570797 167135
+386/bin/cfs - 775 sys sys 1135570797 128025
+386/bin/chgrp - 775 sys sys 1135570798 59279
+386/bin/chmod - 775 sys sys 1135570798 62275
+386/bin/cleanname - 775 sys sys 1135570798 58298
+386/bin/clock - 775 sys sys 1135570798 158281
+386/bin/colors - 775 sys sys 1135570799 150575
+386/bin/comm - 775 sys sys 1135570799 61343
+386/bin/con - 775 sys sys 1135570799 78243
+386/bin/cp - 775 sys sys 1135570799 63211
+386/bin/cpp - 775 sys sys 1135570800 149839
+386/bin/cpu - 775 sys sys 1135570800 139202
+386/bin/crop - 775 sys sys 1135570800 116024
+386/bin/db - 775 sys sys 1135570801 345779
+386/bin/dc - 775 sys sys 1135570801 99015
+386/bin/deroff - 775 sys sys 1135570802 74231
+386/bin/dict - 775 sys sys 1135570802 187462
+386/bin/diff - 775 sys sys 1135570803 85082
+386/bin/dossrv - 775 sys sys 1135570806 137741
+386/bin/du - 775 sys sys 1135570806 73708
+386/bin/echo - 775 sys sys 1135570806 57349
+386/bin/ed - 775 sys sys 1135570807 93021
+386/bin/exportfs - 775 sys sys 1135570807 162237
+386/bin/faces - 775 sys sys 1135570808 193982
+386/bin/factor - 775 sys sys 1135570809 61456
+386/bin/getmap - 775 sys sys 1135570813 65176
+386/bin/gunzip - 775 sys sys 1135570814 80271
+386/bin/gzip - 775 sys sys 1135570815 84749
+386/bin/hget - 775 sys sys 1135570816 233374
+386/bin/history - 775 sys sys 1135570816 75351
+386/bin/htmlfmt - 775 sys sys 1135570817 160781
+386/bin/iconv - 775 sys sys 1135570818 113279
+386/bin/idiff - 775 sys sys 1135570818 76099
+386/bin/lnfs - 775 sys sys 1135570831 99434
+386/bin/nntpfs - 775 sys sys 1135570839 166509
+386/bin/png - 775 sys sys 1135570841 164238
+386/bin/resample - 775 sys sys 1135570843 120754
+386/bin/sha1sum - 775 sys sys 1135570844 61123
+386/bin/topng - 775 sys sys 1135570850 138333
+386/bin/unzip - 775 sys sys 1135570853 89956
+386/bin/webcookies - 775 sys sys 1135570853 167402
+386/bin/zip - 775 sys sys 1135570854 89977
+386/bin/file - 775 sys sys 1135570809 120978
+386/bin/fmt - 775 sys sys 1135570809 65332
+386/bin/fortune - 775 sys sys 1135570810 67113
+386/bin/freq - 775 sys sys 1135570812 61785
+386/bin/ftpfs - 775 sys sys 1135570813 272811
+386/bin/gif - 775 sys sys 1135570813 158129
+386/bin/graph - 775 sys sys 1135570814 127323
+386/bin/grep - 775 sys sys 1135570814 79062
+386/bin/hayes - 775 sys sys 1135570815 64550
+386/bin/hoc - 775 sys sys 1135570817 99860
+386/bin/html2ms - 775 sys sys 1135570817 66078
+386/bin/import - 775 sys sys 1135570818 101419
+386/bin/iostats - 775 sys sys 1135570819 98375
+386/bin/join - 775 sys sys 1135570829 114087
+386/bin/jpg - 775 sys sys 1135570829 174592
+386/bin/kprof - 775 sys sys 1135570830 105465
+386/bin/ktrace - 775 sys sys 1135570830 123137
+386/bin/lens - 775 sys sys 1135570830 150725
+386/bin/lex - 775 sys sys 1135570831 98935
+386/bin/look - 775 sys sys 1135570831 65531
+386/bin/ls - 775 sys sys 1135570831 82459
+386/bin/mc - 775 sys sys 1135570831 133915
+386/bin/md5sum - 775 sys sys 1135570832 61255
+386/bin/mk - 775 sys sys 1135570832 144652
+386/bin/mkdir - 775 sys sys 1135570832 60958
+386/bin/mount - 775 sys sys 1135570833 73001
+386/bin/ms2html - 775 sys sys 1135570833 103959
+386/bin/mv - 775 sys sys 1135570833 65483
+386/bin/netkey - 775 sys sys 1135570837 72347
+386/bin/netstat - 775 sys sys 1135570838 84660
+386/bin/news - 775 sys sys 1135570838 71700
+386/bin/nm - 775 sys sys 1135570839 125741
+386/bin/ns - 775 sys sys 1135570839 65247
+386/bin/p - 775 sys sys 1135570839 64977
+386/bin/page - 775 sys sys 1135570840 233354
+386/bin/passwd - 775 sys sys 1135570840 83739
+386/bin/pcc - 775 sys sys 1135570841 67910
+386/bin/ppm - 775 sys sys 1135570841 149413
+386/bin/pr - 775 sys sys 1135570842 77459
+386/bin/prof - 775 sys sys 1135570842 110928
+386/bin/ps - 775 sys sys 1135570842 67981
+386/bin/ramfs - 775 sys sys 1135570842 89784
+386/bin/rdbfs - 775 sys sys 1135570843 174476
+386/bin/read - 775 sys sys 1135570843 58040
+386/bin/rm - 775 sys sys 1135570843 61327
+386/bin/rx - 775 sys sys 1135570843 82051
+386/bin/sed - 775 sys sys 1135570844 89510
+386/bin/size - 775 sys sys 1135570844 78748
+386/bin/snoopy - 775 sys sys 1135570845 168197
+386/bin/sort - 775 sys sys 1135570845 82270
+386/bin/split - 775 sys sys 1135570845 75631
+386/bin/srv - 775 sys sys 1135570845 82437
+386/bin/stats - 775 sys sys 1135570846 190636
+386/bin/strings - 775 sys sys 1135570846 62107
+386/bin/strip - 775 sys sys 1135570846 80730
+386/bin/swap - 775 sys sys 1135570847 62130
+386/bin/winwatch - 775 sys sys 1135570853 154876
+386/bin/ape/cc - 775 sys sys 1135570769 70399
+386/bin/ape/tar - 775 sys sys 1135570769 61941
+386/bin/auth/aescbc - 775 sys sys 1135570770 140764
+386/bin/auth/asn12rsa - 775 sys sys 1135570770 120433
+386/bin/auth/authsrv - 775 sys sys 1135570771 165460
+386/bin/auth/changeuser - 775 sys sys 1135570771 97011
+386/bin/auth/convkeys - 775 sys sys 1135570771 87436
+386/bin/auth/convkeys2 - 775 sys sys 1135570771 87487
+386/bin/auth/cron - 775 sys sys 1135570772 143956
+386/bin/auth/debug - 775 sys sys 1135570772 101051
+386/bin/auth/factotum - 775 sys sys 1135570773 318316
+386/bin/auth/fgui - 775 sys sys 1135570773 218329
+386/bin/auth/guard.srv - 775 sys sys 1135570774 142833
+386/bin/auth/keyfs - 775 sys sys 1135570774 115579
+386/bin/auth/login - 775 sys sys 1135570774 104481
+386/bin/auth/newns - 775 sys sys 1135570774 89719
+386/bin/auth/none - 775 sys sys 1135570775 89007
+386/bin/auth/pemdecode - 775 sys sys 1135570775 61451
+386/bin/auth/pemencode - 775 sys sys 1135570775 59847
+386/bin/auth/rsa2csr - 775 sys sys 1135570775 180508
+386/bin/auth/rsa2pub - 775 sys sys 1135570776 143540
+386/bin/auth/rsa2ssh - 775 sys sys 1135570776 138857
+386/bin/auth/rsa2x509 - 775 sys sys 1135570777 184269
+386/bin/auth/rsafill - 775 sys sys 1135570777 143608
+386/bin/auth/rsagen - 775 sys sys 1135570778 153242
+386/bin/auth/secstore - 775 sys sys 1135570778 195447
+386/bin/auth/secstored - 775 sys sys 1135570779 197002
+386/bin/auth/secuser - 775 sys sys 1135570779 152936
+386/bin/auth/uniq - 775 sys sys 1135570779 63055
+386/bin/auth/warning - 775 sys sys 1135570779 100633
+386/bin/auth/wrkey - 775 sys sys 1135570779 75197
+386/bin/aux/9pcon - 775 sys sys 1135570780 94910
+386/bin/aux/LOCK - 775 sys sys 1135570780 59902
+386/bin/aux/acidleak - 775 sys sys 1135570780 69430
+386/bin/aux/apm - 775 sys sys 1135570781 180009
+386/bin/aux/astarld - 775 sys sys 1135570781 64675
+386/bin/aux/cddb - 775 sys sys 1135570781 72214
+386/bin/aux/clog - 775 sys sys 1135570782 66431
+386/bin/aux/consolefs - 775 sys sys 1135570782 153921
+386/bin/aux/data2s - 775 sys sys 1135570782 60518
+386/bin/aux/depend - 775 sys sys 1135570782 145569
+386/bin/aux/disksim - 775 sys sys 1135570783 150431
+386/bin/aux/faxreceive - 775 sys sys 1135570783 83923
+386/bin/aux/faxsend - 775 sys sys 1135570783 89435
+386/bin/aux/flashfs - 775 sys sys 1135570784 166349
+386/bin/aux/gpsevermore - 775 sys sys 1135570784 71477
+386/bin/aux/gpsfs - 775 sys sys 1135570784 182265
+386/bin/aux/lines - 775 sys sys 1135570784 60473
+386/bin/aux/listen - 775 sys sys 1135570785 108006
+386/bin/aux/listen1 - 775 sys sys 1135570785 94483
+386/bin/aux/mapd - 775 sys sys 1135570785 190784
+386/bin/aux/mkflashfs - 775 sys sys 1135570785 67345
+386/bin/aux/mklatinkbd - 775 sys sys 1135570786 64164
+386/bin/aux/mnihongo - 775 sys sys 1135570786 139629
+386/bin/aux/ms2 - 775 sys sys 1135570786 87426
+386/bin/aux/msexceltables - 775 sys sys 1135570786 81218
+386/bin/aux/mswordstrings - 775 sys sys 1135570787 65298
+386/bin/aux/na - 775 sys sys 1135570787 154182
+386/bin/aux/nfsmount - 775 sys sys 1135570787 234147
+386/bin/aux/nfsserver - 775 sys sys 1135570788 185407
+386/bin/aux/olefs - 775 sys sys 1135570788 149329
+386/bin/aux/pcnfsd - 775 sys sys 1135570789 129333
+386/bin/aux/portmap - 775 sys sys 1135570789 143667
+386/bin/aux/portmapper - 775 sys sys 1135570789 128221
+386/bin/aux/reboot - 775 sys sys 1135570790 60568
+386/bin/aux/searchfs - 775 sys sys 1135570790 89552
+386/bin/aux/statusbar - 775 sys sys 1135570790 151780
+386/bin/aux/stub - 775 sys sys 1135570791 140900
+386/bin/aux/timesync - 775 sys sys 1135570791 128368
+386/bin/aux/trampoline - 775 sys sys 1135570791 83641
+386/bin/aux/typepasswd - 775 sys sys 1135570791 69495
+386/bin/aux/vga - 775 sys sys 1135570792 333791
+386/bin/bmp - 775 sys sys 1135570796 157659
+386/bin/cb - 775 sys sys 1135570797 77379
+386/bin/dial/at - 775 sys sys 1135570802 60837
+386/bin/dial/expect - 775 sys sys 1135570802 60075
+386/bin/disk/dump9660 - 775 sys sys 1135570803 152285
+386/bin/disk/exsort - 775 sys sys 1135570803 60212
+386/bin/disk/fdisk - 775 sys sys 1135570804 103852
+386/bin/disk/format - 775 sys sys 1135570804 89520
+386/bin/disk/kfs - 775 sys sys 1135570804 249003
+386/bin/disk/mbr - 775 sys sys 1135570805 73675
+386/bin/disk/mkext - 775 sys sys 1135570805 82639
+386/bin/disk/mkfs - 775 sys sys 1135570805 87728
+386/bin/disk/prep - 775 sys sys 1135570806 95873
+386/bin/execnet - 775 sys sys 1135570807 177748
+386/bin/ext2srv - 775 sys sys 1135570808 179710
+386/bin/fcp - 775 sys sys 1135570809 82182
+386/bin/fossil/flchk - 775 sys sys 1135570810 237600
+386/bin/fossil/flfmt - 775 sys sys 1135570811 245747
+386/bin/fossil/fossil - 775 sys sys 1135570812 360522
+386/bin/fossil/last - 775 sys sys 1135570812 63280
+386/bin/gview - 775 sys sys 1135570815 238523
+386/bin/ico - 775 sys sys 1135570818 161740
+386/bin/ip/dhcpclient - 775 sys sys 1135570819 94132
+386/bin/ip/dhcpd - 775 sys sys 1135570819 149217
+386/bin/ip/dhcpleases - 775 sys sys 1135570820 86209
+386/bin/ip/ftpd - 775 sys sys 1135570820 170401
+386/bin/ip/gping - 775 sys sys 1135570820 183130
+386/bin/ip/httpd/httpd - 775 sys sys 1135570821 292534
+386/bin/ip/httpd/imagemap - 775 sys sys 1135570822 114780
+386/bin/ip/httpd/man2html - 775 sys sys 1135570822 123081
+386/bin/ip/httpd/netlib_find - 775 sys sys 1135570822 115637
+386/bin/ip/httpd/netlib_history - 775 sys sys 1135570822 114435
+386/bin/ip/httpd/save - 775 sys sys 1135570823 131200
+386/bin/ip/httpd/webls - 775 sys sys 1135570823 131299
+386/bin/ip/httpd/wikipost - 775 sys sys 1135570824 112661
+386/bin/ip/httpfile - 775 sys sys 1135570824 283624
+386/bin/ip/imap4d - 775 sys sys 1135570825 237651
+386/bin/ip/ipconfig - 775 sys sys 1135570825 137844
+386/bin/ip/ping - 775 sys sys 1135570826 76416
+386/bin/ip/ppp - 775 sys sys 1135570826 219950
+386/bin/ip/pppoe - 775 sys sys 1135570826 77544
+386/bin/ip/pptp - 775 sys sys 1135570826 126715
+386/bin/ip/pptpd - 775 sys sys 1135570827 125862
+386/bin/ip/rarpd - 775 sys sys 1135570827 111558
+386/bin/ip/rexexec - 775 sys sys 1135570827 89967
+386/bin/ip/rip - 775 sys sys 1135570827 91219
+386/bin/ip/rlogind - 775 sys sys 1135570828 67396
+386/bin/ip/telnetd - 775 sys sys 1135570828 123062
+386/bin/ip/tftpd - 775 sys sys 1135570828 130563
+386/bin/ip/traceroute - 775 sys sys 1135570828 73483
+386/bin/kbmap - 775 sys sys 1135570829 143626
+386/bin/mkpaqfs - 775 sys sys 1135570832 94494
+386/bin/mntgen - 775 sys sys 1135570833 145268
+386/bin/mtime - 775 sys sys 1135570833 59133
+386/bin/ndb/cs - 775 sys sys 1135570834 149329
+386/bin/ndb/csquery - 775 sys sys 1135570834 61459
+386/bin/ndb/dns - 775 sys sys 1135570834 245078
+386/bin/ndb/dnsdebug - 775 sys sys 1135570835 219747
+386/bin/ndb/dnsquery - 775 sys sys 1135570835 63624
+386/bin/ndb/dnstcp - 775 sys sys 1135570836 218388
+386/bin/ndb/ipquery - 775 sys sys 1135570836 95469
+386/bin/ndb/mkdb - 775 sys sys 1135570836 63969
+386/bin/ndb/mkhash - 775 sys sys 1135570837 83902
+386/bin/ndb/mkhosts - 775 sys sys 1135570837 84944
+386/bin/ndb/query - 775 sys sys 1135570837 83035
+386/bin/nfs - 775 sys sys 1135570838 321082
+386/bin/paqfs - 775 sys sys 1135570840 107535
+386/bin/tail - 775 sys sys 1135570847 66163
+386/bin/tar - 775 sys sys 1135570847 93423
+386/bin/telnet - 775 sys sys 1135570847 80400
+386/bin/test - 775 sys sys 1135570847 69841
+386/bin/time - 775 sys sys 1135570848 61372
+386/bin/tlsclient - 775 sys sys 1135570848 198462
+386/bin/tlssrv - 775 sys sys 1135570849 198724
+386/bin/togif - 775 sys sys 1135570849 189850
+386/bin/toico - 775 sys sys 1135570849 123639
+386/bin/toppm - 775 sys sys 1135570850 165236
+386/bin/touch - 775 sys sys 1135570850 63751
+386/bin/tprof - 775 sys sys 1135570851 297542
+386/bin/tr - 775 sys sys 1135570851 61845
+386/bin/trace - 775 sys sys 1135570851 181182
+386/bin/tweak - 775 sys sys 1135570852 192855
+386/bin/unicode - 775 sys sys 1135570852 62504
+386/bin/uniq - 775 sys sys 1135570852 61885
+386/bin/units - 775 sys sys 1135570852 75235
+386/bin/unlnfs - 775 sys sys 1135570852 71349
+386/bin/xd - 775 sys sys 1135570853 64036
+386/bin/yacc - 775 sys sys 1135570854 102278
+386/bin/yuv - 775 sys sys 1135570854 149950
+386/init - 775 sys sys 1135570855 101176
+386/lib/ape/libdraw.a - 664 sys sys 1135570857 574562
+386/lib/libdraw.a - 664 sys sys 1135570858 374160
+acme/bin/386/Mail - 775 sys sys 1135570855 179492
+acme/bin/386/News - 775 sys sys 1135570855 128861
+acme/bin/386/Wiki - 775 sys sys 1135570856 127437
+acme/bin/386/spout - 775 sys sys 1135570856 61598
+acme/bin/386/win - 775 sys sys 1135570856 184737

dist/replica/plan9.log

@@ -23680,3 +23680,379 @@
 1135449063 5 c 386/bin/togif - 775 sys sys 1135447282 189886
 1135449063 6 c 386/bin/toppm - 775 sys sys 1135447283 165270
 1135449063 7 c 386/lib/libmemdraw.a - 664 sys sys 1135447284 284166
+1135488669 0 c amd64/include/u.h - 664 sys sys 1135487949 1698
+1135488669 1 c sys/doc/fossil.ps - 664 sys sys 1135487951 313552
+1135488669 2 c sys/include/libc.h - 664 sys sys 1135487938 19627
+1135488669 3 c sys/man/2/rendezvous - 664 sys sys 1135487949 1322
+1135488669 4 c sys/man/2/segattach - 664 sys sys 1135487945 4166
+1135488669 5 c sys/man/2/segbrk - 664 sys sys 1135487945 1195
+1135488669 6 c sys/src/9/pc/trap.c - 664 sys sys 1135487942 21257
+1135488669 7 c sys/src/9/pc/vgai81x.c - 664 sys sys 1135487942 4421
+1135488669 8 c sys/src/9/port/portdat.h - 664 sys sys 1135487943 22547
+1135488669 9 a sys/src/ape/lib/9/386/getcallerpc.s - 664 sys sys 1135488131 65
+1135488669 10 c sys/src/boot/arm/fns.h - 664 sys sys 1135487939 197
+1135488669 11 c sys/src/boot/arm/lib.h - 664 sys sys 1135487939 3382
+1135488669 12 c sys/src/boot/pc/lib.h - 664 sys sys 1135487939 2796
+1135488669 13 c sys/src/boot/pc/load.c - 664 sys sys 1135487939 8923
+1135488669 14 c sys/src/cmd/acme/exec.c - 664 sys sys 1135487943 28257
+1135488669 15 c sys/src/cmd/auth/factotum/util.c - 664 sys sys 1135487936 18042
+1135488669 16 c sys/src/cmd/aux/flashfs/utils.c - 664 sys sys 1135487936 1094
+1135488669 17 c sys/src/cmd/aux/vga/clgd546x.c - 664 sys sys 1135487946 8001
+1135488669 18 c sys/src/cmd/aux/vga/i81x.c - 664 sys sys 1135487946 11780
+1135488669 19 c sys/src/cmd/aux/vga/mga2164w.c - 664 sys sys 1135487945 13173
+1135488669 20 c sys/src/cmd/aux/vga/mga4xx.c - 664 sys sys 1135487948 35804
+1135488669 21 c sys/src/cmd/aux/vga/nvidia.c - 664 sys sys 1135487946 31487
+1135488669 22 c sys/src/cmd/aux/vga/t2r4.c - 664 sys sys 1135487941 8291
+1135488669 23 c sys/src/cmd/disk/prep/calc.y - 664 sys sys 1135487935 2406
+1135488669 24 c sys/src/cmd/exportfs/exportfs.h - 664 sys sys 1135487971 2809
+1135488669 25 c sys/src/cmd/exportfs/exportsrv.c - 664 sys sys 1135488028 11946
+1135488669 26 c sys/src/cmd/gzip/gunzip.c - 664 sys sys 1135487934 6048
+1135488669 27 c sys/src/cmd/gzip/gzip.c - 664 sys sys 1135487934 3655
+1135488669 28 c sys/src/cmd/gzip/unzip.c - 664 sys sys 1135487934 13825
+1135488669 29 c sys/src/cmd/gzip/zip.c - 664 sys sys 1135487935 7063
+1135488669 30 c sys/src/cmd/hget.c - 664 sys sys 1135487943 25850
+1135488669 31 c sys/src/cmd/iostats/statfs.h - 664 sys sys 1135487971 2626
+1135488669 32 c sys/src/cmd/iostats/statsrv.c - 664 sys sys 1135487954 10770
+1135488669 33 c sys/src/cmd/ip/ppp/ppp.c - 664 sys sys 1135487952 59911
+1135488669 34 c sys/src/cmd/ip/pptpd.c - 664 sys sys 1135487970 23548
+1135488669 35 c sys/src/cmd/ip/telnet.c - 664 sys sys 1135487946 8624
+1135488669 36 c sys/src/cmd/ip/telnetd.c - 664 sys sys 1135487948 11772
+1135488669 37 c sys/src/cmd/ktrace.c - 664 sys sys 1135487942 7224
+1135488669 38 c sys/src/cmd/lex/ldefs.h - 664 sys sys 1135487942 4101
+1135488669 39 c sys/src/cmd/lex/lmain.c - 664 sys sys 1135487944 6059
+1135488669 40 c sys/src/cmd/lex/parser.y - 664 sys sys 1135487944 14215
+1135488669 41 c sys/src/cmd/lex/sub1.c - 664 sys sys 1135487942 10099
+1135488669 42 c sys/src/cmd/lex/sub2.c - 664 sys sys 1135487944 17109
+1135488669 43 c sys/src/cmd/ndb/dns.h - 664 sys sys 1135487937 10143
+1135488669 44 c sys/src/cmd/vnc/chan.c - 664 sys sys 1135487937 2623
+1135488669 45 c sys/src/cmd/vnc/compat.c - 664 sys sys 1135487951 3150
+1135488669 46 c sys/src/cmd/vnc/compat.h - 664 sys sys 1135487937 3459
+1135488669 47 c sys/src/cmd/vnc/devdraw.c - 664 sys sys 1135487935 41976
+1135488669 48 c sys/src/cmd/grep/comp.c - 664 sys sys 1135487941 4177
+1135488669 49 c sys/src/cmd/grep/main.c - 664 sys sys 1135487941 4677
+1135488669 50 c sys/src/cmd/ql/asm.c - 664 sys sys 1135487949 13021
+1135488669 51 c sys/src/cmd/srvold9p/srvold9p.c - 664 sys sys 1135487956 19754
+1135488669 52 c sys/src/cmd/ssh/sshserve.c - 664 sys sys 1135487956 5772
+1135488669 53 c sys/src/cmd/syscall/syscall.c - 664 sys sys 1135487934 3951
+1135488669 54 c sys/src/cmd/tcs/conv.h - 664 sys sys 1135487940 941
+1135488669 55 c sys/src/cmd/tcs/mkfile - 664 sys sys 1135487940 542
+1135488669 56 c sys/src/cmd/tcs/tcs.c - 664 sys sys 1135487940 54089
+1135488669 57 c sys/src/cmd/fossil/cache.c - 664 sys sys 1135487938 42824
+1135488669 58 c sys/src/cmd/fossil/dat.h - 664 sys sys 1135487938 7582
+1135488669 59 c sys/src/cmd/fossil/disk.c - 664 sys sys 1135487937 6426
+1135488669 60 c sys/src/cmd/sam/acid.lib - 664 sys sys 1135487949 1516
+1135488669 61 c sys/src/cmd/scat/display.c - 664 sys sys 1135487935 1479
+1135488669 62 c sys/src/cmd/vt/consctl.c - 664 sys sys 1135487947 1845
+1135488669 63 c sys/src/libbin/bin.c - 664 sys sys 1135487932 1829
+1135488669 64 a sys/src/libc/386/getcallerpc.s - 664 sys sys 1135488131 65
+1135488669 65 c sys/src/libc/9sys/qlock.c - 664 sys sys 1135487955 5102
+1135488669 66 c sys/src/libc/fmt/runevsmprint.c - 664 sys sys 1135487933 1052
+1135488669 67 c sys/src/libc/fmt/vfprint.c - 664 sys sys 1135487933 527
+1135488669 68 c sys/src/libc/fmt/vsmprint.c - 664 sys sys 1135487933 1006
+1135488669 69 c sys/src/libc/mips/lock.c - 664 sys sys 1135487947 2305
+1135488669 70 c sys/src/libc/port/getcallerpc.c - 664 sys sys 1135487937 76
+1135488669 71 c sys/src/libc/port/malloc.c - 664 sys sys 1135487948 5715
+1135488669 72 c sys/src/libdraw/getdefont.c - 664 sys sys 1135487933 1084
+1135488669 73 c sys/src/libthread/channel.c - 664 sys sys 1135487955 8519
+1135488669 74 c sys/src/libthread/main.c - 664 sys sys 1135487954 3150
+1135488669 75 c sys/src/libthread/rendez.c - 664 sys sys 1135487954 1909
+1135488669 76 c sys/src/libthread/sched.c - 664 sys sys 1135487951 3094
+1135488669 77 c sys/src/libthread/threadimpl.h - 664 sys sys 1135487955 4689
+1135488669 78 c sys/src/libventi/plan9-io.c - 664 sys sys 1135487933 1758
+1135488669 79 c sys/src/libventi/plan9-thread.c - 664 sys sys 1135487955 6713
+1135488669 80 d sys/src/libc/386/getcallerpc.c - 664 sys sys 944961709 0
+1135488669 81 d sys/src/ape/lib/9/386/getcallerpc.c - 664 sys sys 1132450766 0
+1135531884 0 c 386/lib/ape/lib9.a - 664 sys sys 1135531447 6906
+1135531884 1 c 386/lib/libc.a - 664 sys sys 1135531448 502758
+1135531884 2 c 386/lib/libthread.a - 664 sys sys 1135531448 71308
+1135548079 0 c sys/src/ape/lib/draw/libc.h - 664 sys sys 1135547921 3530
+1135548079 1 c sys/src/libdraw/getdefont.c - 664 sys sys 1135547941 1108
+1135571495 0 c 386/bin/8a - 775 sys sys 1135570766 116009
+1135571495 1 c 386/bin/8c - 775 sys sys 1135570766 362140
+1135571495 2 c 386/bin/9660srv - 775 sys sys 1135570766 104023
+1135571495 3 c 386/bin/aan - 775 sys sys 1135570767 130761
+1135571495 4 c 386/bin/acid - 775 sys sys 1135570768 400931
+1135571495 5 c 386/bin/acme - 775 sys sys 1135570768 429211
+1135571495 6 c 386/bin/ar - 775 sys sys 1135570769 111942
+1135571495 7 c 386/bin/archfs - 775 sys sys 1135570769 146849
+1135571495 8 c 386/bin/ascii - 775 sys sys 1135570770 64641
+1135571495 9 c 386/bin/awd - 775 sys sys 1135570793 58734
+1135571495 10 c 386/bin/bc - 775 sys sys 1135570793 81760
+1135571495 11 c 386/bin/bind - 775 sys sys 1135570793 59562
+1135571495 12 c 386/bin/bitsy/bitsyload - 775 sys sys 1135570793 63359
+1135571495 13 c 386/bin/bitsy/keyboard - 775 sys sys 1135570794 306153
+1135571495 14 c 386/bin/bitsy/params - 775 sys sys 1135570794 58772
+1135571495 15 c 386/bin/bitsy/pencal - 775 sys sys 1135570794 117257
+1135571495 16 c 386/bin/bitsy/prompter - 775 sys sys 1135570795 286441
+1135571495 17 c 386/bin/bunzip2 - 775 sys sys 1135570796 97484
+1135571495 18 c 386/bin/bzip2 - 775 sys sys 1135570796 114019
+1135571495 19 c 386/bin/cal - 775 sys sys 1135570796 67869
+1135571495 20 c 386/bin/calendar - 775 sys sys 1135570797 80216
+1135571495 21 c 386/bin/cdfs - 775 sys sys 1135570797 167135
+1135571495 22 c 386/bin/cfs - 775 sys sys 1135570797 128025
+1135571495 23 c 386/bin/chgrp - 775 sys sys 1135570798 59279
+1135571495 24 c 386/bin/chmod - 775 sys sys 1135570798 62275
+1135571495 25 c 386/bin/cleanname - 775 sys sys 1135570798 58298
+1135571495 26 c 386/bin/clock - 775 sys sys 1135570798 158281
+1135571495 27 c 386/bin/colors - 775 sys sys 1135570799 150575
+1135571495 28 c 386/bin/comm - 775 sys sys 1135570799 61343
+1135571495 29 c 386/bin/con - 775 sys sys 1135570799 78243
+1135571495 30 c 386/bin/cp - 775 sys sys 1135570799 63211
+1135571495 31 c 386/bin/cpp - 775 sys sys 1135570800 149839
+1135571495 32 c 386/bin/cpu - 775 sys sys 1135570800 139202
+1135571495 33 c 386/bin/crop - 775 sys sys 1135570800 116024
+1135571495 34 c 386/bin/db - 775 sys sys 1135570801 345779
+1135571495 35 c 386/bin/dc - 775 sys sys 1135570801 99015
+1135571495 36 c 386/bin/deroff - 775 sys sys 1135570802 74231
+1135571495 37 c 386/bin/dict - 775 sys sys 1135570802 187462
+1135571495 38 c 386/bin/diff - 775 sys sys 1135570803 85082
+1135571495 39 c 386/bin/dossrv - 775 sys sys 1135570806 137741
+1135571495 40 c 386/bin/du - 775 sys sys 1135570806 73708
+1135571495 41 c 386/bin/echo - 775 sys sys 1135570806 57349
+1135571495 42 c 386/bin/ed - 775 sys sys 1135570807 93021
+1135571495 43 c 386/bin/exportfs - 775 sys sys 1135570807 162237
+1135571495 44 c 386/bin/faces - 775 sys sys 1135570808 193982
+1135571495 45 c 386/bin/factor - 775 sys sys 1135570809 61456
+1135571495 46 c 386/bin/getmap - 775 sys sys 1135570813 65176
+1135571495 47 c 386/bin/gunzip - 775 sys sys 1135570814 80271
+1135571495 48 c 386/bin/gzip - 775 sys sys 1135570815 84749
+1135571495 49 c 386/bin/hget - 775 sys sys 1135570816 233374
+1135571495 50 c 386/bin/history - 775 sys sys 1135570816 75351
+1135571495 51 c 386/bin/htmlfmt - 775 sys sys 1135570817 160781
+1135571495 52 c 386/bin/iconv - 775 sys sys 1135570818 113279
+1135571495 53 c 386/bin/idiff - 775 sys sys 1135570818 76099
+1135571495 54 c 386/bin/lnfs - 775 sys sys 1135570831 99434
+1135571495 55 c 386/bin/nntpfs - 775 sys sys 1135570839 166509
+1135571495 56 c 386/bin/png - 775 sys sys 1135570841 164238
+1135571495 57 c 386/bin/resample - 775 sys sys 1135570843 120754
+1135571495 58 c 386/bin/sha1sum - 775 sys sys 1135570844 61123
+1135571495 59 c 386/bin/topng - 775 sys sys 1135570850 138333
+1135571495 60 c 386/bin/unzip - 775 sys sys 1135570853 89956
+1135571495 61 c 386/bin/webcookies - 775 sys sys 1135570853 167402
+1135571495 62 c 386/bin/zip - 775 sys sys 1135570854 89977
+1135571495 63 c 386/bin/file - 775 sys sys 1135570809 120978
+1135571495 64 c 386/bin/fmt - 775 sys sys 1135570809 65332
+1135571495 65 c 386/bin/fortune - 775 sys sys 1135570810 67113
+1135571495 66 c 386/bin/freq - 775 sys sys 1135570812 61785
+1135571495 67 c 386/bin/ftpfs - 775 sys sys 1135570813 272811
+1135571495 68 c 386/bin/gif - 775 sys sys 1135570813 158129
+1135571495 69 c 386/bin/graph - 775 sys sys 1135570814 127323
+1135571495 70 c 386/bin/grep - 775 sys sys 1135570814 79062
+1135571495 71 c 386/bin/hayes - 775 sys sys 1135570815 64550
+1135571495 72 c 386/bin/hoc - 775 sys sys 1135570817 99860
+1135571495 73 c 386/bin/html2ms - 775 sys sys 1135570817 66078
+1135571495 74 c 386/bin/import - 775 sys sys 1135570818 101419
+1135571495 75 c 386/bin/iostats - 775 sys sys 1135570819 98375
+1135571495 76 c 386/bin/join - 775 sys sys 1135570829 114087
+1135571495 77 c 386/bin/jpg - 775 sys sys 1135570829 174592
+1135571495 78 c 386/bin/kprof - 775 sys sys 1135570830 105465
+1135571495 79 c 386/bin/ktrace - 775 sys sys 1135570830 123137
+1135571495 80 c 386/bin/lens - 775 sys sys 1135570830 150725
+1135571495 81 c 386/bin/lex - 775 sys sys 1135570831 98935
+1135571495 82 c 386/bin/look - 775 sys sys 1135570831 65531
+1135571495 83 c 386/bin/ls - 775 sys sys 1135570831 82459
+1135571495 84 c 386/bin/mc - 775 sys sys 1135570831 133915
+1135571495 85 c 386/bin/md5sum - 775 sys sys 1135570832 61255
+1135571495 86 c 386/bin/mk - 775 sys sys 1135570832 144652
+1135571495 87 c 386/bin/mkdir - 775 sys sys 1135570832 60958
+1135571495 88 c 386/bin/mount - 775 sys sys 1135570833 73001
+1135571495 89 c 386/bin/ms2html - 775 sys sys 1135570833 103959
+1135571495 90 c 386/bin/mv - 775 sys sys 1135570833 65483
+1135571495 91 c 386/bin/netkey - 775 sys sys 1135570837 72347
+1135571495 92 c 386/bin/netstat - 775 sys sys 1135570838 84660
+1135571495 93 c 386/bin/news - 775 sys sys 1135570838 71700
+1135571495 94 c 386/bin/nm - 775 sys sys 1135570839 125741
+1135571495 95 c 386/bin/ns - 775 sys sys 1135570839 65247
+1135571495 96 c 386/bin/p - 775 sys sys 1135570839 64977
+1135571495 97 c 386/bin/page - 775 sys sys 1135570840 233354
+1135571495 98 c 386/bin/passwd - 775 sys sys 1135570840 83739
+1135571495 99 c 386/bin/pcc - 775 sys sys 1135570841 67910
+1135571495 100 c 386/bin/ppm - 775 sys sys 1135570841 149413
+1135571495 101 c 386/bin/pr - 775 sys sys 1135570842 77459
+1135571495 102 c 386/bin/prof - 775 sys sys 1135570842 110928
+1135571495 103 c 386/bin/ps - 775 sys sys 1135570842 67981
+1135571495 104 c 386/bin/ramfs - 775 sys sys 1135570842 89784
+1135571495 105 c 386/bin/rdbfs - 775 sys sys 1135570843 174476
+1135571495 106 c 386/bin/read - 775 sys sys 1135570843 58040
+1135571495 107 c 386/bin/rm - 775 sys sys 1135570843 61327
+1135571495 108 c 386/bin/rx - 775 sys sys 1135570843 82051
+1135571495 109 c 386/bin/sed - 775 sys sys 1135570844 89510
+1135571495 110 c 386/bin/size - 775 sys sys 1135570844 78748
+1135571495 111 c 386/bin/snoopy - 775 sys sys 1135570845 168197
+1135571495 112 c 386/bin/sort - 775 sys sys 1135570845 82270
+1135571495 113 c 386/bin/split - 775 sys sys 1135570845 75631
+1135571495 114 c 386/bin/srv - 775 sys sys 1135570845 82437
+1135571495 115 c 386/bin/stats - 775 sys sys 1135570846 190636
+1135571495 116 c 386/bin/strings - 775 sys sys 1135570846 62107
+1135571495 117 c 386/bin/strip - 775 sys sys 1135570846 80730
+1135571495 118 c 386/bin/swap - 775 sys sys 1135570847 62130
+1135571495 119 c 386/bin/winwatch - 775 sys sys 1135570853 154876
+1135571495 120 c 386/bin/ape/cc - 775 sys sys 1135570769 70399
+1135571495 121 c 386/bin/ape/tar - 775 sys sys 1135570769 61941
+1135571495 122 c 386/bin/auth/aescbc - 775 sys sys 1135570770 140764
+1135571495 123 c 386/bin/auth/asn12rsa - 775 sys sys 1135570770 120433
+1135571495 124 c 386/bin/auth/authsrv - 775 sys sys 1135570771 165460
+1135571495 125 c 386/bin/auth/changeuser - 775 sys sys 1135570771 97011
+1135571495 126 c 386/bin/auth/convkeys - 775 sys sys 1135570771 87436
+1135571495 127 c 386/bin/auth/convkeys2 - 775 sys sys 1135570771 87487
+1135571495 128 c 386/bin/auth/cron - 775 sys sys 1135570772 143956
+1135571495 129 c 386/bin/auth/debug - 775 sys sys 1135570772 101051
+1135571495 130 c 386/bin/auth/factotum - 775 sys sys 1135570773 318316
+1135571495 131 c 386/bin/auth/fgui - 775 sys sys 1135570773 218329
+1135571495 132 c 386/bin/auth/guard.srv - 775 sys sys 1135570774 142833
+1135571495 133 c 386/bin/auth/keyfs - 775 sys sys 1135570774 115579
+1135571495 134 c 386/bin/auth/login - 775 sys sys 1135570774 104481
+1135571495 135 c 386/bin/auth/newns - 775 sys sys 1135570774 89719
+1135571495 136 c 386/bin/auth/none - 775 sys sys 1135570775 89007
+1135571495 137 c 386/bin/auth/pemdecode - 775 sys sys 1135570775 61451
+1135571495 138 c 386/bin/auth/pemencode - 775 sys sys 1135570775 59847
+1135571495 139 c 386/bin/auth/rsa2csr - 775 sys sys 1135570775 180508
+1135571495 140 c 386/bin/auth/rsa2pub - 775 sys sys 1135570776 143540
+1135571495 141 c 386/bin/auth/rsa2ssh - 775 sys sys 1135570776 138857
+1135571495 142 c 386/bin/auth/rsa2x509 - 775 sys sys 1135570777 184269
+1135571495 143 c 386/bin/auth/rsafill - 775 sys sys 1135570777 143608
+1135571495 144 c 386/bin/auth/rsagen - 775 sys sys 1135570778 153242
+1135571495 145 c 386/bin/auth/secstore - 775 sys sys 1135570778 195447
+1135571495 146 c 386/bin/auth/secstored - 775 sys sys 1135570779 197002
+1135571495 147 c 386/bin/auth/secuser - 775 sys sys 1135570779 152936
+1135571495 148 c 386/bin/auth/uniq - 775 sys sys 1135570779 63055
+1135571495 149 c 386/bin/auth/warning - 775 sys sys 1135570779 100633
+1135571495 150 c 386/bin/auth/wrkey - 775 sys sys 1135570779 75197
+1135571495 151 c 386/bin/aux/9pcon - 775 sys sys 1135570780 94910
+1135571495 152 c 386/bin/aux/LOCK - 775 sys sys 1135570780 59902
+1135571495 153 c 386/bin/aux/acidleak - 775 sys sys 1135570780 69430
+1135571495 154 c 386/bin/aux/apm - 775 sys sys 1135570781 180009
+1135571495 155 c 386/bin/aux/astarld - 775 sys sys 1135570781 64675
+1135571495 156 c 386/bin/aux/cddb - 775 sys sys 1135570781 72214
+1135571495 157 c 386/bin/aux/clog - 775 sys sys 1135570782 66431
+1135571495 158 c 386/bin/aux/consolefs - 775 sys sys 1135570782 153921
+1135571495 159 c 386/bin/aux/data2s - 775 sys sys 1135570782 60518
+1135571495 160 c 386/bin/aux/depend - 775 sys sys 1135570782 145569
+1135571495 161 c 386/bin/aux/disksim - 775 sys sys 1135570783 150431
+1135571495 162 c 386/bin/aux/faxreceive - 775 sys sys 1135570783 83923
+1135571495 163 c 386/bin/aux/faxsend - 775 sys sys 1135570783 89435
+1135571495 164 c 386/bin/aux/flashfs - 775 sys sys 1135570784 166349
+1135571495 165 c 386/bin/aux/gpsevermore - 775 sys sys 1135570784 71477
+1135571495 166 c 386/bin/aux/gpsfs - 775 sys sys 1135570784 182265
+1135571495 167 c 386/bin/aux/lines - 775 sys sys 1135570784 60473
+1135571495 168 c 386/bin/aux/listen - 775 sys sys 1135570785 108006
+1135571495 169 c 386/bin/aux/listen1 - 775 sys sys 1135570785 94483
+1135571495 170 c 386/bin/aux/mapd - 775 sys sys 1135570785 190784
+1135571495 171 c 386/bin/aux/mkflashfs - 775 sys sys 1135570785 67345
+1135571495 172 c 386/bin/aux/mklatinkbd - 775 sys sys 1135570786 64164
+1135571495 173 c 386/bin/aux/mnihongo - 775 sys sys 1135570786 139629
+1135571495 174 c 386/bin/aux/ms2 - 775 sys sys 1135570786 87426
+1135571495 175 c 386/bin/aux/msexceltables - 775 sys sys 1135570786 81218
+1135571495 176 c 386/bin/aux/mswordstrings - 775 sys sys 1135570787 65298
+1135571495 177 c 386/bin/aux/na - 775 sys sys 1135570787 154182
+1135571495 178 c 386/bin/aux/nfsmount - 775 sys sys 1135570787 234147
+1135571495 179 c 386/bin/aux/nfsserver - 775 sys sys 1135570788 185407
+1135571495 180 c 386/bin/aux/olefs - 775 sys sys 1135570788 149329
+1135571495 181 c 386/bin/aux/pcnfsd - 775 sys sys 1135570789 129333
+1135571495 182 c 386/bin/aux/portmap - 775 sys sys 1135570789 143667
+1135571495 183 c 386/bin/aux/portmapper - 775 sys sys 1135570789 128221
+1135571495 184 c 386/bin/aux/reboot - 775 sys sys 1135570790 60568
+1135571495 185 c 386/bin/aux/searchfs - 775 sys sys 1135570790 89552
+1135571495 186 c 386/bin/aux/statusbar - 775 sys sys 1135570790 151780
+1135571495 187 c 386/bin/aux/stub - 775 sys sys 1135570791 140900
+1135571495 188 c 386/bin/aux/timesync - 775 sys sys 1135570791 128368
+1135571495 189 c 386/bin/aux/trampoline - 775 sys sys 1135570791 83641
+1135571495 190 c 386/bin/aux/typepasswd - 775 sys sys 1135570791 69495
+1135571495 191 c 386/bin/aux/vga - 775 sys sys 1135570792 333791
+1135571495 192 c 386/bin/bmp - 775 sys sys 1135570796 157659
+1135571495 193 c 386/bin/cb - 775 sys sys 1135570797 77379
+1135571495 194 c 386/bin/dial/at - 775 sys sys 1135570802 60837
+1135571495 195 c 386/bin/dial/expect - 775 sys sys 1135570802 60075
+1135571495 196 c 386/bin/disk/dump9660 - 775 sys sys 1135570803 152285
+1135571495 197 c 386/bin/disk/exsort - 775 sys sys 1135570803 60212
+1135571495 198 c 386/bin/disk/fdisk - 775 sys sys 1135570804 103852
+1135571495 199 c 386/bin/disk/format - 775 sys sys 1135570804 89520
+1135571495 200 c 386/bin/disk/kfs - 775 sys sys 1135570804 249003
+1135571495 201 c 386/bin/disk/mbr - 775 sys sys 1135570805 73675
+1135571495 202 c 386/bin/disk/mkext - 775 sys sys 1135570805 82639
+1135571495 203 c 386/bin/disk/mkfs - 775 sys sys 1135570805 87728
+1135571495 204 c 386/bin/disk/prep - 775 sys sys 1135570806 95873
+1135571495 205 c 386/bin/execnet - 775 sys sys 1135570807 177748
+1135571495 206 c 386/bin/ext2srv - 775 sys sys 1135570808 179710
+1135571495 207 c 386/bin/fcp - 775 sys sys 1135570809 82182
+1135571495 208 c 386/bin/fossil/flchk - 775 sys sys 1135570810 237600
+1135571495 209 c 386/bin/fossil/flfmt - 775 sys sys 1135570811 245747
+1135571495 210 c 386/bin/fossil/fossil - 775 sys sys 1135570812 360522
+1135571495 211 c 386/bin/fossil/last - 775 sys sys 1135570812 63280
+1135571495 212 c 386/bin/gview - 775 sys sys 1135570815 238523
+1135571495 213 c 386/bin/ico - 775 sys sys 1135570818 161740
+1135571495 214 c 386/bin/ip/dhcpclient - 775 sys sys 1135570819 94132
+1135571495 215 c 386/bin/ip/dhcpd - 775 sys sys 1135570819 149217
+1135571495 216 c 386/bin/ip/dhcpleases - 775 sys sys 1135570820 86209
+1135571495 217 c 386/bin/ip/ftpd - 775 sys sys 1135570820 170401
+1135571495 218 c 386/bin/ip/gping - 775 sys sys 1135570820 183130
+1135571495 219 c 386/bin/ip/httpd/httpd - 775 sys sys 1135570821 292534
+1135571495 220 c 386/bin/ip/httpd/imagemap - 775 sys sys 1135570822 114780
+1135571495 221 c 386/bin/ip/httpd/man2html - 775 sys sys 1135570822 123081
+1135571495 222 c 386/bin/ip/httpd/netlib_find - 775 sys sys 1135570822 115637
+1135571495 223 c 386/bin/ip/httpd/netlib_history - 775 sys sys 1135570822 114435
+1135571495 224 c 386/bin/ip/httpd/save - 775 sys sys 1135570823 131200
+1135571495 225 c 386/bin/ip/httpd/webls - 775 sys sys 1135570823 131299
+1135571495 226 c 386/bin/ip/httpd/wikipost - 775 sys sys 1135570824 112661
+1135571495 227 c 386/bin/ip/httpfile - 775 sys sys 1135570824 283624
+1135571495 228 c 386/bin/ip/imap4d - 775 sys sys 1135570825 237651
+1135571495 229 c 386/bin/ip/ipconfig - 775 sys sys 1135570825 137844
+1135571495 230 c 386/bin/ip/ping - 775 sys sys 1135570826 76416
+1135571495 231 c 386/bin/ip/ppp - 775 sys sys 1135570826 219950
+1135571495 232 c 386/bin/ip/pppoe - 775 sys sys 1135570826 77544
+1135571495 233 c 386/bin/ip/pptp - 775 sys sys 1135570826 126715
+1135571495 234 c 386/bin/ip/pptpd - 775 sys sys 1135570827 125862
+1135571495 235 c 386/bin/ip/rarpd - 775 sys sys 1135570827 111558
+1135571495 236 c 386/bin/ip/rexexec - 775 sys sys 1135570827 89967
+1135571495 237 c 386/bin/ip/rip - 775 sys sys 1135570827 91219
+1135571495 238 c 386/bin/ip/rlogind - 775 sys sys 1135570828 67396
+1135571495 239 c 386/bin/ip/telnetd - 775 sys sys 1135570828 123062
+1135571495 240 c 386/bin/ip/tftpd - 775 sys sys 1135570828 130563
+1135571495 241 c 386/bin/ip/traceroute - 775 sys sys 1135570828 73483
+1135571495 242 c 386/bin/kbmap - 775 sys sys 1135570829 143626
+1135571495 243 c 386/bin/mkpaqfs - 775 sys sys 1135570832 94494
+1135571495 244 c 386/bin/mntgen - 775 sys sys 1135570833 145268
+1135571495 245 c 386/bin/mtime - 775 sys sys 1135570833 59133
+1135571495 246 c 386/bin/ndb/cs - 775 sys sys 1135570834 149329
+1135571495 247 c 386/bin/ndb/csquery - 775 sys sys 1135570834 61459
+1135571495 248 c 386/bin/ndb/dns - 775 sys sys 1135570834 245078
+1135571495 249 c 386/bin/ndb/dnsdebug - 775 sys sys 1135570835 219747
+1135571495 250 c 386/bin/ndb/dnsquery - 775 sys sys 1135570835 63624
+1135571495 251 c 386/bin/ndb/dnstcp - 775 sys sys 1135570836 218388
+1135571495 252 c 386/bin/ndb/ipquery - 775 sys sys 1135570836 95469
+1135571495 253 c 386/bin/ndb/mkdb - 775 sys sys 1135570836 63969
+1135571495 254 c 386/bin/ndb/mkhash - 775 sys sys 1135570837 83902
+1135571495 255 c 386/bin/ndb/mkhosts - 775 sys sys 1135570837 84944
+1135571495 256 c 386/bin/ndb/query - 775 sys sys 1135570837 83035
+1135571495 257 c 386/bin/nfs - 775 sys sys 1135570838 321082
+1135571495 258 c 386/bin/paqfs - 775 sys sys 1135570840 107535
+1135571495 259 c 386/bin/tail - 775 sys sys 1135570847 66163
+1135571495 260 c 386/bin/tar - 775 sys sys 1135570847 93423
+1135571495 261 c 386/bin/telnet - 775 sys sys 1135570847 80400
+1135571495 262 c 386/bin/test - 775 sys sys 1135570847 69841
+1135571495 263 c 386/bin/time - 775 sys sys 1135570848 61372
+1135571495 264 c 386/bin/tlsclient - 775 sys sys 1135570848 198462
+1135571495 265 c 386/bin/tlssrv - 775 sys sys 1135570849 198724
+1135571495 266 c 386/bin/togif - 775 sys sys 1135570849 189850
+1135571495 267 c 386/bin/toico - 775 sys sys 1135570849 123639
+1135571495 268 c 386/bin/toppm - 775 sys sys 1135570850 165236
+1135571495 269 c 386/bin/touch - 775 sys sys 1135570850 63751
+1135571495 270 c 386/bin/tprof - 775 sys sys 1135570851 297542
+1135571495 271 c 386/bin/tr - 775 sys sys 1135570851 61845
+1135571495 272 c 386/bin/trace - 775 sys sys 1135570851 181182
+1135571495 273 c 386/bin/tweak - 775 sys sys 1135570852 192855
+1135571495 274 c 386/bin/unicode - 775 sys sys 1135570852 62504
+1135571495 275 c 386/bin/uniq - 775 sys sys 1135570852 61885
+1135571495 276 c 386/bin/units - 775 sys sys 1135570852 75235
+1135571495 277 c 386/bin/unlnfs - 775 sys sys 1135570852 71349
+1135571495 278 c 386/bin/xd - 775 sys sys 1135570853 64036
+1135571495 279 c 386/bin/yacc - 775 sys sys 1135570854 102278
+1135571495 280 c 386/bin/yuv - 775 sys sys 1135570854 149950
+1135571495 281 c 386/init - 775 sys sys 1135570855 101176
+1135571495 282 c 386/lib/ape/libdraw.a - 664 sys sys 1135570857 574562
+1135571495 283 c 386/lib/libdraw.a - 664 sys sys 1135570858 374160
+1135571495 284 c acme/bin/386/Mail - 775 sys sys 1135570855 179492
+1135571495 285 c acme/bin/386/News - 775 sys sys 1135570855 128861
+1135571495 286 c acme/bin/386/Wiki - 775 sys sys 1135570856 127437
+1135571495 287 c acme/bin/386/spout - 775 sys sys 1135570856 61598
+1135571495 288 c acme/bin/386/win - 775 sys sys 1135570856 184737

sys/doc/fossil.ps

@@ -4331,18 +4331,18 @@ mark
 10 /LucidaSansUnicode00 f
 (bytes\).) 3478 2613 w
 (Data) 970 2769 w
-(block) 1233 2769 w
-(are) 1536 2769 w
-(truncated) 1729 2769 w
-(to) 2234 2769 w
-(remove) 2373 2769 w
-(trailing) 2773 2769 w
-(runs) 3158 2769 w
-(of) 3415 2769 w
-(zeros) 3554 2769 w
-(before) 3861 2769 w
-(storage) 4216 2769 w
-(to) 4620 2769 w
+(blocks) 1229 2769 w
+(are) 1579 2769 w
+(truncated) 1768 2769 w
+(to) 2269 2769 w
+(remove) 2404 2769 w
+(trailing) 2800 2769 w
+(runs) 3181 2769 w
+(of) 3434 2769 w
+(zeros) 3569 2769 w
+(before) 3872 2769 w
+(storage) 4223 2769 w
+(to) 4623 2769 w
 (Venti;) 4759 2769 w
 (they) 720 2889 w
 (are) 962 2889 w
@@ -4357,7 +4357,7 @@ mark
 (retrieval) 2926 2889 w
 (from) 3356 2889 w
 (Venti.) 3622 2889 w
-(SImilarly,) 3969 2889 w
+(Similarly,) 3969 2889 w
 (trailing) 4446 2889 w
 (runs) 4824 2889 w
 (of) 720 3009 w
@@ -4563,14 +4563,6 @@ mark
 (the) 4404 5245 w
 (following) 4593 5245 w
 (bit fields.) 720 5365 w
-10 /LucidaSansUnicode20 f
-(\030) 1242 5365 w
-10 /LucidaSans-Italic f
-(or) 1274 5365 w
-10 /LucidaSansUnicode20 f
-(\031) 1379 5365 w
-10 /LucidaSansUnicode00 f
-(of the following flags:) 1443 5365 w
 9 /LucidaTypewriter f
 (0x01) 1008 5535 w
 (VtEntryActive) 1398 5535 w
@@ -4613,7 +4605,7 @@ mark
 (stored) 2457 6081 w
 (in) 2806 6081 w
 (the) 2937 6081 w
-(5) 3132 6081 w
+(3) 3132 6081 w
 (bits) 3235 6081 w
 (indicated:) 3455 6081 w
 (a) 3972 6081 w
@@ -8107,7 +8099,7 @@ mark
 (process) 4094 7164 w
 (copies) 4509 7164 w
 (this) 4861 7164 w
-(ring buffer to the each console file.) 720 7284 w
+(ring buffer to each console file.) 720 7284 w
 cleartomark
 showpage
 saveobj restore

sys/include/libc.h

@@ -44,7 +44,7 @@ enum
 	UTFmax		= 3,		/* maximum bytes per rune */
 	Runesync	= 0x80,		/* cannot represent part of a UTF sequence (<) */
 	Runeself	= 0x80,		/* rune and UTF sequences are the same (<) */
-	Runeerror	= 0xFFFD,		/* decoding error in UTF */
+	Runeerror	= 0xFFFD,	/* decoding error in UTF */
 };
 
 /*
@@ -94,8 +94,8 @@ extern	ulong	msize(void*);
 extern	void*	mallocalign(ulong, ulong, long, ulong);
 extern	void*	calloc(ulong, ulong);
 extern	void*	realloc(void*, ulong);
-extern	void		setmalloctag(void*, ulong);
-extern	void		setrealloctag(void*, ulong);
+extern	void	setmalloctag(void*, ulong);
+extern	void	setrealloctag(void*, ulong);
 extern	ulong	getmalloctag(void*);
 extern	ulong	getrealloctag(void*);
 extern	void*	malloctopoolblock(void*);
@@ -132,7 +132,7 @@ enum{
 	FmtLong		= FmtShort << 1,
 	FmtVLong	= FmtLong << 1,
 	FmtComma	= FmtVLong << 1,
-	FmtByte	= FmtComma << 1,
+	FmtByte		= FmtComma << 1,
 
 	FmtFlag		= FmtByte << 1
 };
@@ -164,16 +164,16 @@ extern	int	runefmtstrinit(Fmt*);
 extern	Rune*	runefmtstrflush(Fmt*);
 
 #pragma	varargck	argpos	fmtprint	2
-#pragma	varargck	argpos	fprint	2
-#pragma	varargck	argpos	print	1
+#pragma	varargck	argpos	fprint		2
+#pragma	varargck	argpos	print		1
 #pragma	varargck	argpos	runeseprint	3
 #pragma	varargck	argpos	runesmprint	1
 #pragma	varargck	argpos	runesnprint	3
 #pragma	varargck	argpos	runesprint	2
-#pragma	varargck	argpos	seprint	3
-#pragma	varargck	argpos	smprint	1
-#pragma	varargck	argpos	snprint	3
-#pragma	varargck	argpos	sprint	2
+#pragma	varargck	argpos	seprint		3
+#pragma	varargck	argpos	smprint		1
+#pragma	varargck	argpos	snprint		3
+#pragma	varargck	argpos	sprint		2
 
 #pragma	varargck	type	"lld"	vlong
 #pragma	varargck	type	"llx"	vlong
@@ -348,7 +348,7 @@ extern	int	enc16(char*, int, uchar*, int);
 extern	int	encodefmt(Fmt*);
 extern	void	exits(char*);
 extern	double	frexp(double, int*);
-extern	ulong	getcallerpc(void*);
+extern	uintptr	getcallerpc(void*);
 extern	char*	getenv(char*);
 extern	int	getfields(char*, char**, int, int, char*);
 extern	int	gettokens(char *, char **, int, char *);
@@ -385,10 +385,10 @@ extern	int	toupper(int);
  *  profiling
  */
 enum {
-	Profoff,			/* No profiling */
-	Profuser,			/* Measure user time only (default) */
+	Profoff,		/* No profiling */
+	Profuser,		/* Measure user time only (default) */
 	Profkernel,		/* Measure user + kernel time */
-	Proftime,			/* Measure total time */
+	Proftime,		/* Measure total time */
 	Profsample,		/* Use clock interrupt to sample (default when there is no cycle counter) */
 }; /* what */
 extern	void	prof(void (*fn)(void*), void *arg, int entries, int what);
@@ -427,7 +427,7 @@ struct QLock
 extern	void	qlock(QLock*);
 extern	void	qunlock(QLock*);
 extern	int	canqlock(QLock*);
-extern	void	_qlockinit(ulong (*)(ulong, ulong));	/* called only by the thread library */
+extern	void	_qlockinit(void* (*)(void*, void*));	/* called only by the thread library */
 
 typedef
 struct RWLock
@@ -441,15 +441,15 @@ struct RWLock
 
 extern	void	rlock(RWLock*);
 extern	void	runlock(RWLock*);
-extern	int		canrlock(RWLock*);
+extern	int	canrlock(RWLock*);
 extern	void	wlock(RWLock*);
 extern	void	wunlock(RWLock*);
-extern	int		canwlock(RWLock*);
+extern	int	canwlock(RWLock*);
 
 typedef
 struct Rendez
 {
-	QLock *l;
+	QLock	*l;
 	QLp	*head;
 	QLp	*tail;
 } Rendez;
@@ -493,7 +493,7 @@ struct NetConnInfo
 	char	*rsys;		/* remote system */
 	char	*rserv;		/* remote service */
 	char	*laddr;		/* local address */
-	char *raddr;		/* remote address */
+	char	*raddr;		/* remote address */
 };
 extern	NetConnInfo*	getnetconninfo(char*, int);
 extern	void		freenetconninfo(NetConnInfo*);
@@ -543,7 +543,7 @@ extern	void		freenetconninfo(NetConnInfo*);
 #define QTEXCL		0x20		/* type bit for exclusive use files */
 #define QTMOUNT		0x10		/* type bit for mounted channel */
 #define QTAUTH		0x08		/* type bit for authentication file */
-#define QTTMP			0x04		/* type bit for not-backed-up file */
+#define QTTMP		0x04		/* type bit for not-backed-up file */
 #define QTFILE		0x00		/* plain file */
 
 /* bits in Dir.mode */
@@ -603,8 +603,8 @@ struct Dir {
 typedef
 struct Waitmsg
 {
-	int pid;	/* of loved one */
-	ulong time[3];	/* of loved one & descendants */
+	int	pid;		/* of loved one */
+	ulong	time[3];	/* of loved one & descendants */
 	char	*msg;
 } Waitmsg;
 
@@ -654,8 +654,8 @@ extern	int	remove(char*);
 extern	void*	sbrk(ulong);
 extern	long	oseek(int, long, int);
 extern	vlong	seek(int, vlong, int);
-extern	long	segattach(int, char*, void*, ulong);
-extern	int	segbrk(void*, void*);
+extern	void*	segattach(int, char*, void*, ulong);
+extern	void*	segbrk(void*, void*);
 extern	int	segdetach(void*);
 extern	int	segflush(void*, ulong);
 extern	int	segfree(void*, ulong);
@@ -666,7 +666,7 @@ extern	int	waitpid(void);
 extern	long	write(int, void*, long);
 extern	long	writev(int, IOchunk*, int);
 extern	int	wstat(char*, uchar*, int);
-extern	ulong	rendezvous(ulong, ulong);
+extern	void*	rendezvous(void*, void*);
 
 extern	Dir*	dirstat(char*);
 extern	Dir*	dirfstat(int);

sys/man/2/rendezvous

@@ -7,7 +7,7 @@ rendezvous \- user level process synchronization
 .B #include <libc.h>
 .PP
 .B
-ulong rendezvous(ulong tag, ulong value)
+void* rendezvous(void* tag, void* value)
 .SH DESCRIPTION
 The rendezvous system call allows two processes to synchronize and
 exchange a value.

sys/man/2/segattach

@@ -8,7 +8,7 @@ segattach, segdetach, segfree \- map/unmap a segment in virtual memory
 .PP
 .ta \w'\fLlong 'u
 .B
-long	segattach(int attr, char *class, void *va, ulong len)
+void*	segattach(int attr, char *class, void *va, ulong len)
 .PP
 .B
 int	segdetach(void *addr)
@@ -19,7 +19,7 @@ int	segfree(void *va, ulong len)
 .SH DESCRIPTION
 .I Segattach
 creates a new memory segment, adds it
-to the calling process's address space, and returns its lowest address (as an integer).
+to the calling process's address space, and returns its lowest address.
 Segments belong to system-dependent classes.
 Segment classes
 .B memory
@@ -159,15 +159,10 @@ btas:
 .SH DIAGNOSTICS
 These functions set
 .IR errstr .
+.I Segattach
+returns
+.B (void*)-1
+on error.
 .SH BUGS
-The return type of
-.I segattach
-is peculiar.
-Also,
-.I segattach
-returns -1 on error;
-beware that on some systems other negative
-values might be legal addresses.
-.br
 There is a small fixed limit on the number of segments that may be attached,
 as well as a maximum segment size.

sys/man/2/segbrk

@@ -8,7 +8,7 @@ segbrk \- change memory allocation
 .PP
 .ta \w'\fLvoid* 'u
 .B
-int	segbrk(void *saddr, void *addr)
+void*	segbrk(void *saddr, void *addr)
 .PP
 .SH DESCRIPTION
 .I Segbrk
@@ -41,3 +41,24 @@ text, data, or stack segment to be altered.
 .SH DIAGNOSTICS
 Sets
 .IR errstr .
+.I Segbrk
+returns
+.B (void*)-1
+on error.
+.SH BUGS
+.I Segbrk
+is not fully defined or implemented.
+In particular,
+it cannot always return the top of bss
+when called with a zero
+.I addr
+argument.
+The
+.I segbrk
+system call may go away or be re-implemented
+to give more general segment control,
+subsuming the functions of
+.IR brk (2),
+.IR segflush (2)
+and
+.IR segfree (2).

sys/src/9/pc/trap.c

@@ -473,7 +473,6 @@ dumpregs2(Ureg* ureg)
 void
 dumpregs(Ureg* ureg)
 {
-	extern ulong etext;
 	vlong mca, mct;
 
 	dumpregs2(ureg);

sys/src/9/pc/vgai81x.c

@@ -24,8 +24,32 @@ enum {
 	Fbsize		= 8*MB,
 
 	hwCur		= 0x70080,
+	SRX		= 0x3c4,
+	DPMSsync	= 0x5002,
 };
 
+static void
+i81xblank(VGAscr *scr, int blank)
+{
+	char *srx, *srxd, *dpms;
+	char sr01, mode;
+
+	srx = (char *)scr->mmio+SRX;
+	srxd = srx+1;
+	dpms = (char *)scr->mmio+DPMSsync;
+
+	*srx = 0x01;
+	sr01 = *srxd & ~0x20;
+	mode = *dpms & 0xf0;
+
+	if(blank) {
+		sr01 |= 0x20;
+		mode |= 0x0a;
+	}
+	*srxd = sr01;
+	*dpms = mode;
+}
+
 static Pcidev *
 i81xpcimatch(void)
 {
@@ -100,6 +124,9 @@ i81xenable(VGAscr* scr)
 		panic("i81x cursor mmuwalk");
 	*pte |= PTEUNCACHED;
 	scr->storage = cursor;
+
+	scr->blank = i81xblank;
+	hwblank = 1;
 }
 
 static void

sys/src/9/port/portdat.h

@@ -243,7 +243,6 @@ enum
 struct Mntwalk				/* state for /proc/#/ns */
 {
 	int	cddone;
-	ulong	id;
 	Mhead*	mh;
 	Mount*	cm;
 };

sys/src/ape/lib/9/386/getcallerpc.c

@@ -1,5 +0,0 @@
-unsigned long
-getcallerpc(void *x)
-{
-	return (((unsigned long*)(x))[-1]);
-}

sys/src/ape/lib/9/386/getcallerpc.s

@@ -0,0 +1,4 @@
+TEXT getcallerpc(SB), $0
+	MOVL	v+0(FP), AX
+	MOVL	-4(AX), AX
+	RET

sys/src/ape/lib/draw/libc.h

@@ -132,3 +132,6 @@ extern	int	_IOUNIT(int);
 #define atnotify(x, y) signal(SIGTERM, ekill)
 
 #define ERRMAX 128
+
+extern	void	setmalloctag(void*, ulong);
+extern	ulong	getcallerpc(void*);

sys/src/boot/arm/fns.h

@@ -4,3 +4,4 @@
 extern int	gunzip(uchar *out, int outn, uchar *in, int inn);
 extern void	delay(int ms);
 extern void	serialputs(char *str, int n);
+extern void	draincache(void);

sys/src/boot/arm/lib.h

@@ -59,7 +59,7 @@ extern	int	print(char*, ...);
  * one-of-a-kind
  */
 extern	char*	cleanname(char*);
-extern	ulong	getcallerpc(void*);
+extern	uintptr	getcallerpc(void*);
 extern	long	strtol(char*, char**, int);
 extern	ulong	strtoul(char*, char**, int);
 extern	vlong	strtoll(char*, char**, int);

sys/src/boot/pc/lib.h

@@ -94,7 +94,7 @@ extern	int	fmtinstall(int, int (*)(Fmt*));
  * one-of-a-kind
  */
 extern	int	atoi(char*);
-extern	ulong	getcallerpc(void*);
+extern	uintptr	getcallerpc(void*);
 extern	long	strtol(char*, char**, int);
 extern	ulong	strtoul(char*, char**, int);
 extern	long	end;

sys/src/boot/pc/load.c

@@ -447,7 +447,7 @@ ialloc(ulong n, int align)
 
 	palloc = p+n;
 	if(palloc > PEND)
-		panic("ialloc(%lud, %d) called from 0x%lux\n",
+		panic("ialloc(%lud, %d) called from %#p\n",
 			n, align, getcallerpc(&n));
 	return memset((void*)(p|KZERO), 0, n);
 }
@@ -458,7 +458,7 @@ xspanalloc(ulong size, int align, ulong span)
 	ulong a, v;
 
 	if((palloc + (size+align+span)) > PEND)
-		panic("xspanalloc(%lud, %d, 0x%lux) called from 0x%lux\n",
+		panic("xspanalloc(%lud, %d, 0x%lux) called from %#p\n",
 			size, align, span, getcallerpc(&size));
 
 	a = (ulong)ialloc(size+align+span, 0);
@@ -492,7 +492,7 @@ allocb(int size)
 	}
 	if(bp == 0){
 		if((palloc + (sizeof(Block)+size+64)) > PEND)
-			panic("allocb(%d) called from 0x%lux\n",
+			panic("allocb(%d) called from %#p\n",
 				size, getcallerpc(&size));
 		bp = ialloc(sizeof(Block)+size+64, 0);
 		addr = (ulong)bp;

sys/src/cmd/acme/exec.c

@@ -661,7 +661,7 @@ cut(Text *et, Text *t, Text*, int dosnarf, int docut, Rune*, int)
 	Rune *r;
 
 	/* use current window if snarfing and its selection is non-null */
-	if(et!=t && dosnarf && et->w!=nil){
+	if(et!=nil && dosnarf && et->w!=nil){
 		if(et->w->body.q1>et->w->body.q0){
 			t = &et->w->body;
 			if(docut)

sys/src/cmd/auth/factotum/util.c

@@ -804,7 +804,7 @@ safecpy(char *to, char *from, int n)
 	if(n == 1)
 		return to;
 	if(from==nil)
-		sysfatal("safecpy called with from==nil, pc=%lux\n",
+		sysfatal("safecpy called with from==nil, pc=%#p\n",
 			getcallerpc(&to));
 	strncpy(to, from, n-1);
 	return to;

sys/src/cmd/aux/flashfs/utils.c

@@ -33,7 +33,7 @@ putc3(uchar *buff, ulong v)
 		return 3;
 	}
 
-	fprint(2, "%s: putc3 fail 0x%lux, called from 0x%lux\n", prog, v, getcallerpc(&buff));
+	fprint(2, "%s: putc3 fail 0x%lux, called from %#p\n", prog, v, getcallerpc(&buff));
 	abort();
 	return -1;
 }

sys/src/cmd/aux/vga/clgd546x.c

@@ -10,7 +10,7 @@
  */
 typedef struct {
 	Pcidev*	pci;
-	ulong	mmio;
+	uchar*	mmio;
 	int	mem;
 
 	int	format;			/* graphics and video format */
@@ -37,13 +37,13 @@ enum {
 static int
 mmio8r(Laguna* laguna, int offset)
 {
-	return *((uchar*)(laguna->mmio+offset)) & 0xFF;
+	return *(laguna->mmio+offset) & 0xFF;
 }
 
 static void
 mmio8w(Laguna* laguna, int offset, int data)
 {
-	*((uchar*)(laguna->mmio+offset)) = data;
+	*(laguna->mmio+offset) = data;
 }
 
 static int
@@ -74,7 +74,7 @@ static void
 snarf(Vga* vga, Ctlr* ctlr)
 {
 	int f, i;
-	long m;
+	uchar *mmio;
 	Pcidev *p;
 	Laguna *laguna;
 
@@ -113,11 +113,12 @@ snarf(Vga* vga, Ctlr* ctlr)
 			error("%s: can't set type\n", ctlr->name);
 		close(f);
 	
-		if((m = segattach(0, "clgd546xmmio", 0, p->mem[1].size)) == -1)
+		mmio = segattach(0, "clgd546xmmio", 0, p->mem[1].size);
+		if(mmio == (void*)-1)
 			error("%s: can't attach mmio segment\n", ctlr->name);
 		laguna = vga->private;
 		laguna->pci = p;
-		laguna->mmio = m;
+		laguna->mmio = mmio;
 	}
 	laguna = vga->private;
 

sys/src/cmd/aux/vga/i81x.c

@@ -16,7 +16,7 @@
 
 typedef struct {
 	Pcidev*	pci;
-	ulong	mmio;
+	uchar*	mmio;
 	ulong	clk[6];
 	ulong	lcd[9];
 	ulong	pixconf;
@@ -26,7 +26,7 @@ static void
 snarf(Vga* vga, Ctlr* ctlr)
 {
 	int f, i;
-	long m;
+	uchar *mmio;
 	ulong *rp;
 	Pcidev *p;
 	I81x *i81x;
@@ -59,12 +59,13 @@ snarf(Vga* vga, Ctlr* ctlr)
 			error("%s: can't set type\n", ctlr->name);
 		close(f);
 
-		if((m = segattach(0, "i81xmmio", 0, p->mem[1].size)) == -1)
+		mmio = segattach(0, "i81xmmio", 0, p->mem[1].size);
+		if(mmio == (void*)-1)
 			error("%s: can't attach mmio segment\n", ctlr->name);
 	
 		i81x = vga->private;
 		i81x->pci = p;
-		i81x->mmio = m;
+		i81x->mmio = mmio;
 	}
 	i81x = vga->private;
 
@@ -314,7 +315,6 @@ load(Vga* vga, Ctlr* ctlr)
 	int i;
 	ulong *rp;
 	I81x *i81x;
-	char *p;
 
 	i81x = vga->private;
 
@@ -338,20 +338,6 @@ load(Vga* vga, Ctlr* ctlr)
 		*rp++ = i81x->lcd[i];
 	/* set cursor, graphic mode */
 	rp = (ulong*)(i81x->mmio+0x70008);
-	*rp = i81x->pixconf | (1<<8);
-
-	p = (char*)(i81x->mmio+Pixmask);		/* DACMASK */
-	*p = 0xff;
-	p = (char*)(i81x->mmio+PaddrW);		/* DACWX */
-	*p = 0x04;
-	p = (char*)(i81x->mmio+Pdata);		/* DACDATA */
-	*p = 0xff;
-	*p = 0xff;
-	*p = 0xff;
-	*p = 0x00;
-	*p = 0x00;
-	*p = 0x00;
-
 	*rp = i81x->pixconf;
 
 	ctlr->flag |= Fload;

sys/src/cmd/aux/vga/mga2164w.c

@@ -11,7 +11,7 @@
  * Texas Instruments Tvp3026 RAMDAC.
  */
 enum {
-	Meg			= 1024*1024,
+	Meg		= 1024*1024,
 	/* pci chip manufacturer */
 	MATROX		= 0x102B,
 
@@ -34,9 +34,9 @@ enum {
 
 typedef struct {
 	Pcidev*	pci;
-	int		devid;
-	ulong	membase1;
-	ulong	membase2;
+	int	devid;
+	uchar*	membase1;
+	uchar*	membase2;
 	ulong	devctrl;
 	ulong	option;
 	uchar	crtcext[6];
@@ -58,7 +58,7 @@ _tvp3026i(Vga* vga, Ctlr* ctlr, uchar reg)
 		error("%s: tvp3026io: no *mga\n", ctlr->name);
 	mga = vga->private;
 
-	return *((uchar*)(mga->membase1+RAMDAC+reg));
+	return *(mga->membase1+RAMDAC+reg);
 }
 
 static void
@@ -73,7 +73,7 @@ _tvp3026o(Vga* vga, Ctlr* ctlr, uchar reg, uchar data)
 		error("%s: tvp3026io: no *mga\n", ctlr->name);
 	mga = vga->private;
 
-	*((uchar*)(mga->membase1+RAMDAC+reg)) = data;
+	*(mga->membase1+RAMDAC+reg) = data;
 }
 
 static uchar
@@ -119,7 +119,7 @@ static void
 mapmga(Vga* vga, Ctlr* ctlr)
 {
 	int f;
-	long m;
+	uchar *m;
 	Mga *mga;
 
 	if(vga->private == nil)
@@ -133,12 +133,12 @@ mapmga(Vga* vga, Ctlr* ctlr)
 		error("%s: can't set mga type\n", ctlr->name);
 	
 	m = segattach(0, "mga2164wmmio", 0, 16*1024);
-	if(m == -1)
+	if(m == (void*)-1)
 		error("%s: can't attach mga2164wmmio segment\n", ctlr->name);
 	mga->membase1 = m;
 
 	m = segattach(0, "mga2164wscreen", 0, (mga->devid==MGA2064? 8 : 16)*Meg);
-	if(m == -1)
+	if(m ==(void*)-1)
 		error("%s: can't attach mga2164wscreen segment\n", ctlr->name);
 
 	mga->membase2 = m;
@@ -278,13 +278,13 @@ snarf(Vga* vga, Ctlr* ctlr)
 
 	/* find out how much memory is here, some multiple of 2Meg */
 	crtcexto(3, mga->crtcext[3] | 0x80);	/* mga mode */
-	p = (uchar*)mga->membase2;
+	p = mga->membase2;
 	n = (mga->devid==MGA2064? 4 : 8);
 	for(i = 0; i < n; i++) {
 		k = (2*i+1)*Meg;
 		p[k] = 0;
 		p[k] = i+1;
-		*((uchar*)(mga->membase1+CACHEFLUSH)) = 0;
+		*(mga->membase1+CACHEFLUSH) = 0;
 		x[i] = p[k];
 		trace("x[%d]=%d\n", i, x[i]);
 	}

sys/src/cmd/aux/vga/mga4xx.c

@@ -30,49 +30,49 @@ static int	 ultradebug = 0;
  * Matrox G4xx 3D graphics accelerators
  */
 enum {
-	Kilo				= 1024,
-	Meg				= 1024*1024,
+	Kilo			= 1024,
+	Meg			= 1024*1024,
 	
-	MATROX			= 0x102B,		/* pci chip manufacturer */
-	MGA4XX			= 0x0525,		/* pci chip device ids */
+	MATROX			= 0x102B,	/* pci chip manufacturer */
+	MGA4XX			= 0x0525,	/* pci chip device ids */
 	MGA200			= 0x0521,
 
 	/* Pci configuration space mapping */
 	PCfgMgaFBAA		= 0x10,		/* Frame buffer Aperture Address */
 	PCfgMgaCAA		= 0x14,		/* Control Aperture Address base */
 	PCfgMgaIAA		= 0x18,		/* ILOAD Aperture base Address */
-	PCfgMgaOption1	= 0x40,		/* Option Register 1 */
-	PCfgMgaOption2	= 0x50,		/* Option Register 2 */
-	PCfgMgaOption3	= 0x54,		/* Option Register 3 */
-	PCfgMgaDevCtrl	= 0x04,		/* Device Control */
+	PCfgMgaOption1		= 0x40,		/* Option Register 1 */
+	PCfgMgaOption2		= 0x50,		/* Option Register 2 */
+	PCfgMgaOption3		= 0x54,		/* Option Register 3 */
+	PCfgMgaDevCtrl		= 0x04,		/* Device Control */
 
 	/* control aperture offsets */
-	DMAWIN			= 0x0000,		/* 7KByte Pseudo-DMA Window */
+	DMAWIN			= 0x0000,	/* 7KByte Pseudo-DMA Window */
 
-	STATUS0			= 0x1FC2,		/* Input Status 0 */
+	STATUS0			= 0x1FC2,	/* Input Status 0 */
 	STATUS1			= 0x1FDA,	/* Input Status 1 */
 	
-	SEQIDX			= 0x1FC4,		/* Sequencer Index */
-	SEQDATA			= 0x1FC5,		/* Sequencer Data */
+	SEQIDX			= 0x1FC4,	/* Sequencer Index */
+	SEQDATA			= 0x1FC5,	/* Sequencer Data */
 
-	MISC_W			= 0x1FC2,		/* Misc. WO */
+	MISC_W			= 0x1FC2,	/* Misc. WO */
 	MISC_R			= 0x1FCC,	/* Misc. RO */
 
-	GCTLIDX			= 0x1FCE,		/* Graphic Controler Index */
-	GCTLDATA		= 0x1FCF,		/* Graphic Controler Data */
+	GCTLIDX			= 0x1FCE,	/* Graphic Controler Index */
+	GCTLDATA		= 0x1FCF,	/* Graphic Controler Data */
 
 	CRTCIDX			= 0x1FD4,	/* CRTC Index */
 	CRTCDATA		= 0x1FD5,	/* CRTC Data */
 
-	CRTCEXTIDX		= 0x1FDE,		/* CRTC Extension Index */
-	CRTCEXTDATA		= 0x1FDF,		/* CRTC Extension Data */
+	CRTCEXTIDX		= 0x1FDE,	/* CRTC Extension Index */
+	CRTCEXTDATA		= 0x1FDF,	/* CRTC Extension Data */
 	
 	RAMDACIDX		= 0x3C00,	/* RAMDAC registers Index */
 	RAMDACDATA		= 0x3C0A,	/* RAMDAC Indexed Data */
 	RAMDACPALDATA		= 0x3C01,
 
-	ATTRIDX			= 0x1FC0,		/* Attribute Index */
-	ATTRDATA		= 0x1FC1,		/* Attribute Data */
+	ATTRIDX			= 0x1FC0,	/* Attribute Index */
+	ATTRDATA		= 0x1FC1,	/* Attribute Data */
 
 	CACHEFLUSH		= 0x1FFF,
 
@@ -82,36 +82,36 @@ enum {
 	
  	/* ... */
 	Seq_ClockingMode =	0x01,
-		Dotmode =			(1<<0),
-		Shftldrt =				(1<<2),
-		Dotclkrt =				(1<<3),
-		Shiftfour =			(1<<4),
-		Scroff =				(1<<5),
+		Dotmode =		(1<<0),
+		Shftldrt =		(1<<2),
+		Dotclkrt =		(1<<3),
+		Shiftfour =		(1<<4),
+		Scroff =		(1<<5),
 
 	CrtcExt_Horizontcount =	0x01,
-		Htotal =				(1<<0),
-		Hblkstr =				(1<<1),
-		Hsyncstr =			(1<<2),
-		Hrsten =				(1<<3),
-		Hsyncoff =			(1<<4),
-		Vsyncoff =			(1<<5),
-		Hblkend =				(1<<6),
-		Vrsten =				(1<<7),
+		Htotal =		(1<<0),
+		Hblkstr =		(1<<1),
+		Hsyncstr =		(1<<2),
+		Hrsten =		(1<<3),
+		Hsyncoff =		(1<<4),
+		Vsyncoff =		(1<<5),
+		Hblkend =		(1<<6),
+		Vrsten =		(1<<7),
 
 	CrtcExt_Miscellaneous =	0x03,
-		Mgamode =			(1<<7),
+		Mgamode =		(1<<7),
 
-	Dac_Xpixclkctrl =		0x1a,
-		Pixclksl = 				(3<<0),
-		Pixclkdis =			(1<<2),
-		Pixpllpdn =			(1<<3),
+	Dac_Xpixclkctrl =	0x1a,
+		Pixclksl = 		(3<<0),
+		Pixclkdis =		(1<<2),
+		Pixpllpdn =		(1<<3),
 
-	Dac_Xpixpllstat =		0x4f,
-		Pixlock = 				(1<<6),
+	Dac_Xpixpllstat =	0x4f,
+		Pixlock = 		(1<<6),
 	
 	Dac_Xpixpllan =		0x45,
 	Dac_Xpixpllbn =		0x49,
-	Dac_Xpixpllcn  =		0x4d,
+	Dac_Xpixpllcn  =	0x4d,
 
 	Dac_Xpixpllam =		0x44, 
 	Dac_Xpixpllbm =		0x48,
@@ -122,7 +122,7 @@ enum {
 	Dac_Xpixpllcp =		0x4e,
 
 	Dac_Xmulctrl =		0x19,
-		ColorDepth =			(7<<0),
+		ColorDepth =		(7<<0),
 			_8bitsPerPixel = 		0,
 			_15bitsPerPixel =		1,
 			_16bitsPerPixel =		2,
@@ -130,33 +130,33 @@ enum {
 			_32bitsPerPixelWithOv = 	4,
 			_32bitsPerPixel	=		7,
 
-	Dac_Xpanelmode =		0x1f,
+	Dac_Xpanelmode =	0x1f,
 
 	Dac_Xmiscctrl =		0x1e,
-		Dacpdn =				(1<<0),
-		Mfcsel =				(3<<1),
-		Vga8dac =			(1<<3),
-		Ramcs =				(1<<4),
-		Vdoutsel =			(7<<5),
-
-	Dac_Xcurctrl =			0x06,
-		CursorDis = 			0,
+		Dacpdn =		(1<<0),
+		Mfcsel =		(3<<1),
+		Vga8dac =		(1<<3),
+		Ramcs =			(1<<4),
+		Vdoutsel =		(7<<5),
+
+	Dac_Xcurctrl =		0x06,
+		CursorDis = 		0,
 		Cursor3Color = 		1,
-		CursorXGA = 			2,
-		CursorX11 = 			3,
-		Cursor16Color = 		4,
+		CursorXGA = 		2,
+		CursorX11 = 		3,
+		Cursor16Color = 	4,
 
 	Dac_Xzoomctrl =		0x38,
 
 	Misc_loaddsel =			(1<<0),
 	Misc_rammapen =			(1<<1),
-	Misc_clksel =				(3<<2),
+	Misc_clksel =			(3<<2),
 	Misc_videodis =			(1<<4),
-	Misc_hpgoddev = 			(1<<5),
+	Misc_hpgoddev = 		(1<<5),
 	Misc_hsyncpol =			(1<<6),
 	Misc_vsyncpol =			(1<<7),
 
-	MNP_TABLE_SIZE =		64,
+	MNP_TABLE_SIZE =	64,
 
 	TRUE = 	(1 == 1),
 	FALSE = (1 == 0),
@@ -164,12 +164,12 @@ enum {
 
 typedef struct {
 	Pcidev*	pci;
-	int		devid;
-	int		revid;
+	int	devid;
+	int	revid;
 	
-	ulong	mmio;
-	ulong	mmfb;
-	int		fbsize;
+	uchar*	mmio;
+	uchar*	mmfb;
+	int	fbsize;
 	ulong	iload;
 
 	uchar	syspll_m;
@@ -272,13 +272,13 @@ mgaread32(Mga* mga, int index)
 static void
 mgawrite8(Mga* mga, int index, uchar val)
 {
-	((uchar*)mga->mmio)[index] = val;
+	mga->mmio[index] = val;
 }
 
 static uchar
 mgaread8(Mga* mga, int index)
 {
-	return ((uchar*)mga->mmio)[index];
+	return mga->mmio[index];
 }
 
 static uchar
@@ -464,7 +464,7 @@ static void
 mapmga4xx(Vga* vga, Ctlr* ctlr)
 {
 	int 	f;
-	long 	m;
+	uchar* 	m;
 	Mga *	mga;
 
 	if(vga->private == nil)
@@ -479,22 +479,22 @@ mapmga4xx(Vga* vga, Ctlr* ctlr)
 		error("%s: can't set mga type\n", ctlr->name);
 	
 	m = segattach(0, "mga4xxmmio", 0, 16*Kilo);
-	if(m == -1)
+	if(m == (void*)-1)
 		error("%s: can't attach mga4xxmmio segment\n", ctlr->name);
 	mga->mmio = m;
-	trace("%s: mmio at 0x%lx\n", ctlr->name, mga->mmio);
+	trace("%s: mmio at %#p\n", ctlr->name, mga->mmio);
 
 	m = segattach(0, "mga4xxscreen", 0, 32*Meg);
-	if(m == -1) {
+	if(m == (void*)-1) {
 		mga->mgaapsize = 8*Meg;
 		m = segattach(0, "mga4xxscreen", 0, 8*Meg);
-		if(m == -1)
+		if(m == (void*)-1)
 			error("%s: can't attach mga4xxscreen segment\n", ctlr->name);
 	} else {
 		mga->mgaapsize = 32*Meg;
 	}
 	mga->mmfb = m;
-	trace("%s: frame buffer at 0x%lx\n", ctlr->name, mga->mmfb);
+	trace("%s: frame buffer at %#p\n", ctlr->name, mga->mmfb);
 
 	close(f);
 }
@@ -544,13 +544,13 @@ snarf(Vga* vga, Ctlr* ctlr)
 	/* First Set MGA Mode ... */
 	crtcext3 = crtcextset(mga, 3, 0x80, 0x00);
 
-	p = (uchar*)mga->mmfb;
+	p = mga->mmfb;
 	n = (mga->mgaapsize / Meg) / 2;
 	for (i = 0; i < n; i++) {
 		k = (2*i+1)*Meg;
 		p[k] = 0;
 		p[k] = i+1;
-		*((uchar*)(mga->mmio + CACHEFLUSH)) = 0;
+		*(mga->mmio + CACHEFLUSH) = 0;
 		x[i] = p[k];
 		trace("x[%d]=%d\n", i, x[i]);
 	}
@@ -1064,7 +1064,7 @@ init(Vga* vga, Ctlr* ctlr)
 	mga = vga->private;
 	mode = vga->mode;
 
-	trace("mga mmio at 0x%lx\n", mga->mmio);
+	trace("mga mmio at %#p\n", mga->mmio);
 
 	ctlr->flag |= Ulinear;
 
@@ -1417,7 +1417,7 @@ load(Vga* vga, Ctlr* ctlr)
 	if (mode->z == 8)
 		setpalettedepth(mode->z);
 
-	trace("mga mmio at 0x%lx\n", mga->mmio);
+	trace("mga mmio at %#p\n", mga->mmio);
 	trace("mga: loading vga registers ...\n" );
 	if (ultradebug) Bflush(&stdout);
 
@@ -1578,7 +1578,7 @@ load(Vga* vga, Ctlr* ctlr)
 	trace("screen enabled ...\n");
 
 	if (0) {
-		p = (uchar*)mga->mmfb;
+		p = mga->mmfb;
 		for (i = 0; i < mga->fbsize; i++)
 			*p++ = (0xff & i);
 	}

sys/src/cmd/aux/vga/nvidia.c

@@ -130,7 +130,7 @@ snarf(Vga* vga, Ctlr* ctlr)
 {
 	Nvidia *nv;
 	Pcidev *p;
-	ulong m, *mmio, tmp;
+	ulong *mmio, tmp;
 	int implementation;
 
 	if(vga->private == nil){
@@ -192,14 +192,14 @@ snarf(Vga* vga, Ctlr* ctlr)
 		}
 		vgactlw("type", ctlr->name);
 
-		if((m = segattach(0, "nvidiammio", 0, p->mem[0].size)) == -1)
+		mmio = segattach(0, "nvidiammio", 0, p->mem[0].size);
+		if(mmio == (void*)-1)
 			error("%s: segattach nvidiammio, size %d: %r\n",
 				ctlr->name, p->mem[0].size);
 
 		nv->pci = p;
-		nv->mmio = (ulong*)m;
+		nv->mmio = mmio;
 
-		mmio = (ulong*)m;
 		nv->pfb = mmio+0x00100000/4;
 		nv->pramdac = mmio+0x00680000/4;
 		nv->pextdev = mmio+0x00101000/4;

sys/src/cmd/aux/vga/t2r4.c

@@ -11,7 +11,7 @@
 typedef struct {
 	Pcidev*	pci;
 	ulong	io;
-	ulong	mmio;
+	uchar*	mmio;
 
 	ulong	ioreg[13];
 	ulong	g[25];
@@ -90,7 +90,7 @@ _rgb524xo(Vga* vga, int index, uchar data)
 static void
 snarf(Vga* vga, Ctlr* ctlr)
 {
-	long m;
+	ulong *mmio;
 	int f, i, x;
 	Pcidev *p;
 	T2r4 *t2r4;
@@ -113,13 +113,14 @@ snarf(Vga* vga, Ctlr* ctlr)
 			error("%s: can't set type\n", ctlr->name);
 		close(f);
 	
-		if((m = segattach(0, "t2r4mmio", 0, p->mem[4].size)) == -1)
+		mmio = segattach(0, "t2r4mmio", 0, p->mem[4].size);
+		if(mmio == (void*)-1)
 			error("%s: can't attach mmio segment\n", ctlr->name);
 
 		t2r4 = vga->private;
 		t2r4->pci = p;
 		t2r4->io = p->mem[5].bar & ~0x0F;
-		t2r4->mmio = m;
+		t2r4->mmio = (uchar*)mmio;
 	}
 	t2r4 = vga->private;
 	for(i = 0; i < nelem(t2r4->ioreg); i++)

sys/src/cmd/disk/prep/calc.y

@@ -80,6 +80,7 @@ mkOP(int ty, Exp *e1, Exp *e2)
 static char *inp;
 static jmp_buf jmp;
 static vlong dot, size, dollar;
+static char** errp;
 
 static int
 yylex(void)
@@ -101,7 +102,8 @@ yylex(void)
 static void
 yyerror(char *s)
 {
-	longjmp(jmp, (int)s);
+	*errp = s;
+	longjmp(jmp, 1);
 }
 
 static vlong
@@ -143,7 +145,8 @@ parseexpr(char *s, vlong xdot, vlong xdollar, vlong xsize, vlong *result)
 {
 	char *err;
 
-	if(err = (char*)setjmp(jmp))
+	errp = &err;
+	if(setjmp(jmp))
 		return err;
 
 	inp = s;

sys/src/cmd/exportfs/exportfs.h

@@ -15,11 +15,11 @@ typedef struct Qidtab Qidtab;
 struct Fsrpc
 {
 	int	busy;		/* Work buffer has pending rpc to service */
-	int	pid;		/* Pid of slave process executing the rpc */
+	uintptr	pid;		/* Pid of slave process executing the rpc */
 	int	canint;		/* Interrupt gate */
 	int	flushtag;	/* Tag on which to reply to flush */
-	Fcall work;		/* Plan 9 incoming Fcall */
-	uchar	*buf;	/* Data buffer */
+	Fcall	work;		/* Plan 9 incoming Fcall */
+	uchar	*buf;		/* Data buffer */
 };
 
 struct Fid
@@ -53,7 +53,7 @@ struct File
 
 struct Proc
 {
-	int	pid;
+	uintptr	pid;
 	int	busy;
 	Proc	*next;
 };

sys/src/cmd/exportfs/exportsrv.c

@@ -56,7 +56,7 @@ Xflush(Fsrpc *t)
 
 	for(w = Workq; w < e; w++) {
 		if(w->work.tag == t->work.oldtag) {
-			DEBUG(DFD, "\tQ busy %d pid %d can %d\n", w->busy, w->pid, w->canint);
+			DEBUG(DFD, "\tQ busy %d pid %p can %d\n", w->busy, w->pid, w->canint);
 			if(w->busy && w->pid) {
 				w->flushtag = t->work.tag;
 				DEBUG(DFD, "\tset flushtag %d\n", t->work.tag);
@@ -394,7 +394,7 @@ Xwstat(Fsrpc *t)
 		return;
 	}
 	strings = emallocz(t->work.nstat);	/* ample */
-	if(convM2D(t->work.stat, t->work.nstat, &d, strings) < 0){
+	if(convM2D(t->work.stat, t->work.nstat, &d, strings) <= BIT16SZ){
 		rerrstr(err, sizeof err);
 		reply(&t->work, &rhdr, err);
 		t->busy = 0;
@@ -429,7 +429,7 @@ void
 slave(Fsrpc *f)
 {
 	Proc *p;
-	int pid;
+	uintptr pid;
 	Fcall rhdr;
 	static int nproc;
 
@@ -452,7 +452,7 @@ slave(Fsrpc *f)
 			if(p->busy == 0) {
 				f->pid = p->pid;
 				p->busy = 1;
-				pid = rendezvous(p->pid, (ulong)f);
+				pid = (uintptr)rendezvous((void*)p->pid, f);
 				if(pid != p->pid)
 					fatal("rendezvous sync fail");
 				return;
@@ -481,7 +481,7 @@ slave(Fsrpc *f)
 			p->next = Proclist;
 			Proclist = p;
 
-			rendezvous(pid, (ulong)p);
+			rendezvous((void*)pid, p);
 		}
 	}
 }
@@ -492,20 +492,20 @@ blockingslave(void)
 	Fsrpc *p;
 	Fcall rhdr;
 	Proc *m;
-	int pid;
+	uintptr pid;
 
 	notify(flushaction);
 
 	pid = getpid();
 
-	m = (Proc*)rendezvous(pid, 0);
+	m = rendezvous((void*)pid, 0);
 	
 	for(;;) {
-		p = (Fsrpc*)rendezvous(pid, pid);
-		if((int)p == ~0)			/* Interrupted */
+		p = rendezvous((void*)pid, (void*)pid);
+		if(p == (void*)~0)			/* Interrupted */
 			continue;
 
-		DEBUG(DFD, "\tslave: %d %F b %d p %d\n", pid, &p->work, p->busy, p->pid);
+		DEBUG(DFD, "\tslave: %p %F b %d p %p\n", pid, &p->work, p->busy, p->pid);
 		if(p->flushtag != NOTAG)
 			goto flushme;
 

sys/src/cmd/fossil/cache.c

@@ -281,7 +281,7 @@ cacheDump(Cache *c)
 
 	for(i = 0; i < c->nblocks; i++){
 		b = &c->blocks[i];
-		fprint(2, "%d. p=%d a=%ud %V t=%d ref=%d state=%s io=%s pc=0x%lux\n",
+		fprint(2, "%d. p=%d a=%ud %V t=%d ref=%d state=%s io=%s pc=%#p\n",
 			i, b->part, b->addr, b->score, b->l.type, b->ref,
 			bsStr(b->l.state), bioStr(b->iostate), b->pc);
 	}

sys/src/cmd/fossil/dat.h

@@ -214,7 +214,7 @@ struct Block {
 	Cache *c;
 	int ref;
 	int nlock;
-	ulong	pc;		/* pc that fetched this block from the cache */
+	uintptr	pc;		/* pc that fetched this block from the cache */
 
 	VtLock *lk;
 

sys/src/cmd/fossil/disk.c

@@ -270,7 +270,7 @@ diskSize(Disk *disk, int part)
 	return partEnd(disk, part) - partStart(disk, part);
 }
 
-static ulong
+static uintptr
 mypc(int x)
 {
 	return getcallerpc(&x);

sys/src/cmd/grep/comp.c

@@ -114,8 +114,14 @@ loop:
 		break;
 
 	case Tend:
-		if(c == '\n')
-			matched = 1;
+		if(c == '\n') {
+			if(r->next == 0) {
+				matched = 1;
+				break;
+			}
+			r = r->next;
+			goto loop;
+		}
 		break;
 
 	case Tclass:

sys/src/cmd/grep/main.c

@@ -1,7 +1,7 @@
 #define	EXTERN
 #include	"grep.h"
 
-char *validflags = "bchiLlnsv";
+char *validflags = "1bchiLlnsv";
 void
 usage(void)
 {

sys/src/cmd/gzip/gunzip.c

@@ -324,7 +324,7 @@ crcwrite(void *out, void *buf, int n)
 
 	wlen += n;
 	crc = blockcrc(crctab, crc, buf, n);
-	fd = (int)out;
+	fd = (int)(uintptr)out;
 	if(fd < 0)
 		return n;
 	nw = write(fd, buf, n);

sys/src/cmd/gzip/gzip.c

@@ -187,7 +187,7 @@ crcread(void *fd, void *buf, int n)
 
 	nr = 0;
 	for(; !eof && n > 0; n -= m){
-		m = read((int)fd, (char*)buf+nr, n);
+		m = read((int)(uintptr)fd, (char*)buf+nr, n);
 		if(m <= 0){
 			eof = 1;
 			if(m < 0)

sys/src/cmd/gzip/unzip.c

@@ -630,7 +630,7 @@ crcwrite(void *out, void *buf, int n)
 
 	wlen += n;
 	crc = blockcrc(crctab, crc, buf, n);
-	fd = (int)out;
+	fd = (int)(uintptr)out;
 	if(fd < 0)
 		return n;
 	nw = write(fd, buf, n);

sys/src/cmd/gzip/zip.c

@@ -324,7 +324,7 @@ crcread(void *fd, void *buf, int n)
 
 	nr = 0;
 	for(; !eof && n > 0; n -= m){
-		m = read((int)fd, (char*)buf+nr, n);
+		m = read((int)(uintptr)fd, (char*)buf+nr, n);
 		if(m <= 0){
 			eof = 1;
 			if(m < 0)

sys/src/cmd/hget.c

@@ -799,7 +799,7 @@ hhauth(char *p, URL *u, Range*)
 	if (gettokens(p, f, nelem(f), "\"") < 2)
 		sysfatal("garbled auth data");
 
-	if ((up = auth_getuserpasswd(auth_getkey, "proto=pass service=http dom=%q relm=%q",
+	if ((up = auth_getuserpasswd(auth_getkey, "proto=pass service=http server=%q realm=%q",
 	    	u->host, f[1])) == nil)
 			sysfatal("cannot authenticate");
 

sys/src/cmd/iostats/statfs.h

@@ -11,7 +11,7 @@
 
 enum{
 	Maxfdata	= 8192,	/* max size of data in 9P message */
-	Maxrpc	= 20000,	/* number of RPCs we'll log */
+	Maxrpc		= 20000,/* number of RPCs we'll log */
 };
 
 typedef struct Fsrpc Fsrpc;
@@ -56,7 +56,7 @@ struct Stats
 struct Fsrpc
 {
 	int	busy;			/* Work buffer has pending rpc to service */
-	int	pid;			/* Pid of slave process executing the rpc */
+	uintptr	pid;			/* Pid of slave process executing the rpc */
 	int	canint;			/* Interrupt gate */
 	int	flushtag;		/* Tag on which to reply to flush */
 	Fcall	work;			/* Plan 9 incoming Fcall */
@@ -74,7 +74,7 @@ struct Fid
 	ulong	nwrite;
 	ulong	bread;
 	ulong	bwrite;
-	vlong	offset;	/* for directories */
+	vlong	offset;			/* for directories */
 };
 
 struct File
@@ -89,7 +89,7 @@ struct File
 
 struct Proc
 {
-	int	pid;
+	uintptr	pid;
 	int	busy;
 	Proc	*next;
 };
@@ -112,7 +112,7 @@ Extern int	done;
 Extern Stats	*stats;
 Extern Frec	*frhead;
 Extern Frec	*frtail;
-Extern int		myiounit;
+Extern int	myiounit;
 
 /* File system protocol service procedures */
 void Xcreate(Fsrpc*), Xclunk(Fsrpc*); 

sys/src/cmd/iostats/statsrv.c

@@ -8,10 +8,10 @@
 char Ebadfid[]	= "Bad fid";
 char Enotdir[]	="Not a directory";
 char Edupfid[]	= "Fid already in use";
-char	Eopen[]	= "Fid already opened";
-char	Exmnt[]	= "Cannot .. past mount point";
-char	Enoauth[]	= "iostats: Authentication failed";
-char	Ebadver[]	= "Unrecognized 9P version";
+char Eopen[]	= "Fid already opened";
+char Exmnt[]	= "Cannot .. past mount point";
+char Enoauth[]	= "iostats: Authentication failed";
+char Ebadver[]	= "Unrecognized 9P version";
 
 int
 okfile(char *s, int mode)
@@ -98,7 +98,7 @@ Xflush(Fsrpc *r)
 
 	for(t = Workq; t < e; t++) {
 		if(t->work.tag == r->work.oldtag) {
-			DEBUG(2, "\tQ busy %d pid %d can %d\n", t->busy, t->pid, t->canint);
+			DEBUG(2, "\tQ busy %d pid %p can %d\n", t->busy, t->pid, t->canint);
 			if(t->busy && t->pid) {
 				t->flushtag = r->work.tag;
 				DEBUG(2, "\tset flushtag %d\n", r->work.tag);
@@ -412,7 +412,7 @@ void
 slave(Fsrpc *f)
 {
 	Proc *p;
-	int pid;
+	uintptr pid;
 	static int nproc;
 
 	for(;;) {
@@ -420,7 +420,7 @@ slave(Fsrpc *f)
 			if(p->busy == 0) {
 				f->pid = p->pid;
 				p->busy = 1;
-				pid = rendezvous(p->pid, (ulong)f);
+				pid = (uintptr)rendezvous((void*)p->pid, f);
 				if(pid != p->pid)
 					fatal("rendezvous sync fail");
 				return;
@@ -446,7 +446,7 @@ slave(Fsrpc *f)
 		p->next = Proclist;
 		Proclist = p;
 
-		rendezvous(pid, (ulong)p);
+		rendezvous((void*)pid, p);
 	}
 }
 
@@ -454,7 +454,7 @@ void
 blockingslave(void)
 {
 	Proc *m;
-	int pid;
+	uintptr pid;
 	Fsrpc *p;
 	Fcall thdr;
 
@@ -462,14 +462,14 @@ blockingslave(void)
 
 	pid = getpid();
 
-	m = (Proc*)rendezvous(pid, 0);
+	m = rendezvous((void*)pid, 0);
 		
 	for(;;) {
-		p = (Fsrpc*)rendezvous(pid, pid);
-		if((int)p == ~0)			/* Interrupted */
+		p = rendezvous((void*)pid, (void*)pid);
+		if(p == (void*)~0)			/* Interrupted */
 			continue;
 
-		DEBUG(2, "\tslave: %d %F b %d p %d\n", pid, &p->work, p->busy, p->pid);
+		DEBUG(2, "\tslave: %p %F b %d p %p\n", pid, &p->work, p->busy, p->pid);
 		if(p->flushtag != NOTAG)
 			return;
 

sys/src/cmd/ip/ppp/ppp.c

@@ -1549,7 +1549,7 @@ ipopen(PPP *ppp)
 		ppp->ipcfd = cfd;
 
 		/* signal main() that ip is configured */
-		rendezvous(Rmagic, 0);
+		rendezvous((void*)Rmagic, 0);
 
 		switch(ipinprocpid = rfork(RFPROC|RFMEM|RFNOWAIT)){
 		case -1:
@@ -2810,7 +2810,7 @@ main(int argc, char **argv)
 	pppopen(ppp, mediain, mediaout, net, ipaddr, remip, mtu, framing);
 
 	/* wait until ip is configured */
-	rendezvous(Rmagic, 0);
+	rendezvous((void*)Rmagic, 0);
 
 	if(primary){
 		/* create a /net/ndb entry */

sys/src/cmd/ip/pptpd.c

@@ -1209,7 +1209,7 @@ esignal(Event *e)
 	}
 	assert(e->ready == 0);
 	e->wait = 0;
-	rendezvous((ulong)e, 1);
+	rendezvous(e, (void*)1);
 	qunlock(e);
 }
 
@@ -1224,7 +1224,7 @@ ewait(Event *e)
 	} else {	
 		e->wait = 1;
 		qunlock(e);
-		rendezvous((ulong)e, 2);
+		rendezvous(e, (void*)2);
 		qlock(e);
 	}
 	qunlock(e);

sys/src/cmd/ip/telnet.c

@@ -31,7 +31,7 @@ char*	system(int, char*);
 int	echochange(Biobuf*, int);
 int	termsub(Biobuf*, uchar*, int);
 int	xlocsub(Biobuf*, uchar*, int);
-void*	share(int);
+void*	share(ulong);
 
 static int islikeatty(int);
 
@@ -520,14 +520,16 @@ islikeatty(int fd)
  *  end of process memory.
  */
 void*
-share(int len)
+share(ulong len)
 {
 	uchar *vastart;
 
 	vastart = sbrk(0);
+	if(vastart == (void*)-1)
+		return 0;
 	vastart += 2*1024*1024;
 
-	if(segattach(0, "shared", vastart, len) < 0)
+	if(segattach(0, "shared", vastart, len) == (void*)-1)
 		return 0;
 
 	return vastart;

sys/src/cmd/ip/telnetd.c

@@ -43,7 +43,7 @@ int	xlocchange(Biobuf*, int);
 int	xlocsub(Biobuf*, uchar*, int);
 int	challuser(char*);
 int	noworldlogin(char*);
-void*	share(int);
+void*	share(ulong);
 int	doauth(char*);
 
 #define TELNETLOG "telnet"
@@ -545,14 +545,16 @@ xlocsub(Biobuf *bp, uchar *sub, int n)
  *  end of process memory.
  */
 void*
-share(int len)
+share(ulong len)
 {
 	uchar *vastart;
 
 	vastart = sbrk(0);
+	if(vastart == (void*)-1)
+		return 0;
 	vastart += 2*1024*1024;
 
-	if(segattach(0, "shared", vastart, len) < 0)
+	if(segattach(0, "shared", vastart, len) == (void*)-1)
 		return 0;
 
 	return vastart;

sys/src/cmd/ktrace.c

@@ -7,6 +7,7 @@
 static	int	rtrace(uvlong, uvlong, uvlong);
 static	int	ctrace(uvlong, uvlong, uvlong);
 static	int	i386trace(uvlong, uvlong, uvlong);
+static	int	amd64trace(uvlong, uvlong, uvlong);
 static	uvlong	getval(uvlong);
 static	void	inithdr(int);
 static	void	fatal(char*, ...);
@@ -42,16 +43,16 @@ printaddr(char *addr, uvlong pc)
 			if(!isxdigit(addr[i]))
 				break;
 		if(i == 8){
-			print("src(0x%.8llux); // 0x%s\n", pc, addr);
+			print("src(%#.8llux); // 0x%s\n", pc, addr);
 			return;
 		}
 	}
 
 	if(p=strchr(addr, '+')){
 		*p++ = 0;
-		print("src(0x%.8llux); // %s+0x%s\n", pc, addr, p);
+		print("src(%#.8llux); // %s+0x%s\n", pc, addr, p);
 	}else
-		print("src(0x%.8llux); // %s\n", pc, addr);
+		print("src(%#.8llux); // %s\n", pc, addr);
 }
 
 static void (*fmt)(char*, uvlong) = printaddr;
@@ -94,9 +95,11 @@ main(int argc, char *argv[])
 	inithdr(fd);
 	switch(fhdr.magic){
 	case I_MAGIC:	/* intel 386 */
-	case S_MAGIC:	/* amd64 */
 		t = i386trace;
 		break;
+	case S_MAGIC:	/* amd64 */
+		t = amd64trace;
+		break;
 	case A_MAGIC:	/* 68020 */
 	case J_MAGIC:	/* intel 960 */
 		t = ctrace;
@@ -189,7 +192,7 @@ ctrace(uvlong pc, uvlong sp, uvlong link)
 	while(pc && opc != pc) {
 		moved = pc2sp(pc);
 		if (moved == ~0){
-			print("pc2sp(%.8llux) = -1 %r\n", pc);
+			print("pc2sp(%#.8llux) = -1 %r\n", pc);
 			break;
 		}
 		found = findsym(pc, CTEXT, &s);
@@ -235,7 +238,7 @@ i386trace(uvlong pc, uvlong sp, uvlong link)
 			sp += f.value-mach->szaddr;
 		}else if(strcmp(s.name, "forkret") == 0){
 //XXX
-			print("//passing interrupt frame; last pc found at sp=%llux\n", osp);
+			print("//passing interrupt frame; last pc found at sp=%#llux\n", osp);
 
 			sp +=  15 * mach->szaddr;		/* pop interrupt frame */
 		}
@@ -244,12 +247,12 @@ i386trace(uvlong pc, uvlong sp, uvlong link)
 //XXX
 		if(pc == 0 && strcmp(s.name, "forkret") == 0){
 			sp += 3 * mach->szaddr;			/* pop iret eip, cs, eflags */
-			print("//guessing call through invalid pointer, try again at sp=%llux\n", sp);
+			print("//guessing call through invalid pointer, try again at sp=%#llux\n", sp);
 			s.name = "";
 			pc = getval(sp);
 		}
 		if(pc == 0) {
-			print("//didn't find pc at sp=%llux, last pc found at sp=%llux\n", sp, osp);
+			print("//didn't find pc at sp=%#llux, last pc found at sp=%#llux\n", sp, osp);
 			break;
 		}
 		osp = sp;
@@ -265,6 +268,68 @@ i386trace(uvlong pc, uvlong sp, uvlong link)
 	return i;
 }
 
+static int
+amd64trace(uvlong pc, uvlong sp, uvlong link)
+{
+	int i, isintrr;
+	uvlong osp;
+	Symbol s, f;
+	char buf[128];
+
+	USED(link);
+	i = 0;
+	osp = 0;
+	while(findsym(pc, CTEXT, &s)) {
+
+		symoff(buf, sizeof buf, pc, CANY);
+		fmt(buf, pc);
+
+		if(strcmp(s.name, "_intrr") == 0)
+			isintrr = 1;
+		else
+			isintrr = 0;
+		if(pc != s.value) {	/* not at first instruction */
+			if(findlocal(&s, FRAMENAME, &f) == 0)
+				break;
+			sp += f.value-mach->szaddr;
+		}
+		else if(isintrr){
+			print("//passing interrupt frame; last pc found at sp=%#llux\n", osp);
+			/*
+			 * Pop interrupt frame (ureg.h) up to the IP value.
+			 */
+			sp += 19 * mach->szaddr;
+		}
+
+		pc = getval(sp);
+		if(pc == 0 && isintrr){
+			/*
+			 * Pop IP, CS and FLAGS to get to the SP.
+			 * The AMD64 aligns the interrupt stack on
+			 * a 16-byte boundary so have the get the
+			 * SP from the saved frame.
+			 */
+			sp += 3 * mach->szaddr;
+			print("//guessing call through invalid pointer; try again at sp=%#llux\n", sp);
+			s.name = "";
+			sp = getval(sp);
+			pc = getval(sp);
+		}
+		if(pc == 0) {
+			print("//didn't find pc at sp=%#llux, last pc found at sp=%#llux\n", sp, osp);
+			break;
+		}
+		osp = sp;
+
+		if(!isintrr)
+			sp += mach->szaddr;
+
+		if(++i > 40)
+			break;
+	}
+	return i;
+}
+
 int naddr;
 uvlong addr[1024];
 uvlong val[1024];
@@ -305,20 +370,23 @@ getval(uvlong a)
 {
 	char buf[256];
 	int i, n;
+	uvlong r;
 
 	if(interactive){
-		print("// data at 0x%8.8llux? ", a);
+		print("// data at %#8.8llux? ", a);
 		n = read(0, buf, sizeof(buf)-1);
 		if(n <= 0)
 			return 0;
 		buf[n] = '\0';
-		return strtoull(buf, 0, 16);
+		r = strtoull(buf, 0, 16);
 	}else{
+		r = 0;
 		for(i=0; i<naddr; i++)
 			if(addr[i] == a)
-				return val[i];
-		return 0;
+				r = val[i];
 	}
+
+	return r;
 }
 
 static void

sys/src/cmd/lex/ldefs.h

@@ -88,6 +88,7 @@ extern int *name;
 extern int *left;
 extern int *right;
 extern int *parent;
+extern uchar **ptr;
 extern uchar *nullstr;
 extern int tptr;
 extern uchar pushc[TOKENSIZE];
@@ -152,6 +153,7 @@ extern int	member(int, uchar *);
 extern void	mkmatch(void);
 extern int	mn0(int);
 extern int	mn1(int, int);
+extern int	mnp(int, void*);
 extern int	mn2(int, int, int);
 extern void	munputc(int);
 extern void	munputs(uchar *);

sys/src/cmd/lex/lmain.c

@@ -45,6 +45,7 @@ int *left;
 int *right;
 int *parent;
 uchar *nullstr;
+uchar **ptr;
 int tptr;
 uchar pushc[TOKENSIZE];
 uchar slist[STARTSIZE];

sys/src/cmd/lex/parser.y

@@ -120,13 +120,13 @@ r:	CHAR
 			}
 		else
 			p = psave;
-		$$.i = mn1(RCCL,(int)p);
+		$$.i = mnp(RCCL, (uchar*)p);
 		cclinter(1);
 		}
 	| CCL
-	={	$$.i = mn1(RCCL,$1.i); }
+	={	$$.i = mnp(RCCL,$1.cp); }
 	| NCCL
-	={	$$.i = mn1(RNCCL,$1.i); }
+	={	$$.i = mnp(RNCCL,$1.cp); }
 	| r '*'
 	={	$$.i = mn1(STAR,$1.i); }
 	| r '+'
@@ -228,6 +228,7 @@ yylex(void)
 
 # ifdef DEBUG
 	yylval.i = 0;
+	yylval.p = 0;
 # endif
 
 	if(sect == DEFSECTION) {		/* definitions section */

sys/src/cmd/lex/sub1.c

@@ -332,17 +332,35 @@ mn2(int a, int d, int c)
 }
 
 int
-mn1(int a, int d)
+mnp(int a, void *p)
 {
 	name[tptr] = a;
-	left[tptr] = d;
+	left[tptr] = 0;
 	parent[tptr] = 0;
 	nullstr[tptr] = 0;
+	ptr[tptr] = p;
 	switch(a){
 	case RCCL:
 	case RNCCL:
-		if(strlen((char *)d) == 0) nullstr[tptr] = TRUE;
+		if(strlen(p) == 0) nullstr[tptr] = TRUE;
 		break;
+	default:
+		warning("bad switch mnp %d %P", a, p);
+		break;
+	}
+	if(tptr > treesize)
+		error("Parse tree too big %s",(treesize == TREESIZE?"\nTry using %e num":""));
+	return(tptr++);
+}
+
+int
+mn1(int a, int d)
+{
+	name[tptr] = a;
+	left[tptr] = d;
+	parent[tptr] = 0;
+	nullstr[tptr] = 0;
+	switch(a){
 	case STAR:
 	case QUEST:
 		nullstr[tptr] = TRUE;

sys/src/cmd/lex/sub2.c

@@ -22,7 +22,7 @@ cfoll(int v)
 			else if(i == RCCL || i == RNCCL){	/* compress ccl list */
 				for(j=1; j<NCH;j++)
 					symbol[j] = (i==RNCCL);
-				p = (uchar *)left[v];
+				p = ptr[v];
 				while(*p)
 					symbol[*p++] = (i == RCCL);
 				p = pcptr;
@@ -36,7 +36,7 @@ cfoll(int v)
 				*pcptr++ = 0;
 				if(pcptr > pchar + pchlen)
 					error("Too many packed character classes");
-				left[v] = (int)p;
+				ptr[v] = p;
 				name[v] = RCCL;	/* RNCCL eliminated */
 # ifdef DEBUG
 				if(debug && *p){

sys/src/cmd/ndb/dns.h

@@ -241,7 +241,7 @@ struct RR
 	ulong	magic;
 	DN	*owner;		/* domain that owns this resource record */
 	uchar	negative;	/* this is a cached negative response */
-	ulong	pc;
+	uintptr	pc;
 	ulong	ttl;		/* time to live to be passed on */
 	ulong	expire;		/* time this entry expires locally */
 	ushort	type;		/* RR type */

sys/src/cmd/ql/asm.c

@@ -167,22 +167,22 @@ asmb(void)
 		lput(lcsize);
 		break;
 	case 1:
-		lput(0x4a6f7921);	/* Joy! */
-		lput(0x70656666);	/* peff */
-		lput(0x70777063);	/* pwpc */
+		lput(0x4a6f7921);		/* Joy! */
+		lput(0x70656666);		/* peff */
+		lput(0x70777063);		/* pwpc */
 		lput(1);
 		lput(0);
 		lput(0);
 		lput(0);
 		lput(0);
-		lput(0x30002);	/*YY*/
+		lput(0x30002);			/*YY*/
 		lput(0);
 		lput(~0);
 		lput(0);
 		lput(textsize+datsize);
 		lput(textsize+datsize);
 		lput(textsize+datsize);
-		lput(0xd0);	/* header size */
+		lput(0xd0);			/* header size */
 		lput(0x10400);
 		lput(~0);
 		lput(0);
@@ -215,16 +215,16 @@ asmb(void)
 		lput(0);
 		lput(0);
 		lput(0);
-		lput(0x3100);	/* load address */
+		lput(0x3100);			/* load address */
 		lput(0);
 		lput(0);
-		lput(0);	/* whew! */
+		lput(0);			/* whew! */
 		break;
 	case 2:
 		if(dlm)
 			lput(0x80000000 | (4*21*21+7));		/* magic */
 		else
-			lput(4*21*21+7);		/* magic */
+			lput(4*21*21+7);	/* magic */
 		lput(textsize);			/* sizes */
 		lput(datsize);
 		lput(bsssize);
@@ -242,21 +242,21 @@ asmb(void)
 		lput(symsize);			/* nsyms */
 		lput((0x48L<<16)|15L);		/* size of optional hdr and flags */
 
-		lput((0413<<16)|01L);	/* magic and version */
+		lput((0413<<16)|01L);		/* magic and version */
 		lput(textsize);			/* sizes */
 		lput(datsize);
 		lput(bsssize);
 		lput(entryvalue());		/* va of entry */
 		lput(INITTEXT);			/* va of base of text */
 		lput(INITDAT);			/* va of base of data */
-		lput(INITDAT);		/* address of TOC */
-		lput((1L<<16)|1);			/* sn(entry) | sn(text) */
+		lput(INITDAT);			/* address of TOC */
+		lput((1L<<16)|1);		/* sn(entry) | sn(text) */
 		lput((2L<<16)|1);		/* sn(data) | sn(toc) */
 		lput((0L<<16)|3);		/* sn(loader) | sn(bss) */
 		lput((3L<<16)|3);		/* maxalign(text) | maxalign(data) */
 		lput(('1'<<24)|('L'<<16)|0);	/* type field, and reserved */
-		lput(0);	/* max stack allowed */
-		lput(0);	/* max data allowed */
+		lput(0);			/* max stack allowed */
+		lput(0);			/* max data allowed */
 		lput(0); lput(0); lput(0);	/* reserved */
 
 		strnput(".text", 8);		/* text segment */
@@ -273,7 +273,7 @@ asmb(void)
 		lput(INITDAT);			/* address */
 		lput(INITDAT);
 		lput(datsize);
-		lput(rnd(HEADR+textsize, 4096));	/* sizes */
+		lput(rnd(HEADR+textsize, 4096));/* sizes */
 		lput(0L);
 		lput(0L);
 		lput(0L);
@@ -291,46 +291,46 @@ asmb(void)
 		break;
 	case 5:
 		strnput("\177ELF", 4);		/* e_ident */
-		CPUT(1);					/* class = 32 bit */
-		CPUT(2);					/* data = MSB */
-		CPUT(1);					/* version = CURRENT */
+		CPUT(1);			/* class = 32 bit */
+		CPUT(2);			/* data = MSB */
+		CPUT(1);			/* version = CURRENT */
 		strnput("", 9);
-		lput((2L<<16)|20L);			/* type = EXEC; machine = PowerPC */
-		lput(1L);					/* version = CURRENT */
+		lput((2L<<16)|20L);		/* type = EXEC; machine = PowerPC */
+		lput(1L);			/* version = CURRENT */
 		lput(entryvalue() & ~KMASK);	/* entry vaddr */
-		lput(52L);					/* offset to first phdr */
-		lput(0L);					/* offset to first shdr */
-		lput(0L);					/* flags = PPC */
-		lput((52L<<16)|32L);			/* Ehdr & Phdr sizes*/
-		lput((3L<<16)|0L);			/* # Phdrs & Shdr size */
-		lput((0L<<16)|0L);			/* # Shdrs & shdr string size */
-
-		lput(1L);					/* text - type = PT_LOAD */
-		lput(HEADR);				/* file offset */
-		lput(INITTEXT & ~KMASK);		/* vaddr */
-		lput(INITTEXT);				/* paddr */
-		lput(textsize);				/* file size */
-		lput(textsize);				/* memory size */
-		lput(0x05L);				/* protections = RX */
-		lput(0x10000L);			/* alignment code?? */
-
-		lput(1L);					/* data - type = PT_LOAD */
+		lput(52L);			/* offset to first phdr */
+		lput(0L);			/* offset to first shdr */
+		lput(0L);			/* flags = PPC */
+		lput((52L<<16)|32L);		/* Ehdr & Phdr sizes*/
+		lput((3L<<16)|0L);		/* # Phdrs & Shdr size */
+		lput((0L<<16)|0L);		/* # Shdrs & shdr string size */
+
+		lput(1L);			/* text - type = PT_LOAD */
+		lput(HEADR);			/* file offset */
+		lput(INITTEXT & ~KMASK);	/* vaddr */
+		lput(INITTEXT);			/* paddr */
+		lput(textsize);			/* file size */
+		lput(textsize);			/* memory size */
+		lput(0x05L);			/* protections = RX */
+		lput(0x10000L);			/* alignment */
+
+		lput(1L);			/* data - type = PT_LOAD */
 		lput(HEADR+textsize);		/* file offset */
 		lput(INITDAT & ~KMASK);		/* vaddr */
-		lput(INITDAT);				/* paddr */
-		lput(datsize);				/* file size */
-		lput(datsize);				/* memory size */
-		lput(0x07L);				/* protections = RWX */
-		lput(0x10000L);			/* alignment code?? */
+		lput(INITDAT);			/* paddr */
+		lput(datsize);			/* file size */
+		lput(datsize);			/* memory size */
+		lput(0x07L);			/* protections = RWX */
+		lput(0x10000L);			/* alignment */
 
-		lput(0L);					/* data - type = PT_NULL */
+		lput(0L);			/* data - type = PT_NULL */
 		lput(HEADR+textsize+datsize);	/* file offset */
 		lput(0L);
 		lput(0L);
-		lput(symsize);				/* symbol table size */
-		lput(lcsize);				/* line number size */
-		lput(0x04L);				/* protections = R */
-		lput(0x04L);				/* alignment code?? */
+		lput(symsize);			/* symbol table size */
+		lput(lcsize);			/* line number size */
+		lput(0x04L);			/* protections = R */
+		lput(0x04L);			/* alignment code?? */
 		break;
 	}
 	cflush();

sys/src/cmd/sam/acid.lib

@@ -58,14 +58,14 @@ defn filemenu(f)
 
 defn files()
 {
-	local i, f;
+	local i, f, fx, fp;
 	
-	i = 0;
-	tempfile = (List)tempfile;
-	if tempfile.nused == 0 then
+	fx = (List)file;
+	if fx.nused == 0 then
 		filemenu(*cmd);
-	loop 1,tempfile.nused do {
-		f = (File)tempfile.g.filep[i];
+	i = 0;
+	loop 1,fx.nused do {
+		f = (File)fx.g.filep[i];
 		filemenu(f);
 		i = i+1;
 	}

sys/src/cmd/scat/display.c

@@ -37,7 +37,7 @@ displaypic(Picture *pic)
 		/* release the memory as we hand it off; this could be a big piece of data */
 		a = pic->data;
 		while(n > 0){
-			i = 8192 - (((int)a)&8191);
+			i = 8192 - (((uintptr)a)&8191);
 			if(i > n)
 				i = n;
 			if(write(p[1], a, i)!=i)

sys/src/cmd/srvold9p/srvold9p.c

@@ -370,7 +370,7 @@ demux(void)
 		msg = emalloc(sizeof(Message));
 		msg->data = data;
 		msg->n = n;
-		rendezvous(r.tag, (ulong)msg);
+		rendezvous((void*)r.tag, msg);
 	}
 }
 
@@ -515,8 +515,8 @@ recv9p1(Fcall9p1 *r, int tag, char *data)
 	int n;
 	Message *msg;
 
-	msg = (Message*)rendezvous(tag, 0);
-	if((ulong)msg == ~0UL)
+	msg = rendezvous((void*)tag, 0);
+	if(msg == (void*)~0)
 		fatal("rendezvous: %r");
 	if(msg == nil){
 		if(debug)
@@ -577,7 +577,7 @@ rflush(Fcall *t, Fcall *, char *mdata9p1)
 		if(debug)
 			fprint(2, "wake up receiver\n");
 		oldt->received = 1;
-		rendezvous(t->oldtag, 0);
+		rendezvous((void*)t->oldtag, 0);
 	}
 	freetag(oldt);
 	qunlock(&taglock);

sys/src/cmd/ssh/sshserve.c

@@ -276,7 +276,7 @@ startcmd(Conn *c, char *cmd, int *kidpid, int *kidin)
 			}
 		default:
 			*kidpid = kpid;
-			rendezvous((ulong)kidpid, 0);
+			rendezvous(kidpid, 0);
 			for(;;){
 				if((w = wait()) == nil)
 					sysfatal("wait: %r");
@@ -301,7 +301,7 @@ startcmd(Conn *c, char *cmd, int *kidpid, int *kidin)
 		}
 	default:
 		atexitkill(pid);
-		rendezvous((ulong)kidpid, 0);
+		rendezvous(kidpid, 0);
 		break;
 	}
 

sys/src/cmd/syscall/syscall.c

@@ -5,7 +5,7 @@
 
 char	buf[8192];
 #define	NARG	5
-long	arg[NARG];
+uintptr	arg[NARG];
 
 /* system calls not defined in libc.h */
 int	sysr1(void);
@@ -35,7 +35,7 @@ struct{
 	0,		0
 };
 
-long parse(char *);
+uintptr parse(char *);
 void catch(void*, char*);
 
 char*
@@ -167,18 +167,19 @@ main(int argc, char *argv[])
 	exits("unknown");
 }
 
-long
+uintptr
 parse(char *s)
 {
 	char *t;
-	long l;
+	uintptr l;
 
 	if(strcmp(s, "buf") == 0)
-		return (int)buf;
-	l = strtoul(s, &t, 0);
+		return (uintptr)buf;
+	
+	l = strtoull(s, &t, 0);
 	if(t>s && *t==0)
 		return l;
-	return (long)s; 
+	return (uintptr)s; 
 }
 
 void

sys/src/cmd/tcs/conv.h

@@ -11,6 +11,8 @@ void gb_in(int fd, long *notused, struct convert *out);
 void gb_out(Rune *base, int n, long *notused);
 void uksc_in(int fd, long *notused, struct convert *out);
 void uksc_out(Rune *base, int n, long *notused);
+void html_in(int fd, long *notused, struct convert *out);
+void html_out(Rune *base, int n, long *notused);
 
 #define		emit(x)		*(*r)++ = (x)
 #define		NRUNE		65536

sys/src/cmd/tcs/mkfile

@@ -7,6 +7,7 @@ OFILES=tcs.$O\
 	conv_gb.$O\
 	conv_ksc.$O\
 	utf.$O\
+	html.$O\
 	kuten208.$O\
 	gb.$O\
 	ksc.$O\

sys/src/cmd/tcs/tcs.c

@@ -972,6 +972,41 @@ long tabnextstep[256] = 	/* From mduerst@ifi.unizh.ch (Martin J. Du"rst) */
 0x0142, 0x00F8, 0x0153, 0x00DF, 0x00FE, 0x00FF, 0xFFFF, 0xFFFF
 };
 
+long tabcp1250[256] = {	/* From Microsoft */
+0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007,
+0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F,
+0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017,
+0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F,
+0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027,
+0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F,
+0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037,
+0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F,
+0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047,
+0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F,
+0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057,
+0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F,
+0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067,
+0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F,
+0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077,
+0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F,
+0x20AC, 0xFFFD, 0x201A, 0xFFFD, 0x201E, 0x2026, 0x2020, 0x2021,
+0xFFFD, 0x2030, 0x0160, 0x2039, 0x015A, 0x0164, 0x017D, 0x0179,
+0xFFFD, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014,
+0xFFFD, 0x2122, 0x0161, 0x203A, 0x015B, 0x0165, 0x017E, 0x017A,
+0x00A0, 0x02C7, 0x02D8, 0x0141, 0x00A4, 0x0104, 0x00A6, 0x00A7,
+0x00A8, 0x00A9, 0x015E, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x017B,
+0x00B0, 0x00B1, 0x02DB, 0x0142, 0x00B4, 0x00B5, 0x00B6, 0x00B7,
+0x00B8, 0x0105, 0x015F, 0x00BB, 0x013D, 0x02DD, 0x013E, 0x017C,
+0x0154, 0x00C1, 0x00C2, 0x0102, 0x00C4, 0x0139, 0x0106, 0x00C7,
+0x010C, 0x00C9, 0x0118, 0x00CB, 0x011A, 0x00CD, 0x00CE, 0x010E,
+0x0110, 0x0143, 0x0147, 0x00D3, 0x00D4, 0x0150, 0x00D6, 0x00D7,
+0x0158, 0x016E, 0x00DA, 0x0170, 0x00DC, 0x00DD, 0x0162, 0x00DF,
+0x0155, 0x00E1, 0x00E2, 0x0103, 0x00E4, 0x013A, 0x0107, 0x00E7,
+0x010D, 0x00E9, 0x0119, 0x00EB, 0x011B, 0x00ED, 0x00EE, 0x010F,
+0x0111, 0x0144, 0x0148, 0x00F3, 0x00F4, 0x0151, 0x00F6, 0x00F7,
+0x0159, 0x016F, 0x00FA, 0x0171, 0x00FC, 0x00FD, 0x0163, 0x02D9,
+};
+
 long tab8859_15[256] =		/* from anyrhine@cs.helsinki.fi (Aki Nyrhinen) */
 {
 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f,
@@ -995,14 +1030,7 @@ long tab8859_15[256] =		/* from anyrhine@cs.helsinki.fi (Aki Nyrhinen) */
 
 struct convert convert[] =
 {	/* if two entries have the same name, put the from one first */
-	{ "utf", "FSS-UTF a.k.a. UTF-8", From|Func, 0, (Fnptr)utf_in },
-	{ "utf", "FSS-UTF a.k.a. UTF-8", Func, 0, (Fnptr)utf_out },
-	{ "utf1", "UTF-1 (ISO 10646 Annex A)", From|Func, 0, (Fnptr)isoutf_in },
-	{ "utf1", "UTF-1 (ISO 10646 Annex A)", Func, 0, (Fnptr)isoutf_out },
-	{ "microsoft", "microsoft", Table, (void *)microsoft },
-	{ "ascii", "7-bit ASCII", Table, (void *)tabascii },
 	{ "8859-1", "Latin-1 (Western and Northern Europe including Italian)", Table, (void *)tab8859_1 },
-	{ "latin1", "ISO 8859-1", Table, (void *)tab8859_1 },
 	{ "8859-2", "Latin-2 (Eastern Europe except Turkey and the Baltic countries)", Table, (void *)tab8859_2 },
 	{ "8859-3", "Latin-3 (Mediterranean, South Africa, Esperanto)", Table, (void *)tab8859_3 },
 	{ "8859-4", "Latin-4 (Scandinavia and the Baltic countries; obsolete)", Table, (void *)tab8859_4 },
@@ -1013,41 +1041,51 @@ struct convert convert[] =
 	{ "8859-9", "Latin-5 (Turkey, Western Europe except Icelandic and Faroese)", Table, (void *)tab8859_9 },
 	{ "8859-10", "Latin-6 (Northern Europe)", Table, (void *)tab8859_10 },
 	{ "8859-15", "Latin-9 (Western Europe)", Table, (void *)tab8859_15 },
-	{ "koi8", "KOI-8 (GOST 19769-74)", Table, (void *)tabkoi8 },
-	{ "ucode", "Russian U-code", Table, (void *)tabucode },
-	{ "cp866", "Russian MS-DOS encoding (CP 866)", Table, (void *)tab866 },
+	{ "ascii", "7-bit ASCII", Table, (void *)tabascii },
+	{ "atari", "ATARI-ST character set", Table, (void *)tabatari },
 	{ "av", "Alternativnyj Variant", Table, (void *)tabav },
-	{ "cp1251", "Russian MS-DOS encoding (CP 1251)", Table, (void *)tabcp1251 },
-	{ "ov", "Osnovnoj Variant", Table, (void *)tabov },
-	{ "sf1", "ISO-646: Finnish/Swedish SF-1 variant", Table, (void *)tabsf1 },
-	{ "sf2", "ISO-646: Finnish/Swedish SF-2 variant (recommended)", Table, (void *)tabsf2 },
-	{ "jis", "guesses at the JIS encoding", From|Func, 0, (Fnptr)jis_in },
-	{ "jis-kanji", "ISO 2022-JP", From|Func, 0, (Fnptr)jisjis_in },
-	{ "jis-kanji", "ISO 2022-JP", Func, 0, (Fnptr)jisjis_out },
-	{ "ujis", "EUC-JX: JIS 0208", From|Func, 0, (Fnptr)ujis_in },
-	{ "ujis", "EUC-JX: JIS 0208", Func, 0, (Fnptr)ujis_out },
-	{ "ms-kanji", "Microsoft, or Shift-JIS", From|Func, 0, (Fnptr)msjis_in },
-	{ "ms-kanji", "Microsoft, or Shift-JIS", Func, 0, (Fnptr)msjis_out },
 	{ "big5", "Big 5 (HKU)", From|Func, 0, (Fnptr)big5_in },
 	{ "big5", "Big 5 (HKU)", Func, 0, (Fnptr)big5_out },
-	{ "gb", "GB2312-80", From|Func, 0, (Fnptr)gb_in },
-	{ "gb", "GB2312-80", Func, 0, (Fnptr)gb_out },
+	{ "cp866", "Microsoft Code Page 866 (Russian)", Table, (void *)tab866 },
+	{ "cp1250", "Microsoft Code Page 1250 (Central Europe)", Table, (void *)tabcp1250 },
+	{ "cp1251", "Microsoft Code Page 1251 (Cyrillic)", Table, (void *)tabcp1251 },
+	{ "ebcdic", "EBCDIC", Table, (void *)tabebcdic },	/* 6f is recommended bad map */
 	{ "euc-k", "Korean EUC: ASCII+KS C 5601 1987", From|Func, 0, (Fnptr)uksc_in },
 	{ "euc-k", "Korean EUC: ASCII+KS C 5601 1987", Func, 0, (Fnptr)uksc_out },
-	{ "tis", "Thai+ASCII (TIS 620-1986)", Table, (void *)tabtis620 },
-	{ "viet1", "Vietnamese VSCII-1 (1993)", Table, (void *)tabviet1 },
-	{ "viet2", "Vietnamese VSCII-2 (1993)", Table, (void *)tabviet2 },
-	{ "viscii", "Vietnamese VISCII 1.1 (1992)", Table, (void *)tabviscii },
-	{ "msdos", "IBM PC: CP 437", Table, (void *)tabmsdos },
-	{ "msdos2", "IBM PC: CP 437 with graphics in C0", Table, (void *)tabmsdos2 },
-	{ "ps2", "IBM PS/2: CP 850 (Multilingual)", Table, (void *)tabps2 },
+	{ "gb", "GB2312-80", From|Func, 0, (Fnptr)gb_in },
+	{ "gb", "GB2312-80", Func, 0, (Fnptr)gb_out },
+	{ "html", "HTML", From|Func, 0, (Fnptr)html_in },
+	{ "html", "HTML", Func, 0, (Fnptr)html_out },
+	{ "jis", "guesses at the JIS encoding", From|Func, 0, (Fnptr)jis_in },
+	{ "jis-kanji", "ISO 2022-JP", From|Func, 0, (Fnptr)jisjis_in },
+	{ "jis-kanji", "ISO 2022-JP", Func, 0, (Fnptr)jisjis_out },
+	{ "koi8", "KOI-8 (GOST 19769-74)", Table, (void *)tabkoi8 },
+	{ "latin1", "ISO 8859-1", Table, (void *)tab8859_1 },
 	{ "macrom", "Macintosh Standard Roman character set", Table, (void *)tabMacRoman },
+	{ "microsoft", "microsoft", Table, (void *)microsoft },
+	{ "msdos2", "IBM PC: CP 437 with graphics in C0", Table, (void *)tabmsdos2 },
+	{ "msdos", "IBM PC: CP 437", Table, (void *)tabmsdos },
+	{ "ms-kanji", "Microsoft, or Shift-JIS", From|Func, 0, (Fnptr)msjis_in },
+	{ "ms-kanji", "Microsoft, or Shift-JIS", Func, 0, (Fnptr)msjis_out },
 	{ "next", "NEXTSTEP character set", Table, (void *)tabnextstep },
-	{ "atari", "ATARI-ST character set", Table, (void *)tabatari },
+	{ "ov", "Osnovnoj Variant", Table, (void *)tabov },
+	{ "ps2", "IBM PS/2: CP 850 (Multilingual)", Table, (void *)tabps2 },
+	{ "sf1", "ISO-646: Finnish/Swedish SF-1 variant", Table, (void *)tabsf1 },
+	{ "sf2", "ISO-646: Finnish/Swedish SF-2 variant (recommended)", Table, (void *)tabsf2 },
+	{ "tis", "Thai+ASCII (TIS 620-1986)", Table, (void *)tabtis620 },
+	{ "ucode", "Russian U-code", Table, (void *)tabucode },
+	{ "ujis", "EUC-JX: JIS 0208", From|Func, 0, (Fnptr)ujis_in },
+	{ "ujis", "EUC-JX: JIS 0208", Func, 0, (Fnptr)ujis_out },
 	{ "unicode", "Unicode 1.1", From|Func, 0, (Fnptr)unicode_in },
 	{ "unicode", "Unicode 1.1", Func, 0, (Fnptr)unicode_out },
-	{ "ebcdic", "EBCDIC", Table, (void *)tabebcdic },	/* 6f is recommended bad map */
+	{ "utf1", "UTF-1 (ISO 10646 Annex A)", From|Func, 0, (Fnptr)isoutf_in },
+	{ "utf1", "UTF-1 (ISO 10646 Annex A)", Func, 0, (Fnptr)isoutf_out },
+	{ "utf", "FSS-UTF a.k.a. UTF-8", From|Func, 0, (Fnptr)utf_in },
+	{ "utf", "FSS-UTF a.k.a. UTF-8", Func, 0, (Fnptr)utf_out },
 	{ "utf-l2", "from", From|Func, 0, (Fnptr)utf_in },
 	{ "utf-l2", "to", Func, 0, (Fnptr)utf_out },
+	{ "viet1", "Vietnamese VSCII-1 (1993)", Table, (void *)tabviet1 },
+	{ "viet2", "Vietnamese VSCII-2 (1993)", Table, (void *)tabviet2 },
+	{ "viscii", "Vietnamese VISCII 1.1 (1992)", Table, (void *)tabviscii },
 	{ 0 },
 };

sys/src/cmd/vnc/chan.c

@@ -36,7 +36,7 @@ void
 cclose(Chan *c)
 {
 	if(c->flag&CFREE)
-		panic("cclose %lux", getcallerpc(&c));
+		panic("cclose %#p", getcallerpc(&c));
 	if(decref(c))
 		return;
 

sys/src/cmd/vnc/compat.c

@@ -143,29 +143,29 @@ readstr(ulong off, char *buf, ulong n, char *str)
 }
 
 void
-_rendsleep(ulong tag)
+_rendsleep(void* tag)
 {
-	ulong value;
+	void *value;
 
 	for(;;){
-		value = rendezvous(tag, 0x22a891b8);
-		if(value == 0x7f7713f9)
+		value = rendezvous(tag, (void*)0x22a891b8);
+		if(value == (void*)0x7f7713f9)
 			break;
-		if(tag != ~0)
+		if(tag != (void*)~0)
 			panic("_rendsleep: rendezvous mismatch");
 	}
 }
 
 void
-_rendwakeup(ulong tag)
+_rendwakeup(void* tag)
 {
-	ulong value;
+	void *value;
 
 	for(;;){
-		value = rendezvous(tag, 0x7f7713f9);
-		if(value == 0x22a891b8)
+		value = rendezvous(tag, (void*)0x7f7713f9);
+		if(value == (void*)0x22a891b8)
 			break;
-		if(tag != ~0)
+		if(tag != (void*)~0)
 			panic("_rendwakeup: rendezvous mismatch");
 	}
 }
@@ -196,7 +196,7 @@ rendsleep(Rendez *r, int (*f)(void*), void *arg)
 	r->p = up;
 	unlock(r);
 
-	_rendsleep((ulong)r);
+	_rendsleep(r);
 
 Done:
 	lock(&up->rlock);
@@ -220,7 +220,7 @@ rendwakeup(Rendez *r)
 	rv = 0;
 	if(p){
 		r->p = nil;
-		_rendwakeup((ulong)r);
+		_rendwakeup(r);
 		rv = 1;
 	}
 	unlock(r);

sys/src/cmd/vnc/compat.h

@@ -164,3 +164,5 @@ int		mounter(char *mntpt, int how, int fds, int n);
 void		shutdown(void);
 
 void		screeninit(int, int, char*);
+
+#pragma	varargck	argpos	panic		1

sys/src/cmd/vnc/devdraw.c

@@ -226,7 +226,7 @@ drawgen(Chan *c, Dirtab*, int, int s, Dir *dp)
 			devdir(c, q, up->genbuf, 0, eve, 0500, dp);
 			break;
 		default:
-			panic("drawwalk %lux", c->qid.path);
+			panic("drawwalk %#llux", c->qid.path);
 		}
 		return 1;
 	}

sys/src/cmd/vt/consctl.c

@@ -8,14 +8,16 @@
  *  end of process memory.
  */
 static void*
-share(int len)
+share(ulong len)
 {
 	uchar *vastart;
 
 	vastart = sbrk(0);
+	if(vastart == (void*)-1)
+		return 0;
 	vastart += 2*1024*1024;
 
-	if(segattach(0, "shared", vastart, len) < 0)
+	if(segattach(0, "shared", vastart, len) == (void*)-1)
 		return 0;
 	memset(vastart, 0, len);
 

sys/src/libbin/bin.c

@@ -17,9 +17,9 @@ struct Bin
 {
 	Bin	*next;
 	ulong	total;			/* total bytes allocated in can->next */
-	ulong	pos;
-	ulong	end;
-	ulong	v;			/* last value allocated */
+	uintptr	pos;
+	uintptr	end;
+	uintptr	v;			/* last value allocated */
 	uchar	body[BinSize];
 };
 
@@ -38,8 +38,8 @@ mkbin(Bin *bin, ulong size)
 	b->next = bin;
 	b->total = 0;
 	if(bin != nil)
-		b->total = bin->total + bin->pos - (ulong)bin->body;
-	b->pos = (ulong)b->body;
+		b->total = bin->total + bin->pos - (uintptr)bin->body;
+	b->pos = (uintptr)b->body;
 	b->end = b->pos + size;
 	return b;
 }
@@ -48,7 +48,7 @@ void*
 binalloc(Bin **bin, ulong size, int zero)
 {
 	Bin *b;
-	ulong p;
+	uintptr p;
 
 	if(size == 0)
 		size = 1;
@@ -80,9 +80,9 @@ bingrow(Bin **bin, void *op, ulong osize, ulong size, int zero)
 {
 	Bin *b;
 	void *np;
-	ulong p;
+	uintptr p;
 
-	p = (ulong)op;
+	p = (uintptr)op;
 	b = *bin;
 	if(b != nil && p == b->v && p + size <= b->end){
 		b->pos = p + size;
@@ -105,7 +105,7 @@ binfree(Bin **bin)
 	while(*bin != nil){
 		last = *bin;
 		*bin = (*bin)->next;
-		last->pos = (ulong)last->body;
+		last->pos = (uintptr)last->body;
 		free(last);
 	}
 }

sys/src/libc/386/getcallerpc.c

@@ -1,8 +0,0 @@
-#include <u.h>
-#include <libc.h>
-
-ulong
-getcallerpc(void *x)
-{
-	return (((ulong*)(x))[-1]);
-}

sys/src/libc/386/getcallerpc.s

@@ -0,0 +1,4 @@
+TEXT getcallerpc(SB), $0
+	MOVL	v+0(FP), AX
+	MOVL	-4(AX), AX
+	RET

sys/src/libc/9sys/qlock.c

@@ -16,11 +16,11 @@ enum
 	Sleeping,
 };
 
-static ulong	(*_rendezvousp)(ulong, ulong) = rendezvous;
+static void*	(*_rendezvousp)(void*, void*) = rendezvous;
 
 /* this gets called by the thread library ONLY to get us to use its rendezvous */
 void
-_qlockinit(ulong (*r)(ulong, ulong))
+_qlockinit(void* (*r)(void*, void*))
 {
 	_rendezvousp = r;
 }
@@ -71,7 +71,7 @@ qlock(QLock *q)
 	unlock(&q->lock);
 
 	/* wait */
-	while((*_rendezvousp)((ulong)mp, 1) == ~0)
+	while((*_rendezvousp)(mp, (void*)1) == (void*)~0)
 		;
 	mp->inuse = 0;
 }
@@ -89,7 +89,7 @@ qunlock(QLock *q)
 		if(q->head == nil)
 			q->tail = nil;
 		unlock(&q->lock);
-		while((*_rendezvousp)((ulong)p, 0x12345) == ~0)
+		while((*_rendezvousp)(p, (void*)0x12345) == (void*)~0)
 			;
 		return;
 	}
@@ -136,7 +136,7 @@ rlock(RWLock *q)
 	unlock(&q->lock);
 
 	/* wait in kernel */
-	while((*_rendezvousp)((ulong)mp, 1) == ~0)
+	while((*_rendezvousp)(mp, (void*)1) == (void*)~0)
 		;
 	mp->inuse = 0;
 }
@@ -179,7 +179,7 @@ runlock(RWLock *q)
 	unlock(&q->lock);
 
 	/* wakeup waiter */
-	while((*_rendezvousp)((ulong)p, 0) == ~0)
+	while((*_rendezvousp)(p, 0) == (void*)~0)
 		;
 }
 
@@ -209,7 +209,7 @@ wlock(RWLock *q)
 	unlock(&q->lock);
 
 	/* wait in kernel */
-	while((*_rendezvousp)((ulong)mp, 1) == ~0)
+	while((*_rendezvousp)(mp, (void*)1) == (void*)~0)
 		;
 	mp->inuse = 0;
 }
@@ -248,7 +248,7 @@ wunlock(RWLock *q)
 		if(q->head == nil)
 			q->tail = nil;
 		unlock(&q->lock);
-		while((*_rendezvousp)((ulong)p, 0) == ~0)
+		while((*_rendezvousp)(p, 0) == (void*)~0)
 			;
 		return;
 	}
@@ -261,7 +261,7 @@ wunlock(RWLock *q)
 		p = q->head;
 		q->head = p->next;
 		q->readers++;
-		while((*_rendezvousp)((ulong)p, 0) == ~0)
+		while((*_rendezvousp)(p, 0) == (void*)~0)
 			;
 	}
 	if(q->head == nil)
@@ -299,7 +299,7 @@ rsleep(Rendez *r)
 		if(r->l->head == nil)
 			r->l->tail = nil;
 		unlock(&r->l->lock);
-		while((*_rendezvousp)((ulong)t, 0x12345) == ~0)
+		while((*_rendezvousp)(t, (void*)0x12345) == (void*)~0)
 			;
 	}else{
 		r->l->locked = 0;
@@ -307,7 +307,7 @@ rsleep(Rendez *r)
 	}
 
 	/* wait for a wakeup */
-	while((*_rendezvousp)((ulong)me, 1) == ~0)
+	while((*_rendezvousp)(me, (void*)1) == (void*)~0)
 		;
 	me->inuse = 0;
 }

sys/src/libc/fmt/runevsmprint.c

@@ -10,7 +10,7 @@ runeFmtStrFlush(Fmt *f)
 
 	if(f->start == nil)
 		return 0;
-	n = (int)f->farg;
+	n = (int)(uintptr)f->farg;
 	n *= 2;
 	s = f->start;
 	f->start = realloc(s, sizeof(Rune)*n);

sys/src/libc/fmt/vfprint.c

@@ -12,7 +12,7 @@ _fmtFdFlush(Fmt *f)
 	int n;
 
 	n = (char*)f->to - (char*)f->start;
-	if(n && write((int)f->farg, f->start, n) != n)
+	if(n && write((int)(uintptr)f->farg, f->start, n) != n)
 		return 0;
 	f->to = f->start;
 	return 1;

sys/src/libc/fmt/vsmprint.c

@@ -10,7 +10,7 @@ fmtStrFlush(Fmt *f)
 
 	if(f->start == nil)
 		return 0;
-	n = (int)f->farg;
+	n = (int)(uintptr)f->farg;
 	n *= 2;
 	s = f->start;
 	f->start = realloc(s, n);

sys/src/libc/mips/lock.c

@@ -21,19 +21,19 @@ extern	int C_fcr0(void);
 static void
 lockinit(void)
 {
-	int n;
+	void *v;
 
 	if(arch != 0)
 		return;	/* allow multiple calls */
 	arch = C_fcr0();
 	switch(arch) {
 	case POWER:
-		n = segattach(SG_CEXEC, "lock", (void*)Lockaddr, Pagesize);
-		if(n < 0) {
+		v = (void*)Lockaddr;
+		if(segattach(SG_CEXEC, "lock", v, Pagesize) == (void*)-1) {
 			arch = MAGNUM;
 			break;
 		}
-		memset((void*)Lockaddr, 0, Pagesize);
+		memset(v, 0, Pagesize);
 		break;
 	case MAGNUM:
 	case MAGNUMII:
@@ -43,7 +43,6 @@ lockinit(void)
 		arch = R4K;
 		break;
 	}
-	
 }
 
 void
@@ -88,7 +87,7 @@ retry:
 			while(lk->val)
 				;
 		}
-	}	
+	}
 }
 
 int
@@ -126,7 +125,7 @@ retry:
 			}
 		}
 		return 0;
-	}	
+	}
 }
 
 void
@@ -166,5 +165,5 @@ retry:
 			}
 		}
 		return 1;
-	}	
+	}
 }

sys/src/libc/port/getcallerpc.c

@@ -1,7 +1,7 @@
 #include <u.h>
 #include <libc.h>
 
-ulong
+uintptr
 getcallerpc(void*)
 {
 	return 0;

sys/src/libc/port/malloc.c

@@ -46,7 +46,7 @@ sbrkalloc(ulong n)
 
 	n += 2*sizeof(ulong);	/* two longs for us */
 	x = sbrk(n);
-	if((int)x == -1)
+	if(x == (void*)-1)
 		return nil;
 	x[0] = (n+7)&~7;	/* sbrk rounds size up to mult. of 8 */
 	x[1] = 0xDeadBeef;

sys/src/libdraw/getdefont.c

@@ -19,7 +19,7 @@ getdefont(Display *d)
 	 * declared as char*, not ulong*.
 	 */
 	p = (char*)defontdata;
-	n = (ulong)p & 3;
+	n = (int)(uvlong)p & 3;				/* stupid ape */
 	if(n != 0){
 		memmove(p+(4-n), p, sizeofdefont-n);
 		p += 4-n;

sys/src/libthread/channel.c

@@ -70,7 +70,7 @@ alt(Alt *alts)
 	Alt *a, *xa;
 	Channel volatile *c;
 	int n, s;
-	ulong r;
+	void* r;
 	Thread *t;
 
 	/*
@@ -137,11 +137,11 @@ alt(Alt *alts)
 	    Again:
 		unlock(&chanlock);
 		_procsplx(s);
-		r = _threadrendezvous((ulong)&c, 0);
+		r = _threadrendezvous(&c, 0);
 		s = _procsplhi();
 		lock(&chanlock);
 
-		if(r==~0){		/* interrupted */
+		if(r==(void*)~0){		/* interrupted */
 			if(c!=nil)		/* someone will meet us; go back */
 				goto Again;
 			c = (Channel*)~0;	/* so no one tries to meet us */
@@ -467,7 +467,7 @@ altexec(Alt *a, int spl)
 		unlock(&chanlock);
 		_procsplx(spl);
 		_threaddebug(DBGCHAN, "chanlock is %lud", *(ulong*)&chanlock);
-		while(_threadrendezvous((ulong)b->tag, 0) == ~0)
+		while(_threadrendezvous(b->tag, 0) == (void*)~0)
 			;
 		return 1;
 	}

sys/src/libthread/main.c

@@ -17,6 +17,7 @@ static jmp_buf _mainjmp;
 static void mainlauncher(void*);
 extern void (*_sysfatal)(char*, va_list);
 extern void (*__assert)(char*);
+static Proc **mainp;
 
 void
 main(int argc, char **argv)
@@ -25,7 +26,8 @@ main(int argc, char **argv)
 	Proc *p;
 
 	rfork(RFREND);
-	if(p = (Proc*)setjmp(_mainjmp))
+	mainp = &p;
+	if(setjmp(_mainjmp))
 		_schedinit(p);
 
 //_threaddebuglevel = (DBGSCHED|DBGCHAN|DBGREND)^~0;
@@ -135,7 +137,8 @@ _schedfork(Proc *p)
 
 	switch(pid = rfork(RFPROC|RFMEM|RFNOWAIT|p->rforkflag)){
 	case 0:
-		longjmp(_mainjmp, (int)p);
+		*mainp = p;	/* write to stack, so local to proc */
+		longjmp(_mainjmp, 1);
 	default:
 		return pid;
 	}

sys/src/libthread/rendez.c

@@ -6,10 +6,10 @@
 Rgrp _threadrgrp;
 static int isdirty;
 
-static ulong
-finish(Thread *t, ulong val)
+static void*
+finish(Thread *t, void *val)
 {
-	ulong ret;
+	void *ret;
 
 	ret = t->rendval;
 	t->rendval = val;
@@ -24,14 +24,14 @@ finish(Thread *t, ulong val)
 	return ret;
 }
 
-ulong
-_threadrendezvous(ulong tag, ulong val)
+void*
+_threadrendezvous(void *tag, void *val)
 {
-	ulong ret;
+	void *ret;
 	Thread *t, **l;
 
 	lock(&_threadrgrp.lock);
-	l = &_threadrgrp.hash[tag%nelem(_threadrgrp.hash)];
+	l = &_threadrgrp.hash[((uintptr)tag)%nelem(_threadrgrp.hash)];
 	for(t=*l; t; l=&t->rendhash, t=*l){
 		if(t->rendtag==tag){
 			_threaddebug(DBGREND, "Rendezvous with thread %d.%d", t->proc->pid, t->id);
@@ -51,11 +51,11 @@ _threadrendezvous(ulong tag, ulong val)
 	t->rendhash = *l;
 	*l = t;
 	t->nextstate = Rendezvous;
-	_threaddebug(DBGREND, "Rendezvous for tag %lud", t->rendtag);
+	_threaddebug(DBGREND, "Rendezvous for tag %p", t->rendtag);
 	unlock(&_threadrgrp.lock);
 	_sched();
 	t->inrendez = 0;
-	_threaddebug(DBGREND, "Woke after rendezvous; val is %lud", t->rendval);
+	_threaddebug(DBGREND, "Woke after rendezvous; val is %p", t->rendval);
 	return t->rendval;
 }
 
@@ -90,7 +90,7 @@ _threadbreakrendez(void)
 		for(t=*l; t; t=*l){
 			if(t->rendbreak){
 				*l = t->rendhash;
-				finish(t, ~0);
+				finish(t, (void*)~0);
 			}else
 				 l=&t->rendhash;
 		}

sys/src/libthread/sched.c

@@ -86,7 +86,7 @@ _sched(void)
 Resched:
 	p = _threadgetproc();
 	if((t = p->thread) != nil){
-		if((ulong)&p < (ulong)t->stk)	/* stack overflow */
+		if((uchar*)&p < t->stk)		/* stack overflow */
 			abort();
 		_threaddebug(DBGSCHED, "pausing, state=%s", psstate(t->state));
 		if(setjmp(t->sched)==0)
@@ -124,7 +124,7 @@ runthread(Proc *p)
 		q->asleep = 1;
 		_threaddebug(DBGSCHED, "sleeping for more work");
 		unlock(&p->readylock);
-		while(rendezvous((ulong)q, 0) == ~0){
+		while(rendezvous(q, 0) == (void*)~0){
 			if(_threadexitsallstatus)
 				exits(_threadexitsallstatus);
 		}
@@ -155,7 +155,7 @@ _threadready(Thread *t)
 		q->asleep = 0;
 		/* lock passes to runthread */
 		_threaddebug(DBGSCHED, "waking process %d", t->proc->pid);
-		while(rendezvous((ulong)q, 0) == ~0){
+		while(rendezvous(q, 0) == (void*)~0){
 			if(_threadexitsallstatus)
 				exits(_threadexitsallstatus);
 		}

sys/src/libthread/threadimpl.h

@@ -84,8 +84,8 @@ struct Thread
 
 	int		inrendez;
 	Thread		*rendhash;	/* Trgrp linked list */
-	ulong		rendtag;	/* rendezvous tag */
-	ulong		rendval;	/* rendezvous value */
+	void*		rendtag;	/* rendezvous tag */
+	void*		rendval;	/* rendezvous value */
 	int		rendbreak;	/* rendezvous has been taken */
 
 	Chanstate	chan;		/* which channel operation is current */
@@ -175,7 +175,7 @@ void		_threadinitstack(Thread*, void(*)(void*), void*);
 void*	_threadmalloc(long, int);
 void		_threadnote(void*, char*);
 void		_threadready(Thread*);
-ulong	_threadrendezvous(ulong, ulong);
+void*	_threadrendezvous(void*, void*);
 void		_threadsignal(void);
 void		_threadsysfatal(char*, va_list);
 long		_xdec(long*);

sys/src/libventi/plan9-io.c

@@ -66,11 +66,11 @@ vtMemBrk(int n)
 		align = 4;
 
 	lock(&lk);
-	pad = (align - (ulong)buf) & (align-1);
+	pad = (align - (uintptr)buf) & (align-1);
 	if(n + pad > nbuf) {
 		buf = vtMemAllocZ(ChunkSize);
 		nbuf = ChunkSize;
-		pad = (align - (ulong)buf) & (align-1);
+		pad = (align - (uintptr)buf) & (align-1);
 		nchunk++;
 	}
 

sys/src/libventi/plan9-thread.c

@@ -455,13 +455,13 @@ vtWakeupAll(VtRendez *q)
 static void
 threadSleep(Thread *t)
 {
-	if(rendezvous((ulong)t, 0x22bbdfd6) != 0x44391f14)
+	if(rendezvous(t, (void*)0x22bbdfd6) != (void*)0x44391f14)
 		sysfatal("threadSleep: rendezvous failed: %r");
 }
 
 static void
 threadWakeup(Thread *t)
 {
-	if(rendezvous((ulong)t, 0x44391f14) != 0x22bbdfd6)
+	if(rendezvous(t, (void*)0x44391f14) != (void*)0x22bbdfd6)
 		sysfatal("threadWakeup: rendezvous failed: %r");
 }