Browse Source

Plan 9 from Bell Labs 2006-04-28

David du Colombier 14 years ago
parent
commit
41a9a979ea

+ 24 - 24
dist/replica/_plan9.db

@@ -122,13 +122,13 @@
 386/bin/aux/mswordstrings - 775 sys sys 1143777761 65636
 386/bin/aux/na - 775 sys sys 1143777762 154518
 386/bin/aux/nfsmount - 775 sys sys 1143777763 234786
-386/bin/aux/nfsserver - 775 sys sys 1145379323 186025
+386/bin/aux/nfsserver - 775 sys sys 1146156974 185998
 386/bin/aux/olefs - 775 sys sys 1143777764 149666
 386/bin/aux/p9bitpost - 775 sys sys 1104121982 127974
 386/bin/aux/pcmcia - 775 sys sys 1143741951 46940
-386/bin/aux/pcnfsd - 775 sys sys 1144688919 129951
+386/bin/aux/pcnfsd - 775 sys sys 1146156975 129898
 386/bin/aux/portmap - 775 sys sys 1143777765 144306
-386/bin/aux/portmapper - 775 sys sys 1144688920 128839
+386/bin/aux/portmapper - 775 sys sys 1146156975 128979
 386/bin/aux/postgif - 775 sys sys 1087442507 175380
 386/bin/aux/postprint - 775 sys sys 1087442507 160041
 386/bin/aux/postreverse - 775 sys sys 1087442508 164726
@@ -357,7 +357,7 @@
 386/bin/paqfs - 775 sys sys 1144688948 107876
 386/bin/passwd - 775 sys sys 1144256044 84332
 386/bin/pbd - 775 sys sys 1085077087 4661
-386/bin/pcc - 775 sys sys 1143777833 68248
+386/bin/pcc - 775 sys sys 1146156975 68336
 386/bin/pic - 775 sys sys 1134151358 305711
 386/bin/pipefile - 775 sys sys 1143742030 39431
 386/bin/plot - 775 sys sys 1132506868 222348
@@ -530,14 +530,14 @@
 386/lib - 20000000775 sys sys 1016826328 0
 386/lib/ape - 20000000775 sys sys 944969312 0
 386/lib/ape/lib9.a - 664 sys sys 1135531447 6906
-386/lib/ape/libap.a - 664 sys sys 1146068622 130222
-386/lib/ape/libbsd.a - 664 sys sys 1143777854 182990
-386/lib/ape/libdraw.a - 664 sys sys 1143777856 580918
-386/lib/ape/libfmt.a - 664 sys sys 1143777857 150786
+386/lib/ape/libap.a - 664 sys sys 1146156977 819888
+386/lib/ape/libbsd.a - 664 sys sys 1146156978 183900
+386/lib/ape/libdraw.a - 664 sys sys 1146156979 621356
+386/lib/ape/libfmt.a - 664 sys sys 1146156980 156706
 386/lib/ape/libl.a - 664 sys sys 1143777857 9406
 386/lib/ape/libnet.a - 664 sys sys 1143777857 16950
 386/lib/ape/libregexp.a - 664 sys sys 1143777857 47500
-386/lib/ape/libutf.a - 664 sys sys 1143777858 84620
+386/lib/ape/libutf.a - 664 sys sys 1146156980 88500
 386/lib/ape/libv.a - 664 sys sys 1143777858 19668
 386/lib/lib9p.a - 664 sys sys 1143777858 91076
 386/lib/libString.a - 664 sys sys 1143777858 22126
@@ -5618,7 +5618,7 @@ sys/doc/acme/acme.pdf - 664 sys sys 1020384351 117006
 sys/doc/acme/acme.ps - 664 sys sys 960837907 611301
 sys/doc/acme/bs - 664 sys sys 944959634 556
 sys/doc/acme/mkfile - 664 sys sys 1138459292 295
-sys/doc/ape.ms - 664 sys sys 1138396403 12637
+sys/doc/ape.ms - 664 sys sys 1146174667 12873
 sys/doc/ape.ps - 664 sys sys 960837914 258779
 sys/doc/asm.ms - 664 sys sys 1138396403 31516
 sys/doc/asm.ps - 664 sys sys 960837915 322051
@@ -7874,7 +7874,7 @@ sys/src/9/boot/testboot.c - 664 sys sys 1039763734 496
 sys/src/9/ip - 20000000775 sys sys 1015278450 0
 sys/src/9/ip/arp.c - 664 sys sys 1134042932 11218
 sys/src/9/ip/chandial.c - 664 sys sys 1099020048 2295
-sys/src/9/ip/devip.c - 664 sys sys 1084331653 24164
+sys/src/9/ip/devip.c - 664 sys sys 1146151713 24154
 sys/src/9/ip/eipconvtest.c - 664 sys sys 1022588098 3135
 sys/src/9/ip/esp.c - 664 sys sys 1047260561 17084
 sys/src/9/ip/ethermedium.c - 664 sys sys 1115565973 15592
@@ -7885,9 +7885,9 @@ sys/src/9/ip/igmp.c - 664 sys sys 1055700768 5175
 sys/src/9/ip/il.c - 664 sys sys 1134498903 27226
 sys/src/9/ip/inferno.c - 664 sys sys 1022588098 517
 sys/src/9/ip/ip.c - 664 sys sys 1101906449 15285
-sys/src/9/ip/ip.h - 664 sys sys 1091904429 15818
+sys/src/9/ip/ip.h - 664 sys sys 1146151712 15778
 sys/src/9/ip/ipaux.c - 664 sys sys 1079538100 12862
-sys/src/9/ip/ipifc.c - 664 sys sys 1143463302 34259
+sys/src/9/ip/ipifc.c - 664 sys sys 1146151712 34215
 sys/src/9/ip/ipmux.c - 664 sys sys 1047260566 15362
 sys/src/9/ip/iproute.c - 664 sys sys 1049423192 14763
 sys/src/9/ip/ipv6.c - 664 sys sys 1047951328 14433
@@ -7996,7 +7996,7 @@ sys/src/9/pc/memory.c - 664 sys sys 1131573303 18191
 sys/src/9/pc/mkfile - 664 sys sys 1142960857 3804
 sys/src/9/pc/mmu.c - 664 sys sys 1142124315 25229
 sys/src/9/pc/mouse.c - 664 sys sys 1098479254 7057
-sys/src/9/pc/mp.c - 664 sys sys 1131538523 17317
+sys/src/9/pc/mp.c - 664 sys sys 1146151715 17302
 sys/src/9/pc/mp.h - 664 sys sys 1131538511 6652
 sys/src/9/pc/nv_dma.h - 664 sys sys 1081384508 12943
 sys/src/9/pc/pc - 664 sys sys 1143768293 1452
@@ -8057,7 +8057,7 @@ sys/src/9/pc/vgatvp3026.c - 664 sys sys 1131290603 3956
 sys/src/9/pc/vgavesa.c - 664 sys sys 1131402428 2396
 sys/src/9/pc/vgavmware.c - 664 sys sys 1131290604 5840
 sys/src/9/pc/vgax.c - 664 sys sys 1131290604 1671
-sys/src/9/pc/wavelan.c - 664 sys sys 1127743243 27879
+sys/src/9/pc/wavelan.c - 664 sys sys 1146151713 27760
 sys/src/9/pc/wavelan.h - 664 sys sys 1107448246 6169
 sys/src/9/port - 20000000775 sys sys 1018469625 0
 sys/src/9/port/alarm.c - 664 sys sys 1134042902 1425
@@ -8065,10 +8065,10 @@ sys/src/9/port/alloc.c - 664 sys sys 1138459977 5704
 sys/src/9/port/allocb.c - 664 sys sys 1123676437 3340
 sys/src/9/port/auth.c - 664 sys sys 1123647282 2392
 sys/src/9/port/cache.c - 664 sys sys 1126586168 9241
-sys/src/9/port/chan.c - 664 sys sys 1141940068 34831
+sys/src/9/port/chan.c - 664 sys sys 1146151714 34773
 sys/src/9/port/cis.c - 664 sys sys 1099761153 9248
 sys/src/9/port/debugalloc.c - 664 sys sys 1014931171 10402
-sys/src/9/port/dev.c - 664 sys sys 1131289870 8219
+sys/src/9/port/dev.c - 664 sys sys 1146151714 8177
 sys/src/9/port/devaudio.c - 664 sys sys 1142086793 21147
 sys/src/9/port/devbridge.c - 664 sys sys 1055688301 24308
 sys/src/9/port/devcap.c - 664 sys sys 1048644215 4113
@@ -8086,14 +8086,14 @@ sys/src/9/port/devmouse.c - 664 sys sys 1130848303 13517
 sys/src/9/port/devpipe.c - 664 sys sys 1077055016 5825
 sys/src/9/port/devpnp.c - 664 sys sys 1088560907 13624
 sys/src/9/port/devproc.c - 664 sys sys 1142086847 28500
-sys/src/9/port/devroot.c - 664 sys sys 1067722764 4254
-sys/src/9/port/devsd.c - 664 sys sys 1143648157 30871
+sys/src/9/port/devroot.c - 664 sys sys 1146151714 4242
+sys/src/9/port/devsd.c - 664 sys sys 1146151713 30860
 sys/src/9/port/devsdp.c - 664 sys sys 1057323393 44800
 sys/src/9/port/devsegment.c - 664 sys sys 1131289891 9610
 sys/src/9/port/devsrv.c - 664 sys sys 1107232208 5418
-sys/src/9/port/devssl.c - 664 sys sys 1131107944 26133
+sys/src/9/port/devssl.c - 664 sys sys 1146151714 26121
 sys/src/9/port/devtinyfs.c - 664 sys sys 1015278339 15347
-sys/src/9/port/devtls.c - 664 sys sys 1134498858 45226
+sys/src/9/port/devtls.c - 664 sys sys 1146151715 45214
 sys/src/9/port/devuart.c - 664 sys sys 1138118881 12141
 sys/src/9/port/devwd.c - 664 sys sys 1126582325 2342
 sys/src/9/port/edf.c - 664 sys sys 1138472540 13489
@@ -8124,7 +8124,7 @@ sys/src/9/port/netif.h - 664 sys sys 1066514947 2975
 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 1138458260 4760
-sys/src/9/port/portclock.c - 664 sys sys 1138458385 4211
+sys/src/9/port/portclock.c - 664 sys sys 1146151715 4333
 sys/src/9/port/portdat.h - 664 sys sys 1143129883 22669
 sys/src/9/port/portfns.h - 664 sys sys 1138469535 11079
 sys/src/9/port/portmkfile - 664 sys sys 1131907975 2062
@@ -8140,7 +8140,7 @@ sys/src/9/port/semaphore.p - 664 sys sys 1143129797 2424
 sys/src/9/port/swap.c - 664 sys sys 1138028310 7019
 sys/src/9/port/sysfile.c - 664 sys sys 1141940070 22192
 sys/src/9/port/sysproc.c - 664 sys sys 1143289632 21534
-sys/src/9/port/taslock.c - 664 sys sys 1142957865 3928
+sys/src/9/port/taslock.c - 664 sys sys 1146151714 4536
 sys/src/9/port/thwack.c - 664 sys sys 1057323394 7253
 sys/src/9/port/thwack.h - 664 sys sys 1015278340 1792
 sys/src/9/port/tod.c - 664 sys sys 1138459530 5336
@@ -12680,7 +12680,7 @@ sys/src/cmd/paqfs/mkpaqfs.c - 664 sys sys 1072729575 8836
 sys/src/cmd/paqfs/paqfs.c - 664 sys sys 1084470285 19571
 sys/src/cmd/paqfs/paqfs.h - 664 sys sys 1072729575 1016
 sys/src/cmd/pbd.c - 664 sys sys 944961351 247
-sys/src/cmd/pcc.c - 664 sys sys 1112744693 5937
+sys/src/cmd/pcc.c - 664 sys sys 1146137351 6016
 sys/src/cmd/pic - 20000000775 sys sys 954037275 0
 sys/src/cmd/pic/arcgen.c - 664 sys sys 944961042 5999
 sys/src/cmd/pic/blockgen.c - 664 sys sys 944961042 5209

+ 24 - 24
dist/replica/plan9.db

@@ -122,13 +122,13 @@
 386/bin/aux/mswordstrings - 775 sys sys 1143777761 65636
 386/bin/aux/na - 775 sys sys 1143777762 154518
 386/bin/aux/nfsmount - 775 sys sys 1143777763 234786
-386/bin/aux/nfsserver - 775 sys sys 1145379323 186025
+386/bin/aux/nfsserver - 775 sys sys 1146156974 185998
 386/bin/aux/olefs - 775 sys sys 1143777764 149666
 386/bin/aux/p9bitpost - 775 sys sys 1104121982 127974
 386/bin/aux/pcmcia - 775 sys sys 1143741951 46940
-386/bin/aux/pcnfsd - 775 sys sys 1144688919 129951
+386/bin/aux/pcnfsd - 775 sys sys 1146156975 129898
 386/bin/aux/portmap - 775 sys sys 1143777765 144306
-386/bin/aux/portmapper - 775 sys sys 1144688920 128839
+386/bin/aux/portmapper - 775 sys sys 1146156975 128979
 386/bin/aux/postgif - 775 sys sys 1087442507 175380
 386/bin/aux/postprint - 775 sys sys 1087442507 160041
 386/bin/aux/postreverse - 775 sys sys 1087442508 164726
@@ -357,7 +357,7 @@
 386/bin/paqfs - 775 sys sys 1144688948 107876
 386/bin/passwd - 775 sys sys 1144256044 84332
 386/bin/pbd - 775 sys sys 1085077087 4661
-386/bin/pcc - 775 sys sys 1143777833 68248
+386/bin/pcc - 775 sys sys 1146156975 68336
 386/bin/pic - 775 sys sys 1134151358 305711
 386/bin/pipefile - 775 sys sys 1143742030 39431
 386/bin/plot - 775 sys sys 1132506868 222348
@@ -530,14 +530,14 @@
 386/lib - 20000000775 sys sys 1016826328 0
 386/lib/ape - 20000000775 sys sys 944969312 0
 386/lib/ape/lib9.a - 664 sys sys 1135531447 6906
-386/lib/ape/libap.a - 664 sys sys 1146068622 130222
-386/lib/ape/libbsd.a - 664 sys sys 1143777854 182990
-386/lib/ape/libdraw.a - 664 sys sys 1143777856 580918
-386/lib/ape/libfmt.a - 664 sys sys 1143777857 150786
+386/lib/ape/libap.a - 664 sys sys 1146156977 819888
+386/lib/ape/libbsd.a - 664 sys sys 1146156978 183900
+386/lib/ape/libdraw.a - 664 sys sys 1146156979 621356
+386/lib/ape/libfmt.a - 664 sys sys 1146156980 156706
 386/lib/ape/libl.a - 664 sys sys 1143777857 9406
 386/lib/ape/libnet.a - 664 sys sys 1143777857 16950
 386/lib/ape/libregexp.a - 664 sys sys 1143777857 47500
-386/lib/ape/libutf.a - 664 sys sys 1143777858 84620
+386/lib/ape/libutf.a - 664 sys sys 1146156980 88500
 386/lib/ape/libv.a - 664 sys sys 1143777858 19668
 386/lib/lib9p.a - 664 sys sys 1143777858 91076
 386/lib/libString.a - 664 sys sys 1143777858 22126
@@ -5618,7 +5618,7 @@ sys/doc/acme/acme.pdf - 664 sys sys 1020384351 117006
 sys/doc/acme/acme.ps - 664 sys sys 960837907 611301
 sys/doc/acme/bs - 664 sys sys 944959634 556
 sys/doc/acme/mkfile - 664 sys sys 1138459292 295
-sys/doc/ape.ms - 664 sys sys 1138396403 12637
+sys/doc/ape.ms - 664 sys sys 1146174667 12873
 sys/doc/ape.ps - 664 sys sys 960837914 258779
 sys/doc/asm.ms - 664 sys sys 1138396403 31516
 sys/doc/asm.ps - 664 sys sys 960837915 322051
@@ -7874,7 +7874,7 @@ sys/src/9/boot/testboot.c - 664 sys sys 1039763734 496
 sys/src/9/ip - 20000000775 sys sys 1015278450 0
 sys/src/9/ip/arp.c - 664 sys sys 1134042932 11218
 sys/src/9/ip/chandial.c - 664 sys sys 1099020048 2295
-sys/src/9/ip/devip.c - 664 sys sys 1084331653 24164
+sys/src/9/ip/devip.c - 664 sys sys 1146151713 24154
 sys/src/9/ip/eipconvtest.c - 664 sys sys 1022588098 3135
 sys/src/9/ip/esp.c - 664 sys sys 1047260561 17084
 sys/src/9/ip/ethermedium.c - 664 sys sys 1115565973 15592
@@ -7885,9 +7885,9 @@ sys/src/9/ip/igmp.c - 664 sys sys 1055700768 5175
 sys/src/9/ip/il.c - 664 sys sys 1134498903 27226
 sys/src/9/ip/inferno.c - 664 sys sys 1022588098 517
 sys/src/9/ip/ip.c - 664 sys sys 1101906449 15285
-sys/src/9/ip/ip.h - 664 sys sys 1091904429 15818
+sys/src/9/ip/ip.h - 664 sys sys 1146151712 15778
 sys/src/9/ip/ipaux.c - 664 sys sys 1079538100 12862
-sys/src/9/ip/ipifc.c - 664 sys sys 1143463302 34259
+sys/src/9/ip/ipifc.c - 664 sys sys 1146151712 34215
 sys/src/9/ip/ipmux.c - 664 sys sys 1047260566 15362
 sys/src/9/ip/iproute.c - 664 sys sys 1049423192 14763
 sys/src/9/ip/ipv6.c - 664 sys sys 1047951328 14433
@@ -7996,7 +7996,7 @@ sys/src/9/pc/memory.c - 664 sys sys 1131573303 18191
 sys/src/9/pc/mkfile - 664 sys sys 1142960857 3804
 sys/src/9/pc/mmu.c - 664 sys sys 1142124315 25229
 sys/src/9/pc/mouse.c - 664 sys sys 1098479254 7057
-sys/src/9/pc/mp.c - 664 sys sys 1131538523 17317
+sys/src/9/pc/mp.c - 664 sys sys 1146151715 17302
 sys/src/9/pc/mp.h - 664 sys sys 1131538511 6652
 sys/src/9/pc/nv_dma.h - 664 sys sys 1081384508 12943
 sys/src/9/pc/pc - 664 sys sys 1143768293 1452
@@ -8057,7 +8057,7 @@ sys/src/9/pc/vgatvp3026.c - 664 sys sys 1131290603 3956
 sys/src/9/pc/vgavesa.c - 664 sys sys 1131402428 2396
 sys/src/9/pc/vgavmware.c - 664 sys sys 1131290604 5840
 sys/src/9/pc/vgax.c - 664 sys sys 1131290604 1671
-sys/src/9/pc/wavelan.c - 664 sys sys 1127743243 27879
+sys/src/9/pc/wavelan.c - 664 sys sys 1146151713 27760
 sys/src/9/pc/wavelan.h - 664 sys sys 1107448246 6169
 sys/src/9/port - 20000000775 sys sys 1018469625 0
 sys/src/9/port/alarm.c - 664 sys sys 1134042902 1425
@@ -8065,10 +8065,10 @@ sys/src/9/port/alloc.c - 664 sys sys 1138459977 5704
 sys/src/9/port/allocb.c - 664 sys sys 1123676437 3340
 sys/src/9/port/auth.c - 664 sys sys 1123647282 2392
 sys/src/9/port/cache.c - 664 sys sys 1126586168 9241
-sys/src/9/port/chan.c - 664 sys sys 1141940068 34831
+sys/src/9/port/chan.c - 664 sys sys 1146151714 34773
 sys/src/9/port/cis.c - 664 sys sys 1099761153 9248
 sys/src/9/port/debugalloc.c - 664 sys sys 1014931171 10402
-sys/src/9/port/dev.c - 664 sys sys 1131289870 8219
+sys/src/9/port/dev.c - 664 sys sys 1146151714 8177
 sys/src/9/port/devaudio.c - 664 sys sys 1142086793 21147
 sys/src/9/port/devbridge.c - 664 sys sys 1055688301 24308
 sys/src/9/port/devcap.c - 664 sys sys 1048644215 4113
@@ -8086,14 +8086,14 @@ sys/src/9/port/devmouse.c - 664 sys sys 1130848303 13517
 sys/src/9/port/devpipe.c - 664 sys sys 1077055016 5825
 sys/src/9/port/devpnp.c - 664 sys sys 1088560907 13624
 sys/src/9/port/devproc.c - 664 sys sys 1142086847 28500
-sys/src/9/port/devroot.c - 664 sys sys 1067722764 4254
-sys/src/9/port/devsd.c - 664 sys sys 1143648157 30871
+sys/src/9/port/devroot.c - 664 sys sys 1146151714 4242
+sys/src/9/port/devsd.c - 664 sys sys 1146151713 30860
 sys/src/9/port/devsdp.c - 664 sys sys 1057323393 44800
 sys/src/9/port/devsegment.c - 664 sys sys 1131289891 9610
 sys/src/9/port/devsrv.c - 664 sys sys 1107232208 5418
-sys/src/9/port/devssl.c - 664 sys sys 1131107944 26133
+sys/src/9/port/devssl.c - 664 sys sys 1146151714 26121
 sys/src/9/port/devtinyfs.c - 664 sys sys 1015278339 15347
-sys/src/9/port/devtls.c - 664 sys sys 1134498858 45226
+sys/src/9/port/devtls.c - 664 sys sys 1146151715 45214
 sys/src/9/port/devuart.c - 664 sys sys 1138118881 12141
 sys/src/9/port/devwd.c - 664 sys sys 1126582325 2342
 sys/src/9/port/edf.c - 664 sys sys 1138472540 13489
@@ -8124,7 +8124,7 @@ sys/src/9/port/netif.h - 664 sys sys 1066514947 2975
 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 1138458260 4760
-sys/src/9/port/portclock.c - 664 sys sys 1138458385 4211
+sys/src/9/port/portclock.c - 664 sys sys 1146151715 4333
 sys/src/9/port/portdat.h - 664 sys sys 1143129883 22669
 sys/src/9/port/portfns.h - 664 sys sys 1138469535 11079
 sys/src/9/port/portmkfile - 664 sys sys 1131907975 2062
@@ -8140,7 +8140,7 @@ sys/src/9/port/semaphore.p - 664 sys sys 1143129797 2424
 sys/src/9/port/swap.c - 664 sys sys 1138028310 7019
 sys/src/9/port/sysfile.c - 664 sys sys 1141940070 22192
 sys/src/9/port/sysproc.c - 664 sys sys 1143289632 21534
-sys/src/9/port/taslock.c - 664 sys sys 1142957865 3928
+sys/src/9/port/taslock.c - 664 sys sys 1146151714 4536
 sys/src/9/port/thwack.c - 664 sys sys 1057323394 7253
 sys/src/9/port/thwack.h - 664 sys sys 1015278340 1792
 sys/src/9/port/tod.c - 664 sys sys 1138459530 5336
@@ -12680,7 +12680,7 @@ sys/src/cmd/paqfs/mkpaqfs.c - 664 sys sys 1072729575 8836
 sys/src/cmd/paqfs/paqfs.c - 664 sys sys 1084470285 19571
 sys/src/cmd/paqfs/paqfs.h - 664 sys sys 1072729575 1016
 sys/src/cmd/pbd.c - 664 sys sys 944961351 247
-sys/src/cmd/pcc.c - 664 sys sys 1112744693 5937
+sys/src/cmd/pcc.c - 664 sys sys 1146137351 6016
 sys/src/cmd/pic - 20000000775 sys sys 954037275 0
 sys/src/cmd/pic/arcgen.c - 664 sys sys 944961042 5999
 sys/src/cmd/pic/blockgen.c - 664 sys sys 944961042 5209

+ 24 - 0
dist/replica/plan9.log

@@ -29559,3 +29559,27 @@
 1146097921 8 c sys/include/ape/u.h - 664 sys sys 1146097783 430
 1146097921 9 c sys/src/ape/lib/draw/mkfile - 664 sys sys 1146097782 1157
 1146097921 10 c sys/src/ape/lib/fmt/fmtdef.h - 664 sys sys 1146097782 3103
+1146137412 0 c sys/src/cmd/pcc.c - 664 sys sys 1146137351 6016
+1146151816 0 c sys/src/9/ip/devip.c - 664 sys sys 1146151713 24154
+1146151816 1 c sys/src/9/ip/ip.h - 664 sys sys 1146151712 15778
+1146151816 2 c sys/src/9/ip/ipifc.c - 664 sys sys 1146151712 34215
+1146151816 3 c sys/src/9/pc/mp.c - 664 sys sys 1146151715 17302
+1146151816 4 c sys/src/9/pc/wavelan.c - 664 sys sys 1146151713 27760
+1146151816 5 c sys/src/9/port/chan.c - 664 sys sys 1146151714 34773
+1146151816 6 c sys/src/9/port/dev.c - 664 sys sys 1146151714 8177
+1146151816 7 c sys/src/9/port/devroot.c - 664 sys sys 1146151714 4242
+1146151816 8 c sys/src/9/port/devsd.c - 664 sys sys 1146151713 30860
+1146151816 9 c sys/src/9/port/devssl.c - 664 sys sys 1146151714 26121
+1146151816 10 c sys/src/9/port/devtls.c - 664 sys sys 1146151715 45214
+1146151816 11 c sys/src/9/port/portclock.c - 664 sys sys 1146151715 4333
+1146151816 12 c sys/src/9/port/taslock.c - 664 sys sys 1146151714 4536
+1146157218 0 c 386/bin/pcc - 775 sys sys 1146156975 68336
+1146157218 1 c 386/bin/aux/nfsserver - 775 sys sys 1146156974 185998
+1146157218 2 c 386/bin/aux/pcnfsd - 775 sys sys 1146156975 129898
+1146157218 3 c 386/bin/aux/portmapper - 775 sys sys 1146156975 128979
+1146157218 4 c 386/lib/ape/libap.a - 664 sys sys 1146156977 819888
+1146157218 5 c 386/lib/ape/libbsd.a - 664 sys sys 1146156978 183900
+1146157218 6 c 386/lib/ape/libdraw.a - 664 sys sys 1146156979 621356
+1146157218 7 c 386/lib/ape/libfmt.a - 664 sys sys 1146156980 156706
+1146157218 8 c 386/lib/ape/libutf.a - 664 sys sys 1146156980 88500
+1146175223 0 c sys/doc/ape.ms - 664 sys sys 1146174667 12873

+ 13 - 0
sys/doc/ape.ms

@@ -363,6 +363,19 @@ This extension allows inclusion of
 which defines the networking functions described in the Plan 9 manual page
 .I dial (2).
 .XX
+.CW _PLAN9_EXTENSION .
+This extension allows inclusion of
+.CW <u.h> ,
+.CW <lock.h> ,
+.CW <qlock.h> ,
+.CW <utf.h> ,
+.CW <fmt.h> ,
+and
+.CW <draw.h> .
+These are pieces of Plan 9 source code ported into APE,
+mostly from 
+.CW <libc.h> .
+.XX
 .CW _REGEXP_EXTENSION .
 This extension allows inclusion of
 .CW <regexp.h> ,

+ 4 - 4
sys/src/9/ip/devip.c

@@ -970,11 +970,11 @@ Fsstdannounce(Conv* c, char* argv[], int argc)
 	c->rport = 0;
 	switch(argc){
 	default:
-		return "bad args to announce";
+		break;
 	case 2:
 		return setladdrport(c, argv[1], 1);
 	}
-	return nil;
+	return "bad args to announce";
 }
 
 /*
@@ -1021,11 +1021,11 @@ Fsstdbind(Conv* c, char* argv[], int argc)
 {
 	switch(argc){
 	default:
-		return "bad args to bind";
+		break;
 	case 2:
 		return setladdrport(c, argv[1], 0);
 	}
-	return nil;
+	return "bad args to bind";
 }
 
 static void

+ 0 - 1
sys/src/9/ip/ip.h

@@ -587,7 +587,6 @@ extern int	iptentative(Fs*, uchar *addr);
 extern int	ipisbm(uchar *);
 extern int	ipismulticast(uchar *);
 extern Ipifc*	findipifc(Fs*, uchar *remote, int type);
-extern void	findprimaryip(Fs*, uchar*);
 extern void	findlocalip(Fs*, uchar *local, uchar *remote);
 extern int	ipv4local(Ipifc *ifc, uchar *addr);
 extern int	ipv6local(Ipifc *ifc, uchar *addr);

+ 56 - 59
sys/src/9/ip/ipifc.c

@@ -121,7 +121,7 @@ ipifcbind(Conv *c, char **argv, int argc)
 	wlock(ifc);
 	if(ifc->m != nil){
 		wunlock(ifc);
-		return "interface already bound";	
+		return "interface already bound";
 	}
 	if(waserror()){
 		wunlock(ifc);
@@ -144,15 +144,15 @@ ipifcbind(Conv *c, char **argv, int argc)
 	ifc->maxtu = ifc->m->maxtu;
 	if(ifc->m->unbindonclose == 0)
 		ifc->conv->inuse++;
-	ifc->rp.mflag	= 0;		// default not managed
-	ifc->rp.oflag	= 0;
-	ifc->rp.maxraint	= 600000;	// millisecs
-	ifc->rp.minraint	= 200000;
-	ifc->rp.linkmtu	= 0;		// no mtu sent
-	ifc->rp.reachtime	= 0;
-	ifc->rp.rxmitra	= 0;
-	ifc->rp.ttl	= MAXTTL;
-	ifc->rp.routerlt	= 3*(ifc->rp.maxraint);
+	ifc->rp.mflag = 0;		// default not managed
+	ifc->rp.oflag = 0;
+	ifc->rp.maxraint = 600000;	// millisecs
+	ifc->rp.minraint = 200000;
+	ifc->rp.linkmtu = 0;		// no mtu sent
+	ifc->rp.reachtime = 0;
+	ifc->rp.rxmitra = 0;
+	ifc->rp.ttl = MAXTTL;
+	ifc->rp.routerlt = 3*(ifc->rp.maxraint);
 
 	/* any ancillary structures (like routes) no longer pertain */
 	ifc->ifcid++;
@@ -213,13 +213,10 @@ ipifcunbind(Ipifc *ifc)
 	return nil;
 }
 
-
-
 char sfixedformat[] = "device %s maxtu %d sendra %d recvra %d mflag %d oflag %d maxraint %d minraint %d linkmtu %d reachtime %d rxmitra %d ttl %d routerlt %d pktin %lud pktout %lud errin %lud errout %lud\n";
 
 char slineformat[] = "	%-40I %-10M %-40I %-12lud %-12lud\n";
 
-
 static int
 ipifcstate(Conv *c, char *state, int n)
 {
@@ -229,7 +226,7 @@ ipifcstate(Conv *c, char *state, int n)
 
 	ifc = (Ipifc*)c->ptcl;
 
-	m = snprint(state, n, sfixedformat, 
+	m = snprint(state, n, sfixedformat,
 		ifc->dev, ifc->maxtu, ifc->sendra6, ifc->recvra6,
 		ifc->rp.mflag, ifc->rp.oflag, ifc->rp.maxraint,
 		ifc->rp.minraint, ifc->rp.linkmtu, ifc->rp.reachtime,
@@ -328,7 +325,7 @@ ipifccreate(Conv *c)
 	ifc->reassemble = 0;
 }
 
-/* 
+/*
  *  called after last close of ipifc data or ctl
  *  called with c locked, we must unlock
  */
@@ -424,7 +421,7 @@ ipifcadd(Ipifc *ifc, char **argv, int argc, int tentative, Iplifc *lifcp)
 	/* ignore if this is already a local address for this ifc */
 	for(lifc = ifc->lifc; lifc; lifc = lifc->next) {
 		if(ipcmp(lifc->local, ip) == 0) {
-			if(lifc->tentative != tentative) 
+			if(lifc->tentative != tentative)
 				lifc->tentative = tentative;
 			if(lifcp != nil) {
 				lifc->onlink = lifcp->onlink;
@@ -465,7 +462,7 @@ ipifcadd(Ipifc *ifc, char **argv, int argc, int tentative, Iplifc *lifcp)
 	*l = lifc;
 
 	/* check for point-to-point interface */
-	if(ipcmp(ip, v6loopback))  /* skip v6 loopback, it's a special address */
+	if(ipcmp(ip, v6loopback))	/* skip v6 loopback, it's a special address */
 	if(ipcmp(mask, IPallbits) == 0)
 		type |= Rptpt;
 
@@ -504,9 +501,9 @@ ipifcadd(Ipifc *ifc, char **argv, int argc, int tentative, Iplifc *lifcp)
 		for(i = 0; i < IPaddrlen; i++)
 			bcast[i] = (ip[i] & mask[i]) & mask[i];
 		addselfcache(f, ifc, lifc, bcast, Rbcast);
-		
+
 		addselfcache(f, ifc, lifc, IPv4bcast, Rbcast);
-	} 
+	}
 	else {
 		if(ipcmp(ip, v6loopback) == 0) {
 			/* add node-local mcast address */
@@ -518,10 +515,10 @@ ipifcadd(Ipifc *ifc, char **argv, int argc, int tentative, Iplifc *lifcp)
 
 		/* add all nodes multicast address */
 		addselfcache(f, ifc, lifc, v6allnodesL, Rmulti);
-		
+
 		/* add route for all nodes multicast */
 		v6addroute(f, tifc, v6allnodesL, v6allnodesLmask, v6allnodesL, Rmulti);
-		
+
 		/* add solicited-node multicast address */
 		ipv62smcast(bcast, ip);
 		addselfcache(f, ifc, lifc, bcast, Rmulti);
@@ -535,7 +532,7 @@ ipifcadd(Ipifc *ifc, char **argv, int argc, int tentative, Iplifc *lifcp)
 
 out:
 	wunlock(ifc);
-	if(tentative && sendnbrdisc) 
+	if(tentative && sendnbrdisc)
 		icmpns(f, 0, SRC_UNSPEC, ip, TARG_MULTI, ifc->mac);
 	return nil;
 }
@@ -721,30 +718,30 @@ ipifcsetpar6(Ipifc *ifc, char **argv, int argc)
 		return Ebadarg;
 
 	while (argsleft > 1) {
-		if(strcmp(argv[i],"recvra")==0) 
+		if(strcmp(argv[i],"recvra")==0)
 			ifc->recvra6 = (atoi(argv[i+1]) != 0);
-		else if(strcmp(argv[i],"sendra")==0) 
+		else if(strcmp(argv[i],"sendra")==0)
 			ifc->sendra6 = (atoi(argv[i+1]) != 0);
-		else if(strcmp(argv[i],"mflag")==0) 
+		else if(strcmp(argv[i],"mflag")==0)
 			ifc->rp.mflag = (atoi(argv[i+1]) != 0);
-		else if(strcmp(argv[i],"oflag")==0) 
+		else if(strcmp(argv[i],"oflag")==0)
 			ifc->rp.oflag = (atoi(argv[i+1]) != 0);
 		else if(strcmp(argv[i],"maxraint")==0)
 			ifc->rp.maxraint = atoi(argv[i+1]);
 		else if(strcmp(argv[i],"minraint")==0)
 			ifc->rp.minraint = atoi(argv[i+1]);
-		else if(strcmp(argv[i],"linkmtu")==0) 
+		else if(strcmp(argv[i],"linkmtu")==0)
 			ifc->rp.linkmtu = atoi(argv[i+1]);
-		else if(strcmp(argv[i],"reachtime")==0) 
+		else if(strcmp(argv[i],"reachtime")==0)
 			ifc->rp.reachtime = atoi(argv[i+1]);
-		else if(strcmp(argv[i],"rxmitra")==0) 
+		else if(strcmp(argv[i],"rxmitra")==0)
 			ifc->rp.rxmitra = atoi(argv[i+1]);
-		else if(strcmp(argv[i],"ttl")==0) 
+		else if(strcmp(argv[i],"ttl")==0)
 			ifc->rp.ttl = atoi(argv[i+1]);
-		else if(strcmp(argv[i],"routerlt")==0) 
+		else if(strcmp(argv[i],"routerlt")==0)
 			ifc->rp.routerlt = atoi(argv[i+1]);
-		else 
-			return Ebadarg;	
+		else
+			return Ebadarg;
 
 		argsleft -= 2;
 		i += 2;
@@ -764,7 +761,7 @@ char*
 ipifcsendra6(Ipifc *ifc, char **argv, int argc)
 {
 	int i;
-	
+
 	i = 0;
 	if(argc > 1)
 		i = atoi(argv[1]);
@@ -776,11 +773,11 @@ char*
 ipifcrecvra6(Ipifc *ifc, char **argv, int argc)
 {
 	int i;
-	
+
 	i = 0;
-	if(argc > 1) 
+	if(argc > 1)
 		i = atoi(argv[1]);
-	ifc->recvra6 = (i!=0);	
+	ifc->recvra6 = (i!=0);
 	return nil;
 }
 
@@ -824,7 +821,7 @@ ipifcctl(Conv* c, char**argv, int argc)
 		return ipifcaddpref6(ifc, argv, argc);
 	else if(strcmp(argv[0], "setpar6") == 0)
 		return ipifcsetpar6(ifc, argv, argc);
-	else if(strcmp(argv[0], "sendra6") == 0) 
+	else if(strcmp(argv[0], "sendra6") == 0)
 		return ipifcsendra6(ifc, argv, argc);
 	else if(strcmp(argv[0], "recvra6") == 0)
 		return ipifcrecvra6(ifc, argv, argc);
@@ -1048,7 +1045,7 @@ remselfcache(Fs *f, Ipifc *ifc, Iplifc *lifc, uchar *a)
 		v4delroute(f, a+IPv4off, IPallbits+IPv4off, 1);
 	else
 		v6delroute(f, a, IPallbits, 1);
-	
+
 	/* no more links, remove from hash and free */
 	*l = p->next;
 	ipselffree(p);
@@ -1096,7 +1093,7 @@ ipselftabread(Fs *f, char *cp, ulong offset, int n)
 }
 
 int
-iptentative(Fs *f, uchar *addr) 
+iptentative(Fs *f, uchar *addr)
 {
  	Ipself *p;
 
@@ -1180,7 +1177,7 @@ findipifc(Fs *f, uchar *remote, int type)
 				return ifc;
 		}
 	}
-		
+
 	return nil;
 }
 
@@ -1209,8 +1206,8 @@ v6addrtype(uchar *addr)
 
 #define v6addrcurr(lifc) (( (lifc)->origint + (lifc)->preflt >= (NOW/10^3) ) || ( (lifc)->preflt == 0xffffffff ))
 
-void
-findprimaryip6(Fs *f, uchar *local)
+static void
+findprimaryipv6(Fs *f, uchar *local)
 {
 	Conv **cp, **e;
 	Ipifc *ifc;
@@ -1230,7 +1227,7 @@ findprimaryip6(Fs *f, uchar *local)
 		ifc = (Ipifc*)(*cp)->ptcl;
 		for(lifc = ifc->lifc; lifc; lifc = lifc->next){
 			atypel = v6addrtype(lifc->local);
-			if(atypel > atype) 
+			if(atypel > atype)
 			if(v6addrcurr(lifc)) {
 				ipmove(local, lifc->local);
 				atype = atypel;
@@ -1242,10 +1239,10 @@ findprimaryip6(Fs *f, uchar *local)
 }
 
 /*
- *  returns first ip address configured 
+ *  returns first ip address configured
  */
-void
-findprimaryip(Fs *f, uchar *local)
+static void
+findprimaryipv4(Fs *f, uchar *local)
 {
 	Conv **cp, **e;
 	Ipifc *ifc;
@@ -1257,7 +1254,7 @@ findprimaryip(Fs *f, uchar *local)
 		if(*cp == 0)
 			continue;
 		ifc = (Ipifc*)(*cp)->ptcl;
-		for(lifc = ifc->lifc; lifc; lifc = lifc->next){
+		if((lifc = ifc->lifc) != nil){
 			ipmove(local, lifc->local);
 			return;
 		}
@@ -1284,7 +1281,7 @@ findlocalip(Fs *f, uchar *local, uchar *remote)
 	qlock(f->ipifc);
 	r = v6lookup(f, remote, nil);
  	version = (memcmp(remote, v4prefix, IPv4off) == 0) ? V4 : V6;
-	
+
 	if(r != nil){
 		ifc = r->ifc;
 		if(r->type & Rv4)
@@ -1328,10 +1325,10 @@ findlocalip(Fs *f, uchar *local, uchar *remote)
 
 	switch(version){
 	case V4:
-		findprimaryip(f, local);
+		findprimaryipv4(f, local);
 		break;
 	case V6:
-		findprimaryip6(f, local);
+		findprimaryipv6(f, local);
 		break;
 	default:
 		panic("findlocalip2: version %d", version);
@@ -1475,7 +1472,7 @@ ipifcaddmulti(Conv *c, uchar *ma, uchar *ia)
 	Fs *f;
 
 	f = c->p->f;
-	
+
 	for(l = &c->multi; *l; l = &(*l)->next)
 		if(ipcmp(ma, (*l)->ma) == 0)
 		if(ipcmp(ia, (*l)->ia) == 0)
@@ -1517,7 +1514,7 @@ ipifcremmulti(Conv *c, uchar *ma, uchar *ia)
 	Fs *f;
 
 	f = c->p->f;
-	
+
 	for(l = &c->multi; *l; l = &(*l)->next)
 		if(ipcmp(ma, (*l)->ma) == 0)
 		if(ipcmp(ia, (*l)->ia) == 0)
@@ -1585,7 +1582,7 @@ ipifcregisterproxy(Fs *f, Ipifc *ifc, uchar *ip)
 			nifc = (Ipifc*)(*cp)->ptcl;
 			if(nifc == ifc)
 				continue;
-	
+
 			rlock(nifc);
 			m = nifc->m;
 			if(m == nil || m->addmulti == nil) {
@@ -1613,7 +1610,7 @@ ipifcregisterproxy(Fs *f, Ipifc *ifc, uchar *ip)
 			nifc = (Ipifc*)(*cp)->ptcl;
 			if(nifc == ifc)
 				continue;
-	
+
 			rlock(nifc);
 			m = nifc->m;
 			if(m == nil || m->areg == nil){
@@ -1640,7 +1637,7 @@ adddefroute6(Fs *f, uchar *gate, int force)
 	Route *r;
 
 	r = v6lookup(f, v6Unspecified, nil);
-	if(r!=nil) 
+	if(r!=nil)
 	if(!(force) && (strcmp(r->tag,"ra")!=0))	// route entries generated
 		return;			// by all other means take
 					// precedence over router annc
@@ -1676,7 +1673,7 @@ ipifcaddpref6(Ipifc *ifc, char**argv, int argc)
 		validlt = atoi(argv[5]);
 		/* fall through */
 	case 5:
-		autoflag =  atoi(argv[4]);
+		autoflag = atoi(argv[4]);
 		/* fall through */
 	case 4:
 		onlink = atoi(argv[3]);
@@ -1703,11 +1700,11 @@ ipifcaddpref6(Ipifc *ifc, char**argv, int argc)
 	lifc->preflt = preflt;
 	lifc->origint = origint;
 
-	if(ifc->m->pref2addr!=nil) 
+	if(ifc->m->pref2addr!=nil)
 		ifc->m->pref2addr(prefix, ifc->mac);
 	else
 		return Ebadarg;
-	
+
 	sprint(addr, "%I", prefix);
 	sprint(preflen, "/%d", plen);
 	params[0] = "add";

+ 0 - 1
sys/src/9/pc/mp.c

@@ -369,7 +369,6 @@ squidboy(Apic* apic)
 	lapicinit(apic);
 	lapiconline();
 	syncclock();
-	timersinit();
 
 	fpoff();
 

+ 13 - 20
sys/src/9/pc/wavelan.c

@@ -300,29 +300,22 @@ w_read(Ctlr* ctlr, int type, int off, void* buf, ulong len)
 static int
 w_write(Ctlr* ctlr, int type, int off, void* buf, ulong len)
 {
-	int tries;
-
-	for (tries=0; tries < WTmOut; tries++){
-		if(w_seek(ctlr, type, off, 0)){
-			DEBUG("wavelan: w_write: seek failed\n");
-			return 0;
-		}
-
-		csr_outss(ctlr, WR_Data0, buf, len/2);
+	if(w_seek(ctlr, type, off, 0)){
+		DEBUG("wavelan: w_write: seek failed\n");
+		return 0;
+	}
 
-		csr_outs(ctlr, WR_Data0, 0xdead);
-		csr_outs(ctlr, WR_Data0, 0xbeef);
-		if(w_seek(ctlr, type, off + len, 0)){
-			DEBUG("wavelan: write seek failed\n");
-			return 0;
-		}
-		if(csr_ins(ctlr, WR_Data0) == 0xdead)
-		if(csr_ins(ctlr, WR_Data0) == 0xbeef)
-			return len;
-		DEBUG("wavelan: Hermes bug byte.\n");
+	csr_outss(ctlr, WR_Data0, buf, len/2);
+	csr_outs(ctlr, WR_Data0, 0xdead);
+	csr_outs(ctlr, WR_Data0, 0xbeef);
+	if(w_seek(ctlr, type, off + len, 0)){
+		DEBUG("wavelan: write seek failed\n");
 		return 0;
 	}
-	DEBUG("wavelan: tx timeout\n");
+	if(csr_ins(ctlr, WR_Data0) == 0xdead && csr_ins(ctlr, WR_Data0) == 0xbeef)
+		return len;
+
+	DEBUG("wavelan: Hermes bug byte.\n");
 	return 0;
 }
 

+ 17 - 17
sys/src/9/port/chan.c

@@ -1593,25 +1593,25 @@ if(c->umh != nil){
 			c = cnew;
 			c->path = addelem(c->path, e.elems[e.nelems-1], nil);
 			break;
-		}else{		/* create failed */
-			cclose(cnew);
-			if(m)
-				putmhead(m);
-			if(omode & OEXCL)
-				nexterror();
-			/* save error */
-			createerr = up->errstr;
-			up->errstr = tmperrbuf;
-			/* note: we depend that walk does not error */
-			if(walk(&c, e.elems+e.nelems-1, 1, nomount, nil) < 0){
-				up->errstr = createerr;
-				error(createerr);	/* report true error */
-			}
+		}
+
+		/* create failed */
+		cclose(cnew);
+		if(m)
+			putmhead(m);
+		if(omode & OEXCL)
+			nexterror();
+		/* save error */
+		createerr = up->errstr;
+		up->errstr = tmperrbuf;
+		/* note: we depend that walk does not error */
+		if(walk(&c, e.elems+e.nelems-1, 1, nomount, nil) < 0){
 			up->errstr = createerr;
-			omode |= OTRUNC;
-			goto Open;
+			error(createerr);	/* report true error */
 		}
-		panic("namec: not reached");				
+		up->errstr = createerr;
+		omode |= OTRUNC;
+		goto Open;
 
 	default:
 		panic("unknown namec access %d\n", amode);

+ 2 - 3
sys/src/9/port/dev.c

@@ -264,7 +264,7 @@ devstat(Chan *c, uchar *db, int n, Dirtab *tab, int ntab, Devgen *gen)
 	Dir dir;
 	char *p, *elem;
 
-	for(i=0;; i++)
+	for(i=0;; i++){
 		switch((*gen)(c, nil, tab, ntab, i, &dir)){
 		case -1:
 			if(c->qid.type & QTDIR){
@@ -297,8 +297,7 @@ devstat(Chan *c, uchar *db, int n, Dirtab *tab, int ntab, Devgen *gen)
 			}
 			break;
 		}
-	error(Egreg);	/* not reached? */
-	return -1;
+	}
 }
 
 long

+ 0 - 1
sys/src/9/port/devroot.c

@@ -159,7 +159,6 @@ panic("whoops");
 		devdir(c, d->qid, d->name, d->length, eve, d->perm, dp);
 		return 1;
 	}
-	return -1;
 }
 
 static Walkqid*

+ 0 - 1
sys/src/9/port/devsd.c

@@ -1156,7 +1156,6 @@ sdread(Chan *c, void *a, long n, vlong off)
 		return sdbio(c, 0, a, n, off);
 	}
 
-	return 0;
 }
 
 static void legacytopctl(Cmdbuf*);

+ 0 - 1
sys/src/9/port/devssl.c

@@ -233,7 +233,6 @@ sslgen(Chan *c, char*, Dirtab *d, int nd, int s, Dir *dp)
 		devdir(c, c->qid, sslnames[TYPE(c->qid)], 0, nm, 0660, dp);
 		return 1;
 	}
-	return -1;
 }
 
 static Chan*

+ 0 - 1
sys/src/9/port/devtls.c

@@ -376,7 +376,6 @@ tlsgen(Chan *c, char*, Dirtab *, int, int s, Dir *dp)
 		unlock(&tdlock);
 		return 1;
 	}
-	return -1;
 }
 
 static Chan*

+ 4 - 0
sys/src/9/port/portclock.c

@@ -209,6 +209,10 @@ timersinit(void)
 {
 	Timer *t;
 
+	/*
+	 * This is only called on the bootstrap processor; hence,
+	 * the Hzclock will only be active on that processor
+	 */
 	todinit();
 	t = malloc(sizeof(*t));
 	t->tmode = Tperiodic;

+ 35 - 2
sys/src/9/port/taslock.c

@@ -6,6 +6,11 @@
 #include "../port/error.h"
 #include "edf.h"
 
+uvlong maxlockcycles;
+uvlong maxilockcycles;
+ulong maxlockpc;
+ulong maxilockpc;
+
 struct
 {
 	ulong	locks;
@@ -73,6 +78,9 @@ lock(Lock *l)
 		l->pc = pc;
 		l->p = up;
 		l->isilock = 0;
+#ifdef LOCKCYCLES
+		cycles(&l->lockcycles);
+#endif
 		return 0;
 	}
 	if(up)
@@ -105,12 +113,14 @@ lock(Lock *l)
 			l->pc = pc;
 			l->p = up;
 			l->isilock = 0;
+#ifdef LOCKCYCLES
+			cycles(&l->lockcycles);
+#endif
 			return 1;
 		}
 		if(up)
 			deccnt(&up->nlocks);
 	}
-	return 0;	/* For the compiler */
 }
 
 void
@@ -157,6 +167,9 @@ acquire:
 	l->p = up;
 	l->isilock = 1;
 	l->m = MACHP(m->machno);
+#ifdef LOCKCYCLES
+	cycles(&l->lockcycles);
+#endif
 }
 
 int
@@ -176,12 +189,24 @@ canlock(Lock *l)
 	l->p = up;
 	l->m = MACHP(m->machno);
 	l->isilock = 0;
+#ifdef LOCKCYCLES
+	cycles(&l->lockcycles);
+#endif
 	return 1;
 }
 
 void
 unlock(Lock *l)
 {
+#ifdef LOCKCYCLES
+	uvlong x;
+	cycles(&x);
+	l->lockcycles = x - l->lockcycles;
+	if(l->lockcycles > maxlockcycles){
+		maxlockcycles = l->lockcycles;
+		maxlockpc = l->pc;
+	}
+#endif
 	if(l->key == 0)
 		print("unlock: not locked: pc %luX\n", getcallerpc(&l));
 	if(l->isilock)
@@ -206,6 +231,15 @@ iunlock(Lock *l)
 {
 	ulong sr;
 
+#ifdef LOCKCYCLES
+	uvlong x;
+	cycles(&x);
+	l->lockcycles = x - l->lockcycles;
+	if(l->lockcycles > maxilockcycles){
+		maxilockcycles = l->lockcycles;
+		maxilockpc = l->pc;
+	}
+#endif
 	if(l->key == 0)
 		print("iunlock: not locked: pc %luX\n", getcallerpc(&l));
 	if(!l->isilock)
@@ -217,7 +251,6 @@ iunlock(Lock *l)
 	l->m = nil;
 	l->key = 0;
 	coherence();
-
 	m->ilockdepth--;
 	if(up)
 		up->lastilock = nil;

+ 4 - 2
sys/src/cmd/pcc.c

@@ -11,14 +11,16 @@ typedef struct Objtype {
 } Objtype;
 
 Objtype objtype[] = {
+	{"spim",	"0c", "0l", "0", "0.out"},
+	{"68000",	"1c", "1l", "1", "1.out"},
 	{"68020",	"2c", "2l", "2", "2.out"},
 	{"arm",		"5c", "5l", "5", "5.out"},
 	{"amd64",	"6c", "6l", "6", "6.out"},
 	{"alpha",	"7c", "7l", "7", "7.out"},
 	{"386",		"8c", "8l", "8", "8.out"},
 	{"sparc",	"kc", "kl", "k", "k.out"},
-	{"mips",	"vc", "vl", "v", "v.out"},
 	{"power",	"qc", "ql", "q", "q.out"},
+	{"mips",	"vc", "vl", "v", "v.out"},
 };
 
 enum {
@@ -33,7 +35,7 @@ typedef struct List {
 
 List	srcs, objs, cpp, cc, ld, ldargs;
 int	cflag, vflag, Eflag, Pflag;
-char	*allos = "2478kqv";
+char	*allos = "01245678kqv";
 
 void	append(List *, char *);
 char	*changeext(char *, char *);