Browse Source

Plan 9 from Bell Labs 2008-08-11

David du Colombier 12 years ago
parent
commit
e4efa3883d

+ 37 - 37
dist/replica/_plan9.db

@@ -194,7 +194,7 @@
 386/bin/cpp - 775 sys sys 1210392637 149307
 386/bin/cpu - 775 sys sys 1209614224 139154
 386/bin/crop - 775 sys sys 1168402298 116374
-386/bin/cwfs - 775 sys sys 1210392646 366062
+386/bin/cwfs - 775 sys sys 1218339131 366141
 386/bin/date - 775 sys sys 1178568265 41845
 386/bin/db - 775 sys sys 1209614238 349234
 386/bin/dc - 775 sys sys 1210392648 99250
@@ -475,7 +475,7 @@
 386/bin/upas/msgcat - 775 sys sys 1064598353 38
 386/bin/upas/msgtok - 775 sys sys 1209614742 76769
 386/bin/upas/nedmail - 775 sys sys 1215402278 156303
-386/bin/upas/pop3 - 775 sys sys 1210393018 263478
+386/bin/upas/pop3 - 775 sys sys 1218339137 263543
 386/bin/upas/qer - 775 sys sys 1209614754 99206
 386/bin/upas/ratfs - 775 sys sys 1209614758 111371
 386/bin/upas/runq - 775 sys sys 1209614760 112853
@@ -7950,19 +7950,19 @@ sys/src/9/alphapc/initcode - 664 sys sys 1039753419 779
 sys/src/9/alphapc/io.h - 664 sys sys 1137179966 4618
 sys/src/9/alphapc/kbd.c - 664 sys sys 1015012785 8676
 sys/src/9/alphapc/l.s - 664 sys sys 1143129848 9367
-sys/src/9/alphapc/main.c - 664 sys sys 1173386681 13753
+sys/src/9/alphapc/main.c - 664 sys sys 1218342139 13750
 sys/src/9/alphapc/mem.h - 664 sys sys 1137179967 2312
 sys/src/9/alphapc/memmove.s - 664 sys sys 1015012786 2936
 sys/src/9/alphapc/memset.s - 664 sys sys 1015012786 844
 sys/src/9/alphapc/mkfile - 664 sys sys 1204233063 1997
-sys/src/9/alphapc/mmu.c - 664 sys sys 1173788325 5218
+sys/src/9/alphapc/mmu.c - 664 sys sys 1218342126 5217
 sys/src/9/alphapc/osf1pal.h - 664 sys sys 1137179966 1471
 sys/src/9/alphapc/pci.c - 664 sys sys 1039753420 7868
 sys/src/9/alphapc/screen.h - 664 sys sys 1147108286 3923
 sys/src/9/alphapc/sd53c8xx.c - 664 sys sys 1137179967 55257
 sys/src/9/alphapc/sd53c8xx.i - 664 sys sys 1204233026 28453
 sys/src/9/alphapc/sio.c - 664 sys sys 1015012787 293
-sys/src/9/alphapc/trap.c - 664 sys sys 1105030177 18099
+sys/src/9/alphapc/trap.c - 664 sys sys 1218342130 18094
 sys/src/9/bitsy - 20000000775 sys sys 1138505096 0
 sys/src/9/bitsy/Booting101 - 664 sys sys 1054798506 8841
 sys/src/9/bitsy/bitsy - 664 sys sys 1188582377 420
@@ -7992,7 +7992,7 @@ sys/src/9/bitsy/main.c - 664 sys sys 1143129874 8951
 sys/src/9/bitsy/map - 664 sys sys 1017695515 236
 sys/src/9/bitsy/mem.h - 664 sys sys 1055700932 8049
 sys/src/9/bitsy/mkfile - 664 sys sys 1204232952 2856
-sys/src/9/bitsy/mmu.c - 664 sys sys 1171761416 11656
+sys/src/9/bitsy/mmu.c - 664 sys sys 1218342033 11662
 sys/src/9/bitsy/mouse.c - 664 sys sys 1017695516 962
 sys/src/9/bitsy/paqfiles - 20000000775 sys sys 1039727524 0
 sys/src/9/bitsy/paqfiles/cpurc - 664 sys sys 1020011249 3524
@@ -8001,7 +8001,7 @@ sys/src/9/bitsy/paqfiles/mfs - 664 sys sys 1032053161 1009
 sys/src/9/bitsy/paqfiles/namespace - 664 sys sys 1020011250 1061
 sys/src/9/bitsy/paqfiles/startip - 664 sys sys 1020011250 212
 sys/src/9/bitsy/paqfiles/unicode.6.font - 664 sys sys 1020011250 138
-sys/src/9/bitsy/power.c - 664 sys sys 1171761416 7376
+sys/src/9/bitsy/power.c - 664 sys sys 1218342040 7372
 sys/src/9/bitsy/random.c - 664 sys sys 1036813517 1982
 sys/src/9/bitsy/sa1110dma.c - 664 sys sys 1017695520 4666
 sys/src/9/bitsy/sa1110dma.h - 664 sys sys 1017695520 381
@@ -8115,7 +8115,7 @@ sys/src/9/pc/devlml.h - 664 sys sys 1184470164 3031
 sys/src/9/pc/devlpt.c - 664 sys sys 1184469951 4423
 sys/src/9/pc/devpccard.c - 664 sys sys 1184469910 39336
 sys/src/9/pc/devrtc.c - 664 sys sys 1015014515 7167
-sys/src/9/pc/devtv.c - 664 sys sys 1184469620 45423
+sys/src/9/pc/devtv.c - 664 sys sys 1218342190 45417
 sys/src/9/pc/devusb.c - 664 sys sys 1206740166 21073
 sys/src/9/pc/devvga.c - 664 sys sys 1181083003 9334
 sys/src/9/pc/dma.c - 664 sys sys 1142966373 5332
@@ -8164,7 +8164,7 @@ sys/src/9/pc/main.c - 664 sys sys 1168306227 15337
 sys/src/9/pc/mem.h - 664 sys sys 1196193040 5308
 sys/src/9/pc/memory.c - 664 sys sys 1196193039 18878
 sys/src/9/pc/mkfile - 664 sys sys 1204231465 4152
-sys/src/9/pc/mmu.c - 664 sys sys 1171688128 24591
+sys/src/9/pc/mmu.c - 664 sys sys 1218342291 24548
 sys/src/9/pc/mouse.c - 664 sys sys 1203981356 7190
 sys/src/9/pc/mp.c - 664 sys sys 1162388126 17349
 sys/src/9/pc/mp.h - 664 sys sys 1173288116 6799
@@ -8197,15 +8197,15 @@ sys/src/9/pc/sdiahci.c - 664 sys sys 1213134393 39005
 sys/src/9/pc/sdmv50xx.c - 664 sys sys 1204232564 34031
 sys/src/9/pc/sdmylex.c - 664 sys sys 1189229947 28395
 sys/src/9/pc/sdscsi.c - 664 sys sys 1186618532 7957
-sys/src/9/pc/trap.c - 664 sys sys 1215712014 22027
+sys/src/9/pc/trap.c - 664 sys sys 1218342303 22025
 sys/src/9/pc/uartaxp.c - 664 sys sys 1207419955 18931
 sys/src/9/pc/uartaxp.i - 664 sys sys 1155243528 111326
 sys/src/9/pc/uarti8250.c - 664 sys sys 1177676872 13957
 sys/src/9/pc/uartisa.c - 664 sys sys 1127126907 1777
 sys/src/9/pc/uartpci.c - 664 sys sys 1216677181 4912
 sys/src/9/pc/usb.h - 664 sys sys 1202865355 4630
-sys/src/9/pc/usbohci.c - 664 sys sys 1213134352 48372
-sys/src/9/pc/usbuhci.c - 664 sys sys 1202252076 31839
+sys/src/9/pc/usbohci.c - 664 sys sys 1218342331 48280
+sys/src/9/pc/usbuhci.c - 664 sys sys 1218342383 31740
 sys/src/9/pc/vga.c - 664 sys sys 1131290595 5148
 sys/src/9/pc/vga3dfx.c - 664 sys sys 1133218367 3833
 sys/src/9/pc/vgaark2000pv.c - 664 sys sys 1131290600 3422
@@ -8217,11 +8217,11 @@ 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 1135487942 4421
-sys/src/9/pc/vgamach64xx.c - 664 sys sys 1184466732 28044
+sys/src/9/pc/vgamach64xx.c - 664 sys sys 1218342429 28052
 sys/src/9/pc/vgamga2164w.c - 664 sys sys 1132331257 4769
 sys/src/9/pc/vgamga4xx.c - 664 sys sys 1155364221 9879
-sys/src/9/pc/vganeomagic.c - 664 sys sys 1131422294 10255
-sys/src/9/pc/vganvidia.c - 664 sys sys 1145906148 12373
+sys/src/9/pc/vganeomagic.c - 664 sys sys 1218342438 10257
+sys/src/9/pc/vganvidia.c - 664 sys sys 1218342448 12370
 sys/src/9/pc/vgargb524.c - 664 sys sys 1131290602 4251
 sys/src/9/pc/vgas3.c - 664 sys sys 1131290603 10994
 sys/src/9/pc/vgasavage.c - 664 sys sys 1064679984 16251
@@ -8239,16 +8239,16 @@ 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/aoe.h - 664 sys sys 1196312063 1000
 sys/src/9/port/auth.c - 664 sys sys 1123647282 2392
-sys/src/9/port/cache.c - 664 sys sys 1170456667 9285
-sys/src/9/port/chan.c - 664 sys sys 1195585806 34962
+sys/src/9/port/cache.c - 664 sys sys 1218341675 9283
+sys/src/9/port/chan.c - 664 sys sys 1218341699 34955
 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 1205381832 8204
-sys/src/9/port/devaoe.c - 664 sys sys 1199910511 42083
-sys/src/9/port/devaudio.c - 664 sys sys 1170456648 21199
+sys/src/9/port/dev.c - 664 sys sys 1218341650 8203
+sys/src/9/port/devaoe.c - 664 sys sys 1218341718 42083
+sys/src/9/port/devaudio.c - 664 sys sys 1218341736 21192
 sys/src/9/port/devbridge.c - 664 sys sys 1204227718 24003
 sys/src/9/port/devcap.c - 664 sys sys 1178886040 4141
-sys/src/9/port/devcons.c - 664 sys sys 1204228551 23192
+sys/src/9/port/devcons.c - 664 sys sys 1218341771 23176
 sys/src/9/port/devdraw.c - 664 sys sys 1147023550 44447
 sys/src/9/port/devdup.c - 664 sys sys 1196185172 2327
 sys/src/9/port/devenv.c - 664 sys sys 1169498893 7015
@@ -8256,32 +8256,32 @@ sys/src/9/port/devfs.c - 664 sys sys 1191279047 14902
 sys/src/9/port/devkbmap.c - 664 sys sys 1130763846 3064
 sys/src/9/port/devkprof.c - 664 sys sys 1014931173 3111
 sys/src/9/port/devloopback.c - 664 sys sys 1138458368 14579
-sys/src/9/port/devmnt.c - 664 sys sys 1134659798 20918
+sys/src/9/port/devmnt.c - 664 sys sys 1218341783 20915
 sys/src/9/port/devmntstats.c - 664 sys sys 1014931173 4039
 sys/src/9/port/devmouse.c - 664 sys sys 1192564555 13904
-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/devpipe.c - 664 sys sys 1218341792 5824
+sys/src/9/port/devpnp.c - 664 sys sys 1218341827 13623
 sys/src/9/port/devproc.c - 664 sys sys 1210984256 28480
 sys/src/9/port/devroot.c - 664 sys sys 1146151714 4242
 sys/src/9/port/devsd.c - 664 sys sys 1212099662 31288
-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/devsdp.c - 664 sys sys 1218341848 44798
+sys/src/9/port/devsegment.c - 664 sys sys 1218341861 9608
 sys/src/9/port/devsrv.c - 664 sys sys 1165810571 5711
 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 1146151715 45214
+sys/src/9/port/devtls.c - 664 sys sys 1218341873 45212
 sys/src/9/port/devuart.c - 664 sys sys 1170456620 12262
 sys/src/9/port/devwd.c - 664 sys sys 1126582325 2342
-sys/src/9/port/edf.c - 664 sys sys 1204230576 13592
+sys/src/9/port/edf.c - 664 sys sys 1218341914 13586
 sys/src/9/port/edf.h - 664 sys sys 1138469072 1195
 sys/src/9/port/error.h - 664 sys sys 1204179766 2688
-sys/src/9/port/fault.c - 664 sys sys 1204230735 7409
+sys/src/9/port/fault.c - 664 sys sys 1218341927 7407
 sys/src/9/port/initcode.c - 664 sys sys 1055688491 574
 sys/src/9/port/latin1.c - 664 sys sys 1015278339 1418
 sys/src/9/port/latin1.h - 664 sys sys 1184794985 3575
-sys/src/9/port/lib.h - 664 sys sys 1131289913 6040
+sys/src/9/port/lib.h - 664 sys sys 1218341881 6740
 sys/src/9/port/log.c - 664 sys sys 1014931175 2860
-sys/src/9/port/master - 664 sys sys 1205009260 507
+sys/src/9/port/master - 664 sys sys 1218341605 507
 sys/src/9/port/master.local - 664 sys sys 1205009250 117
 sys/src/9/port/mkbootrules - 775 sys sys 1055700518 923
 sys/src/9/port/mkdevc - 775 sys sys 1173287346 4203
@@ -8297,28 +8297,28 @@ sys/src/9/port/mksystab - 664 sys sys 1014931176 783
 sys/src/9/port/mul64fract.c - 664 sys sys 1071671674 867
 sys/src/9/port/netif.c - 664 sys sys 1178831077 13474
 sys/src/9/port/netif.h - 664 sys sys 1187735815 3059
-sys/src/9/port/page.c - 664 sys sys 1131636090 11128
+sys/src/9/port/page.c - 664 sys sys 1218341935 11124
 sys/src/9/port/parse.c - 664 sys sys 1014931177 2026
 sys/src/9/port/pgrp.c - 664 sys sys 1210369414 5000
 sys/src/9/port/portclock.c - 664 sys sys 1206317920 4274
-sys/src/9/port/portdat.h - 664 sys sys 1210369632 22770
+sys/src/9/port/portdat.h - 664 sys sys 1218341881 21809
 sys/src/9/port/portfns.h - 664 sys sys 1206317920 11095
 sys/src/9/port/portmkfile - 664 sys sys 1184737233 2082
 sys/src/9/port/print.c - 664 sys sys 1014931178 227
-sys/src/9/port/proc.c - 664 sys sys 1210370385 28829
+sys/src/9/port/proc.c - 664 sys sys 1218341949 28813
 sys/src/9/port/qio.c - 664 sys sys 1197732972 23616
-sys/src/9/port/qlock.c - 664 sys sys 1178057654 3300
+sys/src/9/port/qlock.c - 664 sys sys 1218341971 3299
 sys/src/9/port/rdb.c - 664 sys sys 1184465938 1704
 sys/src/9/port/rebootcmd.c - 664 sys sys 1015278340 1561
 sys/src/9/port/sd.h - 664 sys sys 1186618553 2499
-sys/src/9/port/sdaoe.c - 664 sys sys 1199910517 9920
+sys/src/9/port/sdaoe.c - 664 sys sys 1218341980 9919
 sys/src/9/port/segment.c - 664 sys sys 1170456581 14052
 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 1188922869 22120
 sys/src/9/port/sysproc.c - 664 sys sys 1188922870 21419
 sys/src/9/port/systab.h - 664 sys sys 1161222889 3204
-sys/src/9/port/taslock.c - 664 sys sys 1212083600 4478
+sys/src/9/port/taslock.c - 664 sys sys 1218341995 4459
 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 1204228653 5445

+ 37 - 37
dist/replica/plan9.db

@@ -194,7 +194,7 @@
 386/bin/cpp - 775 sys sys 1210392637 149307
 386/bin/cpu - 775 sys sys 1209614224 139154
 386/bin/crop - 775 sys sys 1168402298 116374
-386/bin/cwfs - 775 sys sys 1210392646 366062
+386/bin/cwfs - 775 sys sys 1218339131 366141
 386/bin/date - 775 sys sys 1178568265 41845
 386/bin/db - 775 sys sys 1209614238 349234
 386/bin/dc - 775 sys sys 1210392648 99250
@@ -475,7 +475,7 @@
 386/bin/upas/msgcat - 775 sys sys 1064598353 38
 386/bin/upas/msgtok - 775 sys sys 1209614742 76769
 386/bin/upas/nedmail - 775 sys sys 1215402278 156303
-386/bin/upas/pop3 - 775 sys sys 1210393018 263478
+386/bin/upas/pop3 - 775 sys sys 1218339137 263543
 386/bin/upas/qer - 775 sys sys 1209614754 99206
 386/bin/upas/ratfs - 775 sys sys 1209614758 111371
 386/bin/upas/runq - 775 sys sys 1209614760 112853
@@ -7950,19 +7950,19 @@ sys/src/9/alphapc/initcode - 664 sys sys 1039753419 779
 sys/src/9/alphapc/io.h - 664 sys sys 1137179966 4618
 sys/src/9/alphapc/kbd.c - 664 sys sys 1015012785 8676
 sys/src/9/alphapc/l.s - 664 sys sys 1143129848 9367
-sys/src/9/alphapc/main.c - 664 sys sys 1173386681 13753
+sys/src/9/alphapc/main.c - 664 sys sys 1218342139 13750
 sys/src/9/alphapc/mem.h - 664 sys sys 1137179967 2312
 sys/src/9/alphapc/memmove.s - 664 sys sys 1015012786 2936
 sys/src/9/alphapc/memset.s - 664 sys sys 1015012786 844
 sys/src/9/alphapc/mkfile - 664 sys sys 1204233063 1997
-sys/src/9/alphapc/mmu.c - 664 sys sys 1173788325 5218
+sys/src/9/alphapc/mmu.c - 664 sys sys 1218342126 5217
 sys/src/9/alphapc/osf1pal.h - 664 sys sys 1137179966 1471
 sys/src/9/alphapc/pci.c - 664 sys sys 1039753420 7868
 sys/src/9/alphapc/screen.h - 664 sys sys 1147108286 3923
 sys/src/9/alphapc/sd53c8xx.c - 664 sys sys 1137179967 55257
 sys/src/9/alphapc/sd53c8xx.i - 664 sys sys 1204233026 28453
 sys/src/9/alphapc/sio.c - 664 sys sys 1015012787 293
-sys/src/9/alphapc/trap.c - 664 sys sys 1105030177 18099
+sys/src/9/alphapc/trap.c - 664 sys sys 1218342130 18094
 sys/src/9/bitsy - 20000000775 sys sys 1138505096 0
 sys/src/9/bitsy/Booting101 - 664 sys sys 1054798506 8841
 sys/src/9/bitsy/bitsy - 664 sys sys 1188582377 420
@@ -7992,7 +7992,7 @@ sys/src/9/bitsy/main.c - 664 sys sys 1143129874 8951
 sys/src/9/bitsy/map - 664 sys sys 1017695515 236
 sys/src/9/bitsy/mem.h - 664 sys sys 1055700932 8049
 sys/src/9/bitsy/mkfile - 664 sys sys 1204232952 2856
-sys/src/9/bitsy/mmu.c - 664 sys sys 1171761416 11656
+sys/src/9/bitsy/mmu.c - 664 sys sys 1218342033 11662
 sys/src/9/bitsy/mouse.c - 664 sys sys 1017695516 962
 sys/src/9/bitsy/paqfiles - 20000000775 sys sys 1039727524 0
 sys/src/9/bitsy/paqfiles/cpurc - 664 sys sys 1020011249 3524
@@ -8001,7 +8001,7 @@ sys/src/9/bitsy/paqfiles/mfs - 664 sys sys 1032053161 1009
 sys/src/9/bitsy/paqfiles/namespace - 664 sys sys 1020011250 1061
 sys/src/9/bitsy/paqfiles/startip - 664 sys sys 1020011250 212
 sys/src/9/bitsy/paqfiles/unicode.6.font - 664 sys sys 1020011250 138
-sys/src/9/bitsy/power.c - 664 sys sys 1171761416 7376
+sys/src/9/bitsy/power.c - 664 sys sys 1218342040 7372
 sys/src/9/bitsy/random.c - 664 sys sys 1036813517 1982
 sys/src/9/bitsy/sa1110dma.c - 664 sys sys 1017695520 4666
 sys/src/9/bitsy/sa1110dma.h - 664 sys sys 1017695520 381
@@ -8115,7 +8115,7 @@ sys/src/9/pc/devlml.h - 664 sys sys 1184470164 3031
 sys/src/9/pc/devlpt.c - 664 sys sys 1184469951 4423
 sys/src/9/pc/devpccard.c - 664 sys sys 1184469910 39336
 sys/src/9/pc/devrtc.c - 664 sys sys 1015014515 7167
-sys/src/9/pc/devtv.c - 664 sys sys 1184469620 45423
+sys/src/9/pc/devtv.c - 664 sys sys 1218342190 45417
 sys/src/9/pc/devusb.c - 664 sys sys 1206740166 21073
 sys/src/9/pc/devvga.c - 664 sys sys 1181083003 9334
 sys/src/9/pc/dma.c - 664 sys sys 1142966373 5332
@@ -8164,7 +8164,7 @@ sys/src/9/pc/main.c - 664 sys sys 1168306227 15337
 sys/src/9/pc/mem.h - 664 sys sys 1196193040 5308
 sys/src/9/pc/memory.c - 664 sys sys 1196193039 18878
 sys/src/9/pc/mkfile - 664 sys sys 1204231465 4152
-sys/src/9/pc/mmu.c - 664 sys sys 1171688128 24591
+sys/src/9/pc/mmu.c - 664 sys sys 1218342291 24548
 sys/src/9/pc/mouse.c - 664 sys sys 1203981356 7190
 sys/src/9/pc/mp.c - 664 sys sys 1162388126 17349
 sys/src/9/pc/mp.h - 664 sys sys 1173288116 6799
@@ -8197,15 +8197,15 @@ sys/src/9/pc/sdiahci.c - 664 sys sys 1213134393 39005
 sys/src/9/pc/sdmv50xx.c - 664 sys sys 1204232564 34031
 sys/src/9/pc/sdmylex.c - 664 sys sys 1189229947 28395
 sys/src/9/pc/sdscsi.c - 664 sys sys 1186618532 7957
-sys/src/9/pc/trap.c - 664 sys sys 1215712014 22027
+sys/src/9/pc/trap.c - 664 sys sys 1218342303 22025
 sys/src/9/pc/uartaxp.c - 664 sys sys 1207419955 18931
 sys/src/9/pc/uartaxp.i - 664 sys sys 1155243528 111326
 sys/src/9/pc/uarti8250.c - 664 sys sys 1177676872 13957
 sys/src/9/pc/uartisa.c - 664 sys sys 1127126907 1777
 sys/src/9/pc/uartpci.c - 664 sys sys 1216677181 4912
 sys/src/9/pc/usb.h - 664 sys sys 1202865355 4630
-sys/src/9/pc/usbohci.c - 664 sys sys 1213134352 48372
-sys/src/9/pc/usbuhci.c - 664 sys sys 1202252076 31839
+sys/src/9/pc/usbohci.c - 664 sys sys 1218342331 48280
+sys/src/9/pc/usbuhci.c - 664 sys sys 1218342383 31740
 sys/src/9/pc/vga.c - 664 sys sys 1131290595 5148
 sys/src/9/pc/vga3dfx.c - 664 sys sys 1133218367 3833
 sys/src/9/pc/vgaark2000pv.c - 664 sys sys 1131290600 3422
@@ -8217,11 +8217,11 @@ 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 1135487942 4421
-sys/src/9/pc/vgamach64xx.c - 664 sys sys 1184466732 28044
+sys/src/9/pc/vgamach64xx.c - 664 sys sys 1218342429 28052
 sys/src/9/pc/vgamga2164w.c - 664 sys sys 1132331257 4769
 sys/src/9/pc/vgamga4xx.c - 664 sys sys 1155364221 9879
-sys/src/9/pc/vganeomagic.c - 664 sys sys 1131422294 10255
-sys/src/9/pc/vganvidia.c - 664 sys sys 1145906148 12373
+sys/src/9/pc/vganeomagic.c - 664 sys sys 1218342438 10257
+sys/src/9/pc/vganvidia.c - 664 sys sys 1218342448 12370
 sys/src/9/pc/vgargb524.c - 664 sys sys 1131290602 4251
 sys/src/9/pc/vgas3.c - 664 sys sys 1131290603 10994
 sys/src/9/pc/vgasavage.c - 664 sys sys 1064679984 16251
@@ -8239,16 +8239,16 @@ 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/aoe.h - 664 sys sys 1196312063 1000
 sys/src/9/port/auth.c - 664 sys sys 1123647282 2392
-sys/src/9/port/cache.c - 664 sys sys 1170456667 9285
-sys/src/9/port/chan.c - 664 sys sys 1195585806 34962
+sys/src/9/port/cache.c - 664 sys sys 1218341675 9283
+sys/src/9/port/chan.c - 664 sys sys 1218341699 34955
 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 1205381832 8204
-sys/src/9/port/devaoe.c - 664 sys sys 1199910511 42083
-sys/src/9/port/devaudio.c - 664 sys sys 1170456648 21199
+sys/src/9/port/dev.c - 664 sys sys 1218341650 8203
+sys/src/9/port/devaoe.c - 664 sys sys 1218341718 42083
+sys/src/9/port/devaudio.c - 664 sys sys 1218341736 21192
 sys/src/9/port/devbridge.c - 664 sys sys 1204227718 24003
 sys/src/9/port/devcap.c - 664 sys sys 1178886040 4141
-sys/src/9/port/devcons.c - 664 sys sys 1204228551 23192
+sys/src/9/port/devcons.c - 664 sys sys 1218341771 23176
 sys/src/9/port/devdraw.c - 664 sys sys 1147023550 44447
 sys/src/9/port/devdup.c - 664 sys sys 1196185172 2327
 sys/src/9/port/devenv.c - 664 sys sys 1169498893 7015
@@ -8256,32 +8256,32 @@ sys/src/9/port/devfs.c - 664 sys sys 1191279047 14902
 sys/src/9/port/devkbmap.c - 664 sys sys 1130763846 3064
 sys/src/9/port/devkprof.c - 664 sys sys 1014931173 3111
 sys/src/9/port/devloopback.c - 664 sys sys 1138458368 14579
-sys/src/9/port/devmnt.c - 664 sys sys 1134659798 20918
+sys/src/9/port/devmnt.c - 664 sys sys 1218341783 20915
 sys/src/9/port/devmntstats.c - 664 sys sys 1014931173 4039
 sys/src/9/port/devmouse.c - 664 sys sys 1192564555 13904
-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/devpipe.c - 664 sys sys 1218341792 5824
+sys/src/9/port/devpnp.c - 664 sys sys 1218341827 13623
 sys/src/9/port/devproc.c - 664 sys sys 1210984256 28480
 sys/src/9/port/devroot.c - 664 sys sys 1146151714 4242
 sys/src/9/port/devsd.c - 664 sys sys 1212099662 31288
-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/devsdp.c - 664 sys sys 1218341848 44798
+sys/src/9/port/devsegment.c - 664 sys sys 1218341861 9608
 sys/src/9/port/devsrv.c - 664 sys sys 1165810571 5711
 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 1146151715 45214
+sys/src/9/port/devtls.c - 664 sys sys 1218341873 45212
 sys/src/9/port/devuart.c - 664 sys sys 1170456620 12262
 sys/src/9/port/devwd.c - 664 sys sys 1126582325 2342
-sys/src/9/port/edf.c - 664 sys sys 1204230576 13592
+sys/src/9/port/edf.c - 664 sys sys 1218341914 13586
 sys/src/9/port/edf.h - 664 sys sys 1138469072 1195
 sys/src/9/port/error.h - 664 sys sys 1204179766 2688
-sys/src/9/port/fault.c - 664 sys sys 1204230735 7409
+sys/src/9/port/fault.c - 664 sys sys 1218341927 7407
 sys/src/9/port/initcode.c - 664 sys sys 1055688491 574
 sys/src/9/port/latin1.c - 664 sys sys 1015278339 1418
 sys/src/9/port/latin1.h - 664 sys sys 1184794985 3575
-sys/src/9/port/lib.h - 664 sys sys 1131289913 6040
+sys/src/9/port/lib.h - 664 sys sys 1218341881 6740
 sys/src/9/port/log.c - 664 sys sys 1014931175 2860
-sys/src/9/port/master - 664 sys sys 1205009260 507
+sys/src/9/port/master - 664 sys sys 1218341605 507
 sys/src/9/port/master.local - 664 sys sys 1205009250 117
 sys/src/9/port/mkbootrules - 775 sys sys 1055700518 923
 sys/src/9/port/mkdevc - 775 sys sys 1173287346 4203
@@ -8297,28 +8297,28 @@ sys/src/9/port/mksystab - 664 sys sys 1014931176 783
 sys/src/9/port/mul64fract.c - 664 sys sys 1071671674 867
 sys/src/9/port/netif.c - 664 sys sys 1178831077 13474
 sys/src/9/port/netif.h - 664 sys sys 1187735815 3059
-sys/src/9/port/page.c - 664 sys sys 1131636090 11128
+sys/src/9/port/page.c - 664 sys sys 1218341935 11124
 sys/src/9/port/parse.c - 664 sys sys 1014931177 2026
 sys/src/9/port/pgrp.c - 664 sys sys 1210369414 5000
 sys/src/9/port/portclock.c - 664 sys sys 1206317920 4274
-sys/src/9/port/portdat.h - 664 sys sys 1210369632 22770
+sys/src/9/port/portdat.h - 664 sys sys 1218341881 21809
 sys/src/9/port/portfns.h - 664 sys sys 1206317920 11095
 sys/src/9/port/portmkfile - 664 sys sys 1184737233 2082
 sys/src/9/port/print.c - 664 sys sys 1014931178 227
-sys/src/9/port/proc.c - 664 sys sys 1210370385 28829
+sys/src/9/port/proc.c - 664 sys sys 1218341949 28813
 sys/src/9/port/qio.c - 664 sys sys 1197732972 23616
-sys/src/9/port/qlock.c - 664 sys sys 1178057654 3300
+sys/src/9/port/qlock.c - 664 sys sys 1218341971 3299
 sys/src/9/port/rdb.c - 664 sys sys 1184465938 1704
 sys/src/9/port/rebootcmd.c - 664 sys sys 1015278340 1561
 sys/src/9/port/sd.h - 664 sys sys 1186618553 2499
-sys/src/9/port/sdaoe.c - 664 sys sys 1199910517 9920
+sys/src/9/port/sdaoe.c - 664 sys sys 1218341980 9919
 sys/src/9/port/segment.c - 664 sys sys 1170456581 14052
 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 1188922869 22120
 sys/src/9/port/sysproc.c - 664 sys sys 1188922870 21419
 sys/src/9/port/systab.h - 664 sys sys 1161222889 3204
-sys/src/9/port/taslock.c - 664 sys sys 1212083600 4478
+sys/src/9/port/taslock.c - 664 sys sys 1218341995 4459
 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 1204228653 5445

+ 37 - 0
dist/replica/plan9.log

@@ -20129,3 +20129,40 @@
 1218254404 2 c 386/bin/unmount - 775 sys sys 1218252950 37316
 1218308405 0 c sys/src/cmd/cwfs/juke.c - 664 sys sys 1218308158 28852
 1218308405 1 c sys/src/cmd/upas/pop3/pop3.c - 664 sys sys 1218308089 14373
+1218340803 0 c 386/bin/cwfs - 775 sys sys 1218339131 366141
+1218340803 1 c 386/bin/upas/pop3 - 775 sys sys 1218339137 263543
+1218342604 0 c sys/src/9/alphapc/main.c - 664 sys sys 1218342139 13750
+1218342604 1 c sys/src/9/alphapc/mmu.c - 664 sys sys 1218342126 5217
+1218342604 2 c sys/src/9/alphapc/trap.c - 664 sys sys 1218342130 18094
+1218342604 3 c sys/src/9/bitsy/mmu.c - 664 sys sys 1218342033 11662
+1218342604 4 c sys/src/9/bitsy/power.c - 664 sys sys 1218342040 7372
+1218342604 5 c sys/src/9/pc/devtv.c - 664 sys sys 1218342190 45417
+1218342604 6 c sys/src/9/pc/mmu.c - 664 sys sys 1218342291 24548
+1218342604 7 c sys/src/9/pc/trap.c - 664 sys sys 1218342303 22025
+1218342604 8 c sys/src/9/pc/usbohci.c - 664 sys sys 1218342331 48280
+1218342604 9 c sys/src/9/pc/usbuhci.c - 664 sys sys 1218342383 31740
+1218342604 10 c sys/src/9/pc/vgamach64xx.c - 664 sys sys 1218342429 28052
+1218342604 11 c sys/src/9/pc/vganeomagic.c - 664 sys sys 1218342438 10257
+1218342604 12 c sys/src/9/pc/vganvidia.c - 664 sys sys 1218342448 12370
+1218342604 13 c sys/src/9/port/cache.c - 664 sys sys 1218341675 9283
+1218342604 14 c sys/src/9/port/chan.c - 664 sys sys 1218341699 34955
+1218342604 15 c sys/src/9/port/dev.c - 664 sys sys 1218341650 8203
+1218342604 16 c sys/src/9/port/devaudio.c - 664 sys sys 1218341736 21192
+1218342604 17 c sys/src/9/port/devcons.c - 664 sys sys 1218341771 23176
+1218342604 18 c sys/src/9/port/devmnt.c - 664 sys sys 1218341783 20915
+1218342604 19 c sys/src/9/port/devpipe.c - 664 sys sys 1218341792 5824
+1218342604 20 c sys/src/9/port/devpnp.c - 664 sys sys 1218341827 13623
+1218342604 21 c sys/src/9/port/devsdp.c - 664 sys sys 1218341848 44798
+1218342604 22 c sys/src/9/port/devsegment.c - 664 sys sys 1218341861 9608
+1218342604 23 c sys/src/9/port/devtls.c - 664 sys sys 1218341873 45212
+1218342604 24 c sys/src/9/port/edf.c - 664 sys sys 1218341914 13586
+1218342604 25 c sys/src/9/port/fault.c - 664 sys sys 1218341927 7407
+1218342604 26 c sys/src/9/port/lib.h - 664 sys sys 1218341881 6740
+1218342604 27 c sys/src/9/port/master - 664 sys sys 1218341605 507
+1218342604 28 c sys/src/9/port/page.c - 664 sys sys 1218341935 11124
+1218342604 29 c sys/src/9/port/portdat.h - 664 sys sys 1218341881 21809
+1218342604 30 c sys/src/9/port/proc.c - 664 sys sys 1218341949 28813
+1218342604 31 c sys/src/9/port/qlock.c - 664 sys sys 1218341971 3299
+1218342604 32 c sys/src/9/port/taslock.c - 664 sys sys 1218341995 4459
+1218342604 33 c sys/src/9/port/devaoe.c - 664 sys sys 1218341718 42083
+1218342604 34 c sys/src/9/port/sdaoe.c - 664 sys sys 1218341980 9919

+ 1 - 1
sys/src/9/alphapc/main.c

@@ -67,7 +67,7 @@ dumpopts(void)
 {
 	int i;
 
-	print("dumpopts: found /alpha/conf options at 0x%lux\n",
+	print("dumpopts: found /alpha/conf options at %#p\n",
 		bootconf->bootargs);
 	for(i = 0; i < nconf; i++)
 		print("dumpopts: read %s=%s\n", confname[i], confval[i]);

+ 1 - 1
sys/src/9/alphapc/mmu.c

@@ -251,7 +251,7 @@ mmudump(void)
 {
 	Page *top, *lvl2;
 
-	iprint("ptbr %lux up %lux\n", (ulong)m->ptbr, up);
+	iprint("ptbr %lux up %#p\n", (ulong)m->ptbr, up);
 	if(up) {
 		top = up->mmutop;
 		if(top != nil)

+ 3 - 3
sys/src/9/alphapc/trap.c

@@ -205,7 +205,7 @@ mcheck(Ureg *ur, void *x)
 
 	m = x;
 	data = x;
-	iprint("panic: Machine Check @%lux: %s (%lux) len %lud\n",
+	iprint("panic: Machine Check @%#p: %s (%lux) len %lud\n",
 			m, smcheck(m->code), m->code, m->len);
 	iprint("proc offset %lux sys offset %lux\n", m->procoff, m->sysoff);
 	for (i = 0, col = 0; i < m->len/8; i++) {
@@ -405,8 +405,8 @@ kernfault(Ureg *ur, int code)
 	else
 		s = "ifetch";
 	print("panic: kfault %s VA=0x%lux\n", s, (ulong)ur->a0);
-	print("u=0x%lux status=0x%lux pc=0x%lux sp=0x%lux\n",
-				up, (ulong)ur->status, (ulong)ur->pc, (ulong)ur->sp);
+	print("u=%#p status=0x%lux pc=0x%lux sp=0x%lux\n",
+			up, (ulong)ur->status, (ulong)ur->pc, (ulong)ur->sp);
 	dumpregs(ur);
 	l.sp = ur->sp;
 	l.pc = ur->pc;

+ 4 - 4
sys/src/9/bitsy/mmu.c

@@ -506,18 +506,18 @@ peekmmu(ulong va)
 	e = l1table[va>>20];
 	switch(e & L1TypeMask){
 	default:
-		iprint("l1: %lux[%lux] = %lux invalid\n", l1table, va>>20, e);
+		iprint("l1: %#p[%#lux] = %#lux invalid\n", l1table, va>>20, e);
 		break;
 	case L1PageTable:
-		iprint("l1: %lux[%lux] = %lux pt\n", l1table, va>>20, e);
+		iprint("l1: %#p[%#lux] = %#lux pt\n", l1table, va>>20, e);
 		va &= OneMeg-1;
 		va >>= PGSHIFT;
 		e &= L1PTBaseMask;
 		d = ((ulong*)e)[va];
-		iprint("l2: %lux[%lux] = %lux\n", e, va, d);
+		iprint("l2: %#lux[%#lux] = %#lux\n", e, va, d);
 		break;
 	case L1Section:
-		iprint("l1: %lux[%lux] = %lux section\n", l1table, va>>20, e);
+		iprint("l1: %#p[%#lux] = %#lux section\n", l1table, va>>20, e);
 		break;
 	}
 }

+ 5 - 3
sys/src/9/bitsy/power.c

@@ -54,7 +54,7 @@ checkktext(void)
 	s = 0;
 	for (p = (ulong*)_start; p < (ulong*)etext; p++){
 		if(*p == 0)
-			iprint("0x%lux->0\n", p);
+			iprint("%#p->0\n", p);
 		if (((ulong)p & 0x1fff) == 0){
 			iprint("page 0x%lux checksum 0x%lux\n",
 				(ulong)(p-1)&~0x1fff, s);
@@ -182,7 +182,8 @@ deepsleep(void) {
 	audiopower(0);
 	screenpower(0);
 	µcpower(0);
-	iprint("entering suspend mode, sp = 0x%lux, pc = 0x%lux, psw = 0x%ux\n", &xsp, xlink, power_pl);
+	iprint("entering suspend mode, sp = %#p, pc = 0x%lux, psw = 0x%ux\n",
+		&xsp, xlink, power_pl);
 //	dumpitall();
 	delay(1000);
 	uartpower(0);
@@ -212,7 +213,8 @@ deepsleep(void) {
 		uartpower(1);
 		delay(100);
 		xlink = getcallerpc(&xlink);
-		iprint("\nresuming execution, sp = 0x%lux, pc = 0x%lux, psw = 0x%ux\n", &xsp, xlink, splhi());
+		iprint("\nresuming execution, sp = %#p, pc = 0x%lux, psw = 0x%ux\n",
+			&xsp, xlink, splhi());
 //		dumpitall();
 		delay(1000);
 //		irpower(1);

+ 1 - 1
sys/src/9/pc/devtv.c

@@ -899,7 +899,7 @@ tvread(Chan *c, void *a, long n, vlong offset)
 		print("uablock %ld, bnum %ld, boffs %d, nbytes %d, tvablock %ld\n",
 			uablock, bnum, boffs, nbytes, tvablock);
 		src = tv->abuf + ((uablock + bnum) % tv->nablocks) * tv->absize;
-		print("copying from %.8ulX (abuf %.8ulX), nbytes %d (block %ld.%ld)\n",
+		print("copying from %#p (abuf %#p), nbytes %d (block %ld.%ld)\n",
 			src + boffs, tv->abuf, nbytes, uablock, bnum);
 
 		memmove(a, src + boffs, nbytes);

+ 9 - 9
sys/src/9/pc/mmu.c

@@ -81,8 +81,8 @@ mmuinit(void)
 
 	didmmuinit = 1;
 
-	if(0) print("vpt=%#.8ux vpd=%#.8lux kmap=%#.8ux\n",
-		VPT, (ulong)vpd, KMAP);
+	if(0) print("vpt=%#.8ux vpd=%#p kmap=%#.8ux\n",
+		VPT, vpd, KMAP);
 
 	memglobal();
 	m->pdb[PDX(VPT)] = PADDR(m->pdb)|PTEWRITE|PTEVALID;
@@ -450,7 +450,7 @@ putmmu(ulong va, ulong pa, Page*)
 	if(old&PTEVALID)
 		flushpg(va);
 	if(getcr3() != up->mmupdb->pa)
-		print("bad cr3 %.8lux %.8lux\n", getcr3(), up->mmupdb->pa);
+		print("bad cr3 %#.8lux %#.8lux\n", getcr3(), up->mmupdb->pa);
 	splx(s);
 }
 
@@ -466,7 +466,7 @@ checkmmu(ulong va, ulong pa)
 	if(!(vpd[PDX(va)]&PTEVALID) || !(vpt[VPTX(va)]&PTEVALID))
 		return;
 	if(PPN(vpt[VPTX(va)]) != pa)
-		print("%ld %s: va=0x%08lux pa=0x%08lux pte=0x%08lux\n",
+		print("%ld %s: va=%#08lux pa=%#08lux pte=%#08lux\n",
 			up->pid, up->text,
 			va, pa, vpt[VPTX(va)]);
 }
@@ -552,7 +552,7 @@ vmap(ulong pa, int size)
 
 	size = ROUND(size, BY2PG);
 	if(pa == 0){
-		print("vmap pa=0 pc=%#.8lux\n", getcallerpc(&pa));
+		print("vmap pa=0 pc=%#p\n", getcallerpc(&pa));
 		return nil;
 	}
 	ilock(&vmaplock);
@@ -860,9 +860,9 @@ kunmap(KMap *k)
 	if(up->mmupdb == nil || !(vpd[PDX(KMAP)]&PTEVALID))
 		panic("kunmap: no kmaps");
 	if(va < KMAP || va >= KMAP+KMAPSIZE)
-		panic("kunmap: bad address %#.8lux pc=%#.8lux", va, getcallerpc(&k));
+		panic("kunmap: bad address %#.8lux pc=%#p", va, getcallerpc(&k));
 	if(!(vpt[VPTX(va)]&PTEVALID))
-		panic("kunmap: not mapped %#.8lux pc=%#.8lux", va, getcallerpc(&k));
+		panic("kunmap: not mapped %#.8lux pc=%#p", va, getcallerpc(&k));
 	up->nkmap--;
 	if(up->nkmap < 0)
 		panic("kunmap %lud %s: nkmap=%d", up->pid, up->text, up->nkmap);
@@ -899,7 +899,7 @@ tmpmap(Page *p)
 	entry = &vpt[VPTX(TMPADDR)];
 	if(!(*entry&PTEVALID)){
 		for(i=KZERO; i<=CPU0MACH; i+=BY2PG)
-			print("%.8lux: *%.8lux=%.8lux (vpt=%.8lux index=%.8lux)\n", i, &vpt[VPTX(i)], vpt[VPTX(i)], vpt, VPTX(i));
+			print("%#p: *%#p=%#p (vpt=%#p index=%#p)\n", i, &vpt[VPTX(i)], vpt[VPTX(i)], vpt, VPTX(i));
 		panic("tmpmap: no entry");
 	}
 	if(PPN(*entry) != PPN(TMPADDR-KZERO))
@@ -946,7 +946,7 @@ paddr(void *v)
 	
 	va = (ulong)v;
 	if(va < KZERO)
-		panic("paddr: va=%#.8lux pc=%#.8lux", va, getcallerpc(&v));
+		panic("paddr: va=%#.8lux pc=%#p", va, getcallerpc(&v));
 	return va-KZERO;
 }
 

+ 1 - 1
sys/src/9/pc/trap.c

@@ -495,7 +495,7 @@ dumpregs(Ureg* ureg)
 			iprint("\n  MCA %8.8llux MCT %8.8llux", mca, mct);
 		}
 	}
-	iprint("\n  ur %lux up %lux\n", ureg, up);
+	iprint("\n  ur %#p up %#p\n", ureg, up);
 }
 
 

+ 26 - 26
sys/src/9/pc/usbohci.c

@@ -412,7 +412,7 @@ hcva2ucva(ulong hcva)
 	if(hcva == 0)
 		return nil;
 	if(hcva & 0xf0000000){
-		iprint("hcva2ucva: bad 0x%lux, called from 0x%lux\n",
+		iprint("hcva2ucva: bad %#lux, called from %#p\n",
 			hcva, getcallerpc(&hcva));
 		return nil;
 	}
@@ -672,14 +672,14 @@ dumptd(TD *td, char *s)
 	Endpt *ep;
 
 	ep = td->ep;
-	print("\t%s: 0x%.8lux ctrl 0x%.8lux cbp 0x%.8lux "
-		"nexttd 0x%.8lux be 0x%.8lux, flags %lux\n",
+	print("\t%s: %#p ctrl %#.8lux cbp %#.8lux "
+		"nexttd %#.8lux be %#.8lux, flags %#lux\n",
 		s, td, td->ctrl, td->cbp, td->nexttd, td->be, td->flags);
 	if(ep->epmode != Isomode){
 		print("\t\tbytes: %ld\n", td->be + 1 - td->cbp);
 		return;
 	}
-	print("\t\t0x%ux 0x%ux 0x%ux 0x%ux 0x%ux 0x%ux 0x%ux 0x%ux\n",
+	print("\t\t%#ux %#ux %#ux %#ux %#ux %#ux %#ux %#ux\n",
 		td->offsets[0], td->offsets[1], td->offsets[2], td->offsets[3],
 		td->offsets[4], td->offsets[5], td->offsets[6], td->offsets[7]);
 	print("\t\tbytes:");
@@ -695,7 +695,7 @@ dumped(ED *ed)
 
 	tailp = EDgettail(ed);
 	td = EDgethead(ed);
-	print("dumpED 0x%lux: ctrl 0x%lux tail 0x%lux head 0x%lux next 0x%lux\n",
+	print("dumpED %#p: ctrl %#lux tail %#lux head %#lux next %#lux\n",
 		ed, ed->ctrl, ed->tail, ed->head, ed->next);
 	if(tailp == td)
 		return;
@@ -709,8 +709,8 @@ dumpstatus(Ctlr *ub)
 {
 	ED *ed;
 
-	print("dumpstatus 0x%lux, frame 0x%ux:\n", ub, ub->uchcca->framenumber);
-	print("control 0x%lux, cmdstat 0x%lux, intrsts 0x%lux\n",
+	print("dumpstatus %#p, frame %#ux:\n", ub, ub->uchcca->framenumber);
+	print("control %#lux, cmdstat %#lux, intrsts %#lux\n",
 		ub->base->control, ub->base->cmdsts, ub->base->intrsts);
 	print("Control:\n");
 	for(ed = OHCIgetControlHeadED(ub->base); ed; ed = EDgetnext(ed))
@@ -721,7 +721,7 @@ dumpstatus(Ctlr *ub)
 	print("Iso:\n");
 	for(ed = ub->tree->root[0]; ed; ed = EDgetnext(ed))
 		dumped(ed);
-	print("frame 0x%ux:\n", ub->uchcca->framenumber);
+	print("frame %#ux:\n", ub->uchcca->framenumber);
 }
 
 /*
@@ -1647,7 +1647,7 @@ getportstatus(Ctlr *ub, int port)
 	if(ohcistatus & Lsda)
 		v |= SlowDevice;
 	if(ohcistatus & Ccs)
-		XIPRINT("portstatus(%d) = OHCI 0x%.8lux UHCI 0x%.8ux\n",
+		XIPRINT("portstatus(%d) = OHCI %#.8lux UHCI %#.8ux\n",
 			port, ohcistatus, v);
 	return v;
 }
@@ -1668,17 +1668,17 @@ usbdebug(Usbhost *uh, char *s, char *se)
 	for(i = 0; i < MaxUsbDev; i++){
 		if((dev = uh->dev[i]) == nil)
 			continue;
-		s = seprint(s, se, "dev 0x%6.6lux, %d epts\n", dev->csp, dev->npt);
+		s = seprint(s, se, "dev %#6.6lux, %d epts\n", dev->csp, dev->npt);
 		for(j = 0; j < nelem(dev->ep); j++){
 			if((ep = dev->ep[j]) == nil)
 				continue;
 			if(ep->epmode >= 0 && ep->epmode < Nmodes)
-				s = seprint(s, se, "ept %d/%d: %s 0x%6.6lux "
+				s = seprint(s, se, "ept %d/%d: %s %#6.6lux "
 					"maxpkt %d %s\n",
 					dev->x, ep->x, usbmode[ep->epmode],
 					ep->csp, ep->maxpkt, ep->active ? "active" : "idle");
 			else{
-				s = seprint(s, se, "ept %d/%d: bad mode 0x%6.6lux\n",
+				s = seprint(s, se, "ept %d/%d: bad mode %#6.6lux\n",
 					dev->x, ep->x, ep->csp);
 				continue;
 			}
@@ -1756,7 +1756,7 @@ interrupt(Ureg *, void *arg)
 	if(status & Wdh){
 		/* LSb of donehead has bit that says there are other interrupts */
 		donetd = hcva2ucva(ub->uchcca->donehead & ~0xf);
-		XIPRINT("donetd 0x%.8lux\n", donetd);
+		XIPRINT("donetd %#p\n", donetd);
 	}else
 		donetd = 0;
 	ub->base->intrsts = status;
@@ -1781,7 +1781,7 @@ interrupt(Ureg *, void *arg)
 		}
 		cc = (ctrl >> TD_CC_SHIFT) & TD_CC_MASK;
 		if((usbhdebug || ep->debug) && (cc != 0 && cc != 9)){
-			print("%d/%d: cc %d frnum 0x%lux\n",
+			print("%d/%d: cc %d frnum %#lux\n",
 				ep->dev->x, ep->x, cc, ub->base->fmnumber);
 			dumptd(donetd, "after");
 		}
@@ -1796,8 +1796,8 @@ interrupt(Ureg *, void *arg)
 				if(bp){
 					p = hcva2va(donetd->be + 1);
 					if(p < bp->wp)
-						print("interrupt: bp: rp 0x%lux"
-							", wp 0x%lux→0x%lux\n",
+						print("interrupt: bp: rp %#p"
+							", wp %#p→%#p\n",
 							bp->rp, bp->wp, p);
 					bp->wp = p;
 				}
@@ -1808,8 +1808,8 @@ interrupt(Ureg *, void *arg)
 		case 9:			/* underrun */
 			if(bp){
 				p = hcva2va(donetd->cbp);
-				XEIPRINT("interrupt: bp: rp 0x%lux, wp "
-					"0x%lux→0x%lux\n", bp->rp, bp->wp, p);
+				XEIPRINT("interrupt: bp: rp %#p, wp "
+					"%#p→%#p\n", bp->rp, bp->wp, p);
 				bp->wp = p;
 			}
 			if((donetd->flags & TD_FLAGS_LAST) == 0){
@@ -1868,7 +1868,7 @@ interrupt(Ureg *, void *arg)
 
 		// usbhdbg();		/* TODO */
 		curred = ub->base->periodcurred;
-		print("usbh: unrecoverable error frame 0x%.8lux ed 0x%.8lux, "
+		print("usbh: unrecoverable error frame %#.8lux ed %#.8lux, "
 			"ints %d %d %d %d\n",
 			ub->base->fmnumber, curred,
 			ohciinterrupts[1], ohciinterrupts[2],
@@ -1877,7 +1877,7 @@ interrupt(Ureg *, void *arg)
 			dumped(hcva2ucva(curred));
 	}
 	if(status)
-		IPRINT(("interrupt: unhandled interrupt 0x%.8lux\n", status));
+		IPRINT(("interrupt: unhandled interrupt %#.8lux\n", status));
 }
 
 static void
@@ -1965,7 +1965,7 @@ read(Usbhost *uh, Endpt *ep, void *a, long n, vlong off) /* TODO off */
 	XEPRINT("ohci: read from devusb\n");
 	USED(off);
 	ub = uh->ctlr;
-	XEPRINT("%d/%d: read 0x%.8lux %ld\n", ep->dev->x, ep->x, a, n);
+	XEPRINT("%d/%d: read %#p %ld\n", ep->dev->x, ep->x, a, n);
 	bp = breadusbh(ub, ep, n);
 	l = BLEN(bp);
 	memmove(a, bp->rp, l);
@@ -2006,7 +2006,7 @@ write(Usbhost *uh, Endpt *ep, void *a, long n, vlong off, int tok)
 	epx = ep->private;
 	ub = uh->ctlr;
 	qlock(&ep->wlock);
-	XEPRINT("%d/%d: write 0x%.8lux %ld %s\n", ep->dev->x, ep->x, a, n,
+	XEPRINT("%d/%d: write %#p %ld %s\n", ep->dev->x, ep->x, a, n,
 		tok == Otoksetup? "setup": "out");
 	if(ep->dir[Dirout].xdone - ep->dir[Dirout].xstarted > 0){
 		print("done > started, %d %d\n",
@@ -2105,7 +2105,7 @@ scanpci(void)
 		    p->ccrp != 0x10)
 			continue;
 		mem = p->mem[0].bar & ~0x0F;
-		XPRINT("usbohci: %x/%x port 0x%lux size 0x%x irq %d\n",
+		XPRINT("usbohci: %x/%x port %#lux size %#x irq %d\n",
 			p->vid, p->did, mem, p->mem[0].size, p->intl);
 		if(mem == 0){
 			print("usbohci: failed to map registers\n");
@@ -2119,7 +2119,7 @@ scanpci(void)
 		ctlr = malloc(sizeof(Ctlr));
 		ctlr->pcidev = p;
 		ctlr->base = vmap(mem, p->mem[0].size);
-		XPRINT("scanpci: ctlr 0x%lux, base 0x%lux\n", ctlr, ctlr->base);
+		XPRINT("scanpci: ctlr %#p, base %#p\n", ctlr, ctlr->base);
 		pcisetbme(p);
 		pcisetpms(p, 0);
 		if(ctlrhead != nil)
@@ -2167,7 +2167,7 @@ reset(Usbhost *uh)
 	io = (uintptr)ctlr->base;	/* TODO: correct? */
 	ohci = ctlr->base;
 
-	XPRINT("OHCI ctlr 0x%lux, base 0x%lux\n", ctlr, ohci);
+	XPRINT("OHCI ctlr %#p, base %#p\n", ctlr, ohci);
 
 	p = ctlr->pcidev;
 
@@ -2181,7 +2181,7 @@ reset(Usbhost *uh)
 	XPRINT("Host revision %ld.%ld\n", (ohci->hostrevision >> 4) & 0xf,
 		ohci->hostrevision & 0xf);
 	ctlr->nports = ohci->rhdesca & 0xff;
-	XPRINT("HcControl 0x%.8lux, %d ports\n", ohci->control, ctlr->nports);
+	XPRINT("HcControl %#.8lux, %d ports\n", ohci->control, ctlr->nports);
 	delay(100);  /* anything greater than 50 should ensure reset is done */
 	if(ohci->control == ~0){
 		ctlrhead = nil;

+ 19 - 19
sys/src/9/pc/usbuhci.c

@@ -243,7 +243,7 @@ dumpdata(Block *b, int n)
 {
 	int i;
 
-	XPRINT("\tb %8.8lux[%d]: ", (ulong)b->rp, n);
+	XPRINT("\tb %#p[%d]: ", b->rp, n);
 	if(n > 16)
 		n = 16;
 	for(i=0; i<n; i++)
@@ -285,8 +285,8 @@ dumptd(TD *t, int follow)
 		if(t->status & LowSpeed)
 			*s++ = 'L';
 		*s = 0;
-		XPRINT("td %8.8lux: ", t);
-		XPRINT("l=%8.8lux s=%8.8lux d=%8.8lux b=%8.8lux %8.8lux f=%8.8lux\n",
+		XPRINT("td %#p: ", t);
+		XPRINT("l=%#lux s=%#lux d=%#lux b=%#lux %#lux f=%#lux\n",
 			t->link, t->status, t->dev, t->buffer,
 			(t->bp? (ulong)t->bp->rp: 0), t->flags);
 		XPRINT("\ts=%s,ep=%ld,d=%ld,D=%ld\n", buf, (t->dev>>15)&0xF,
@@ -357,7 +357,7 @@ dumpqh(QH *q)
 
 	q0 = q;
 	for(i = 0; q != nil && i < 10; i++){
-		XPRINT("qh %8.8lux: %8.8lux %8.8lux\n", q, q->head, q->entries);
+		XPRINT("qh %#p: %#lux %#lux\n", q, q->head, q->entries);
 		if((q->entries & (IsQH|Terminate)) == 0)
 			dumptd(TFOL(q->entries), 1);
 		if(q->head & Terminate)
@@ -404,7 +404,7 @@ cleantd(Ctlr *ctlr, TD *t, int discard)
 	Block *b;
 	int n, err;
 
-	XPRINT("cleanTD: %8.8lux %8.8lux %8.8lux %8.8lux\n",
+	XPRINT("cleanTD: %#lux %#lux %#lux %#lux\n",
 		t->link, t->status, t->dev, t->buffer);
 	if(t->ep != nil && t->ep->debug)
 		dumptd(t, 0);
@@ -413,9 +413,9 @@ cleantd(Ctlr *ctlr, TD *t, int discard)
 	err = t->status & (AnyError & ~NAKed);
 	/* TO DO: on t->status&AnyError, q->entries will not have advanced */
 	if (err) {
-		XPRINT("cleanTD: Error %8.8lux %8.8lux %8.8lux %8.8lux\n",
+		XPRINT("cleanTD: Error %#lux %#lux %#lux %#lux\n",
 			t->link, t->status, t->dev, t->buffer);
-		print("cleanTD %d/%d: Error %8.8lux %8.8lux %8.8lux %8.8lux\n",
+		print("cleanTD %d/%d: Error %#lux %#lux %#lux %#lux\n",
 			t->ep->dev->x, t->ep->x,
 			t->link, t->status, t->dev, t->buffer);
 	}
@@ -445,19 +445,19 @@ cleantd(Ctlr *ctlr, TD *t, int discard)
 		wakeup(&t->ep->dir[Dirin].rend);	/* TO DO */
 		break;
 	case Utoksetup:
-		XPRINT("cleanTD: Utoksetup %lux\n", &t->ep);
+		XPRINT("cleanTD: Utoksetup %#p\n", &t->ep);
 		/*
 		 * don't really need to wakeup: subsequent IN or OUT
 		 * gives status./
 		 */
 		if(t->ep != nil) {
 			wakeup(&t->ep->dir[Dirout].rend);	/* TO DO */
-			XPRINT("cleanTD: wakeup %lux\n", &t->ep->dir[Dirout].rend);
+			XPRINT("cleanTD: wakeup %#p\n", &t->ep->dir[Dirout].rend);
 		}
 		break;
 	case Utokout:
 		/* TO DO: mark it done somewhere */
-		XPRINT("cleanTD: TokOut %lux\n", &t->ep);
+		XPRINT("cleanTD: TokOut %#p\n", &t->ep);
 		ilock(ctlr);		/* e->ntd++ is ilocked */
 		if(t->ep != nil){
 			if(t->bp){
@@ -471,7 +471,7 @@ cleantd(Ctlr *ctlr, TD *t, int discard)
 			if(--t->ep->ntd < 0)
 				panic("cleantd ntd");
 			wakeup(&t->ep->dir[Dirout].rend);	/* TO DO */
-			XPRINT("cleanTD: wakeup %lux\n", &t->ep->dir[Dirout].rend);
+			XPRINT("cleanTD: wakeup %#p\n", &t->ep->dir[Dirout].rend);
 		}
 		iunlock(ctlr);
 		break;
@@ -487,7 +487,7 @@ cleanq(Ctlr *ctlr, QH *q, int discard, int vf)
 	ilock(ctlr);
 	tp = nil;
 	for(t = q->first; t != nil;){
-		XPRINT("cleanq: %8.8lux %8.8lux %8.8lux %8.8lux %8.8lux %8.8lux\n",
+		XPRINT("cleanq: %#lux %#lux %#lux %#lux %#lux %#p\n",
 		    t->link, t->status, t->dev, t->buffer, t->flags, t->next);
 		if(t->status & Active){
 			if(t->status & NAKed){
@@ -498,7 +498,7 @@ cleanq(Ctlr *ctlr, QH *q, int discard, int vf)
 				continue;
 			}
 			if(t->flags & CancelTD){
-				XPRINT("cancelTD: %8.8lux\n", (ulong)t);
+				XPRINT("cancelTD: %#p\n", t);
 				/* ensure interrupt next frame */
 				t->status = (t->status & ~Active) | IOC;
 				tp = t;
@@ -532,7 +532,7 @@ cleanq(Ctlr *ctlr, QH *q, int discard, int vf)
 			t = tp->next;
 		else
 			t = q->first;
-		XPRINT("t = %8.8lux\n", t);
+		XPRINT("t = %#p\n", t);
 		dumpqh(q);
 	}
 	if(q->first && q->entries != PCIWADDR(q->first)){
@@ -641,7 +641,7 @@ qxmit(Ctlr *ctlr, Endpt *e, Block *b, int pid)
 	e->ntd++;
 	iunlock(ctlr);
 	if(e->debug)
-		pprint("QTD: %8.8lux n=%ld\n", t, b? BLEN(b): 0);
+		pprint("QTD: %#p n=%ld\n", t, b? BLEN(b): 0);
 	vf = 0;
 	if(e->x == 0){
 		qh = ctlr->ctlq;
@@ -1367,7 +1367,7 @@ write(Usbhost *uh, Endpt *e, void *a, long n, vlong offset, int tok)
 			XPRINT("qh %s: q=%p first=%p last=%p entries=%.8lux\n",
 				"writeusb sleep", qh, qh->first, qh->last,
 				qh->entries);
-			XPRINT("write: sleep %lux\n", &e->dir[Dirout].rend);
+			XPRINT("write: sleep %#p\n", &e->dir[Dirout].rend);
 			sleep(&e->dir[Dirout].rend, qisempty, qh);
 			XPRINT("write: awake\n");
 		}
@@ -1387,11 +1387,11 @@ init(Usbhost* uh)
 	outl(ctlr->io+Flbaseadd, PCIWADDR(ctlr->frames));
 	OUT(Frnum, 0);
 	OUT(Usbintr, 0xF);	/* enable all interrupts */
-	XPRINT("cmd 0x%x sofmod 0x%x\n", IN(Cmd), inb(ctlr->io+SOFMod));
-	XPRINT("sc0 0x%x sc1 0x%x\n", IN(Portsc0), IN(Portsc1));
+	XPRINT("cmd %#x sofmod %#x\n", IN(Cmd), inb(ctlr->io+SOFMod));
+	XPRINT("sc0 %#x sc1 %#x\n", IN(Portsc0), IN(Portsc1));
 	if((IN(Cmd)&1)==0)
 		OUT(Cmd, 1);	/* run */
-//	pprint("at: c=%x s=%x c0=%x\n", IN(Cmd), IN(Status), IN(Portsc0));
+//	pprint("at: c=%#x s=%#x c0=%x\n", IN(Cmd), IN(Status), IN(Portsc0));
 	iunlock(ctlr);
 }
 

+ 2 - 2
sys/src/9/pc/vgamach64xx.c

@@ -624,7 +624,7 @@ waitforfifo(VGAscr *scr, int entries)
 	while((ior32(scr, FifoStat)&0xFF) > (0x8000>>entries) && x++ < 1000000)
 		;
 	if(x >= 1000000)
-		iprint("fifo %d stat %.8lux %.8lux scrio %.8lux mmio %p scr %p pc %luX\n", entries, ior32(scr, FifoStat), scr->mmio[mmoffset[FifoStat]], scr->io, scr->mmio, scr, getcallerpc(&scr));
+		iprint("fifo %d stat %#.8lux %#.8lux scrio %#.8lux mmio %#p scr %#p pc %#p\n", entries, ior32(scr, FifoStat), scr->mmio[mmoffset[FifoStat]], scr->io, scr->mmio, scr, getcallerpc(&scr));
 }
 
 static void
@@ -637,7 +637,7 @@ waitforidle(VGAscr *scr)
 	while((ior32(scr, GuiStat)&1) && x++ < 1000000)
 		;
 	if(x >= 1000000)
-		iprint("idle stat %.8lux %.8lux scrio %.8lux mmio %p scr %p pc %luX\n", ior32(scr, GuiStat), scr->mmio[mmoffset[GuiStat]], scr->io, scr->mmio, scr, getcallerpc(&scr));
+		iprint("idle stat %#.8lux %#.8lux scrio %#.8lux mmio %#p scr %#p pc %#p\n", ior32(scr, GuiStat), scr->mmio[mmoffset[GuiStat]], scr->io, scr->mmio, scr, getcallerpc(&scr));
 }
 
 static void

+ 2 - 2
sys/src/9/pc/vganeomagic.c

@@ -337,7 +337,7 @@ waitforidle(VGAscr *scr)
 	while((mmio[BltStat] & NEO_BS0_BLT_BUSY) && x++ < 1000000)
 		;
 	//if(x >= 1000000)
-	//	iprint("idle stat %lud scrmmio %.8lux scr %p pc %luX\n", mmio[BltStat], scr->mmio, scr, getcallerpc(&scr));
+	//	iprint("idle stat %lud scrmmio %#.8lux scr %#p pc %#p\n", mmio[BltStat], scr->mmio, scr, getcallerpc(&scr));
 }
 
 static void
@@ -351,7 +351,7 @@ waitforfifo(VGAscr *scr, int entries)
 	while(((mmio[BltStat]>>8) < entries) && x++ < 1000000)
 		;
 	//if(x >= 1000000)
-	//	iprint("fifo stat %d scrmmio %.8lux scr %p pc %luX\n", mmio[BltStat]>>8, scr->mmio, scr, getcallerpc(&scr));
+	//	iprint("fifo stat %d scrmmio %#.8lux scr %#p pc %#p\n", mmio[BltStat]>>8, scr->mmio, scr, getcallerpc(&scr));
 	/* DirectFB says the above doesn't work.  if so... */
 	/* waitforidle(scr); */
 }

+ 2 - 2
sys/src/9/pc/vganvidia.c

@@ -345,14 +345,14 @@ waitforidle(VGAscr *scr)
 	while((readget(scr) != nv.dmaput) && x++ < 1000000)
 		;
 	if(x >= 1000000)
-		iprint("idle stat %lud put %d scr %p pc %luX\n", readget(scr), nv.dmaput, scr, getcallerpc(&scr));
+		iprint("idle stat %lud put %d scr %#p pc %#p\n", readget(scr), nv.dmaput, scr, getcallerpc(&scr));
 
 	x = 0;
 	while(pgraph[0x00000700/4] & 0x01 && x++ < 1000000)
 		;
 
 	if(x >= 1000000)
-		iprint("idle stat %lud scrio %.8lux scr %p pc %luX\n", *pgraph, scr->mmio, scr, getcallerpc(&scr));
+		iprint("idle stat %lud scrio %#p scr %#p pc %#p\n", *pgraph, scr->mmio, scr, getcallerpc(&scr));
 }
 
 static void

+ 1 - 1
sys/src/9/port/cache.c

@@ -149,7 +149,7 @@ cprint(Chan *c, Mntcache *m, char *s)
 			ct = 0;
 		o = e->start+e->len;
 	}
-	pprint("%s: 0x%lux.0x%lux %d %d %s (%d %c)\n",
+	pprint("%s: %#lux.%#lux %d %d %s (%d %c)\n",
 	s, m->qid.path, m->qid.vers, m->type, m->dev, c->path, nb, ct ? 'C' : 'N');
 
 	for(e = m->list; e; e = e->next) {

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

@@ -63,12 +63,12 @@ dumpmount(void)		/* DEBUGGING */
 	he = &pg->mnthash[MNTHASH];
 	for(h = pg->mnthash; h < he; h++){
 		for(f = *h; f; f = f->hash){
-			print("head: %p: %s 0x%llux.%lud %C %lud -> \n", f,
+			print("head: %#p: %s %#llux.%lud %C %lud -> \n", f,
 				f->from->path->s, f->from->qid.path,
 				f->from->qid.vers, devtab[f->from->type]->dc,
 				f->from->dev);
 			for(t = f->mount; t; t = t->next)
-				print("\t%p: %s (umh %p) (path %.8llux dev %C %lud)\n", t, t->to->path->s, t->to->umh, t->to->qid.path, devtab[t->to->type]->dc, t->to->dev);
+				print("\t%#p: %s (umh %#p) (path %#.8llux dev %C %lud)\n", t, t->to->path->s, t->to->umh, t->to->qid.path, devtab[t->to->type]->dc, t->to->dev);
 		}
 	}
 	poperror();
@@ -113,7 +113,7 @@ decref(Ref *r)
 	x = --r->ref;
 	unlock(r);
 	if(x < 0)
-		panic("decref pc=0x%lux", getcallerpc(&r));
+		panic("decref pc=%#p", getcallerpc(&r));
 
 	return x;
 }
@@ -282,7 +282,7 @@ newpath(char *s)
 	 * allowed, but other names with / in them draw warnings.
 	 */
 	if(strchr(s, '/') && strcmp(s, "#/") != 0 && strcmp(s, "/") != 0)
-		print("newpath: %s from %lux\n", s, getcallerpc(&s));
+		print("newpath: %s from %#p\n", s, getcallerpc(&s));
 
 	p->mlen = 1;
 	p->malen = PATHMSLOP;
@@ -473,7 +473,7 @@ void
 cclose(Chan *c)
 {
 	if(c->flag&CFREE)
-		panic("cclose %lux", getcallerpc(&c));
+		panic("cclose %#p", getcallerpc(&c));
 
 	DBG("cclose %p name=%s ref=%ld\n", c, c->path->s, c->ref);
 	if(decref(c))
@@ -504,7 +504,7 @@ void
 ccloseq(Chan *c)
 {
 	if(c->flag&CFREE)
-		panic("cclose %lux", getcallerpc(&c));
+		panic("cclose %#p", getcallerpc(&c));
 
 	DBG("ccloseq %p name=%s ref=%ld\n", c, c->path->s, c->ref);
 
@@ -638,7 +638,7 @@ cmount(Chan **newp, Chan *old, int flag, char *spec)
 		error(Emount);
 
 	if(old->umh)
-		print("cmount: unexpected umh, caller %.8lux\n", getcallerpc(&newp));
+		print("cmount: unexpected umh, caller %#p\n", getcallerpc(&newp));
 
 	order = flag&MORDER;
 
@@ -912,7 +912,7 @@ undomount(Chan *c, Path *path)
 	Chan *nc;
 
 	if(path->ref != 1 || path->mlen == 0)
-		print("undomount: path %s ref %ld mlen %d caller %lux\n",
+		print("undomount: path %s ref %ld mlen %d caller %#p\n",
 			path->s, path->ref, path->mlen, getcallerpc(&c));
 
 	if(path->mlen>0 && (nc=path->mtpt[path->mlen-1]) != nil){

+ 1 - 1
sys/src/9/port/dev.c

@@ -25,7 +25,7 @@ devno(int c, int user)
 			return i;
 	}
 	if(user == 0)
-		panic("devno %C 0x%ux", c, c);
+		panic("devno %C %#ux", c, c);
 
 	return -1;
 }

+ 2 - 2
sys/src/9/port/devaoe.c

@@ -736,7 +736,7 @@ unit2dev(ulong unit)
 			return d;
 		}
 	runlock(&devs);
-	uprint("unit lookup failure: %lux pc %p", unit, getcallerpc(&unit));
+	uprint("unit lookup failure: %lux pc %#p", unit, getcallerpc(&unit));
 	error(up->genbuf);
 	return nil;
 }
@@ -2202,7 +2202,7 @@ netbind(char *path)
 	Chan *dc, *cc, *mtu;
 	Netlink *nl;
 
-	snprint(addr, sizeof addr, "%s!0x%x", path, Aoetype);
+	snprint(addr, sizeof addr, "%s!%#x", path, Aoetype);
 	dc = chandial(addr, nil, nil, &cc);
 	snprint(addr, sizeof addr, "%s/mtu", path);
 	if(waserror())

+ 5 - 5
sys/src/9/port/devaudio.c

@@ -149,7 +149,7 @@ sbcmd(int val)
 			return 0;
 		}
 	}
-/*	print("#A: sbcmd (0x%.2x) timeout\n", val);	/**/
+/*	print("#A: sbcmd (%#.2x) timeout\n", val);	/**/
 	return 1;
 }
 
@@ -429,7 +429,7 @@ ess1688reset(void)
 
 	i = sbread();
 	if(i != 0xAA) {
-		print("#A: no response 0x%.2x\n", i);
+		print("#A: no response %#.2x\n", i);
 		return 1;
 	}
 
@@ -674,7 +674,7 @@ ess1688(ISAConf* sbconf)
 	major = sbread();
 	minor = sbread();
 	if(major != 0x68 || minor != 0x8B){
-		print("#A: model 0x%.2x 0x%.2x; not ESS1688 compatible\n", major, minor);
+		print("#A: model %#.2x %#.2x; not ESS1688 compatible\n", major, minor);
 		return 1;
 	}
 
@@ -747,7 +747,7 @@ audioinit(void)
 	case 0x280:
 		break;
 	default:
-		print("#A: bad port 0x%lux\n", sbconf.port);
+		print("#A: bad port %#lux\n", sbconf.port);
 		return;
 	}
 
@@ -812,7 +812,7 @@ audioinit(void)
 
 	if(audio.major != 4) {
 		if(audio.major != 3 || audio.minor != 1 || ess1688(&sbconf)){
-			print("#A: model 0x%.2x 0x%.2x; not SB 16 compatible\n",
+			print("#A: model %#.2x %#.2x; not SB 16 compatible\n",
 				audio.major, audio.minor);
 			iofree(sbconf.port);
 			iofree(sbconf.port+0x100);

+ 6 - 6
sys/src/9/port/devcons.c

@@ -315,7 +315,7 @@ sysfatal(char *fmt, ...)
 void
 _assert(char *fmt)
 {
-	panic("assert failed at 0x%lux: %s", getcallerpc(&fmt), fmt);
+	panic("assert failed at %#p: %s", getcallerpc(&fmt), fmt);
 }
 
 int
@@ -457,7 +457,7 @@ echo(char *buf, int n)
 				consdebug = rdb;
 			else
 				consdebug = nil;
-			print("consdebug now 0x%p\n", consdebug);
+			print("consdebug now %#p\n", consdebug);
 			return;
 		case 'D':
 			if(consdebug == nil)
@@ -631,7 +631,7 @@ readnum(ulong off, char *buf, ulong n, ulong val, int size)
 {
 	char tmp[64];
 
-	snprint(tmp, sizeof(tmp), "%*.0lud", size-1, val);
+	snprint(tmp, sizeof(tmp), "%*lud", size-1, val);
 	tmp[size-1] = ' ';
 	if(off >= size)
 		return 0;
@@ -957,7 +957,7 @@ consread(Chan *c, void *buf, long n, vlong off)
 		return n;
 
 	default:
-		print("consread 0x%llux\n", c->qid.path);
+		print("consread %#llux\n", c->qid.path);
 		error(Egreg);
 	}
 	return -1;		/* never reached */
@@ -1112,7 +1112,7 @@ conswrite(Chan *c, void *va, long n, vlong off)
 		break;
 
 	default:
-		print("conswrite: 0x%llux\n", c->qid.path);
+		print("conswrite: %#llux\n", c->qid.path);
 		error(Egreg);
 	}
 	return n;
@@ -1240,7 +1240,7 @@ readtime(ulong off, char *buf, int n)
 	if(fasthz == 0LL)
 		fastticks((uvlong*)&fasthz);
 	sec = nsec/1000000000ULL;
-	snprint(str, sizeof(str), "%*.0lud %*.0llud %*.0llud %*.0llud ",
+	snprint(str, sizeof(str), "%*lud %*llud %*llud %*llud ",
 		NUMSIZE-1, sec,
 		VLNUMSIZE-1, nsec,
 		VLNUMSIZE-1, ticks,

+ 1 - 1
sys/src/9/port/devmnt.c

@@ -759,7 +759,7 @@ mountrpc(Mnt *m, Mntrpc *r)
 		cn = "?";
 		if(r->c != nil && r->c->path != nil)
 			cn = r->c->path->s;
-		print("mnt: proc %s %lud: mismatch from %s %s rep 0x%lux tag %d fid %d T%d R%d rp %d\n",
+		print("mnt: proc %s %lud: mismatch from %s %s rep %#p tag %d fid %d T%d R%d rp %d\n",
 			up->text, up->pid, sn, cn,
 			r, r->request.tag, r->request.fid, r->request.type,
 			r->reply.type, r->reply.tag);

+ 1 - 1
sys/src/9/port/devpipe.c

@@ -310,7 +310,7 @@ pipewrite(Chan *c, void *va, long n, vlong)
 	Pipe *p;
 
 	if(!islo())
-		print("pipewrite hi %lux\n", getcallerpc(&c));
+		print("pipewrite hi %#p\n", getcallerpc(&c));
 	if(waserror()) {
 		/* avoid notes when pipe is a mounted queue */
 		if((c->flag & CMSG) == 0)

+ 1 - 1
sys/src/9/port/devpnp.c

@@ -498,7 +498,7 @@ pnpread(Chan *c, void *va, long n, vlong offset)
 		return devdirread(c, a, n, (Dirtab *)0, 0L, pnpgen);
 	case Qpnpctl:
 		if(pnp.rddata > 0)
-			sprint(up->genbuf, "enabled 0x%x\n", pnp.rddata);
+			sprint(up->genbuf, "enabled %#x\n", pnp.rddata);
 		else
 			sprint(up->genbuf, "disabled\n");
 		return readstr(offset, a, n, up->genbuf);

+ 2 - 2
sys/src/9/port/devsdp.c

@@ -627,11 +627,11 @@ sdpwrite(Chan *ch, void *a, long n, vlong off)
 		arg0 = cb->f[0];
 		if(strcmp(arg0, "accept") == 0) {
 			if(cb->nf != 2)
-				error("usage: accect file");
+				error("usage: accept file");
 			convopenchan(c, cb->f[1]);
 		} else if(strcmp(arg0, "dial") == 0) {
 			if(cb->nf != 2)
-				error("usage: accect file");
+				error("usage: dial file");
 			convopenchan(c, cb->f[1]);
 			convsetstate(c, CDial);
 		} else if(strcmp(arg0, "drop") == 0) {

+ 1 - 1
sys/src/9/port/devsegment.c

@@ -327,7 +327,7 @@ segmentread(Chan *c, void *a, long n, vlong voff)
 		g = c->aux;
 		if(g->s == nil)
 			error("segment not yet allocated");
-		sprint(buf, "va 0x%lux 0x%lux\n", g->s->base, g->s->top-g->s->base);
+		sprint(buf, "va %#lux %#lux\n", g->s->base, g->s->top-g->s->base);
 		return readstr(voff, a, n, buf);
 	case Qdata:
 		g = c->aux;

+ 2 - 2
sys/src/9/port/devtls.c

@@ -821,7 +821,7 @@ if(tr->debug) pdump(unpad_len, p, "decrypted:");
 
 	switch(type) {
 	default:
-		rcvError(tr, EIllegalParameter, "invalid record message 0x%x", type);
+		rcvError(tr, EIllegalParameter, "invalid record message %#x", type);
 		break;
 	case RChangeCipherSpec:
 		if(len != 1 || p[0] != 1)
@@ -1140,7 +1140,7 @@ tlsread(Chan *c, void *a, long n, vlong off)
 		s = buf;
 		e = buf + Statlen;
 		s = seprint(s, e, "State: %s\n", tlsstate(tr->state));
-		s = seprint(s, e, "Version: 0x%x\n", tr->version);
+		s = seprint(s, e, "Version: %#x\n", tr->version);
 		if(tr->in.sec != nil)
 			s = seprint(s, e, "EncIn: %s\nHashIn: %s\n", tr->in.sec->encalg, tr->in.sec->hashalg);
 		if(tr->in.new != nil)

+ 2 - 2
sys/src/9/port/edf.c

@@ -201,7 +201,7 @@ release(Proc *p)
 			pt(p, SDeadline, nowns + 1000LL*e->D);
 		}
 	}else{
-		DPRINT("%lud release %lud[%s], too late t=%lud, called from 0x%lux\n",
+		DPRINT("%lud release %lud[%s], too late t=%lud, called from %#p\n",
 			now, p->pid, statename[p->state], e->t, getcallerpc(&p));
 	}
 }
@@ -490,7 +490,7 @@ edfyield(void)
 		up->trend = &up->sleep;
 		timeradd(up);
 	}else if(up->tf != releaseintr)
-		print("edfyield: surprise! 0x%lux\n", up->tf);
+		print("edfyield: surprise! %#p\n", up->tf);
 	edfunlock();
 	sleep(&up->sleep, yfn, nil);
 }

+ 1 - 1
sys/src/9/port/fault.c

@@ -327,7 +327,7 @@ okaddr(ulong addr, ulong len, int write)
 			return 1;
 		}
 	}
-	pprint("suicide: invalid address 0x%lux/%lud in sys call pc=0x%lux\n", addr, len, userpc());
+	pprint("suicide: invalid address %#lux/%lud in sys call pc=%#lux\n", addr, len, userpc());
 	return 0;
 }
 

+ 30 - 7
sys/src/9/port/lib.h

@@ -79,18 +79,40 @@ extern	int	snprint(char*, int, char*, ...);
 extern	int	vsnprint(char*, int, char*, va_list);
 extern	int	sprint(char*, char*, ...);
 
-extern	int	fmtinstall(int, int (*)(Fmt*));
-extern	void	quotefmtinstall(void);
-extern	int	fmtprint(Fmt*, char*, ...);
-extern	int	fmtstrcpy(Fmt*, char*);
-extern	int	encodefmt(Fmt*);
-
 #pragma	varargck	argpos	fmtprint	2
 #pragma	varargck	argpos	print		1
 #pragma	varargck	argpos	seprint		3
 #pragma	varargck	argpos	snprint		3
 #pragma	varargck	argpos	sprint		2
-#pragma varargck	type	"H" void*
+
+#pragma	varargck	type	"lld"	vlong
+#pragma	varargck	type	"llx"	vlong
+#pragma	varargck	type	"lld"	uvlong
+#pragma	varargck	type	"llx"	uvlong
+#pragma	varargck	type	"ld"	long
+#pragma	varargck	type	"lx"	long
+#pragma	varargck	type	"ld"	ulong
+#pragma	varargck	type	"lx"	ulong
+#pragma	varargck	type	"d"	int
+#pragma	varargck	type	"x"	int
+#pragma	varargck	type	"c"	int
+#pragma	varargck	type	"C"	int
+#pragma	varargck	type	"d"	uint
+#pragma	varargck	type	"x"	uint
+#pragma	varargck	type	"c"	uint
+#pragma	varargck	type	"C"	uint
+#pragma	varargck	type	"s"	char*
+#pragma	varargck	type	"q"	char*
+#pragma	varargck	type	"S"	Rune*
+#pragma	varargck	type	"%"	void
+#pragma	varargck	type	"p"	uintptr
+#pragma	varargck	type	"p"	void*
+#pragma	varargck	flag	','
+
+extern	int	fmtinstall(int, int (*)(Fmt*));
+extern	void	quotefmtinstall(void);
+extern	int	fmtprint(Fmt*, char*, ...);
+extern	int	fmtstrcpy(Fmt*, char*);
 
 /*
  * one-of-a-kind
@@ -108,6 +130,7 @@ extern	char	end[];
 extern	int	getfields(char*, char**, int, int, char*);
 extern	int	tokenize(char*, char**, int);
 extern	int	dec64(uchar*, int, char*, int);
+extern	int	encodefmt(Fmt*);
 extern	void	qsort(void*, long, long, int (*)(void*, void*));
 
 /*

+ 1 - 1
sys/src/9/port/page.c

@@ -642,7 +642,7 @@ portcountpagerefs(ulong *ref, int print)
 				if(s == nil)
 					continue;
 				if(s->ref != s->mark){
-					iprint("segment %#.8lux (used by proc %lud pid %lud) has bad ref count %lud actual %lud\n",
+					iprint("segment %#p (used by proc %lud pid %lud) has bad ref count %lud actual %lud\n",
 						s, i, p->pid, s->ref, s->mark);
 				}
 			}

+ 0 - 32
sys/src/9/port/portdat.h

@@ -949,41 +949,9 @@ enum
 	Qkick		= (1<<5),	/* always call the kick routine after qwrite */
 };
 
-
 #define DEVDOTDOT -1
 
-#pragma	varargck	argpos	print	1
-#pragma	varargck	argpos	snprint	3
-#pragma	varargck	argpos	sprint	2
-#pragma	varargck	argpos	fprint	2
-#pragma	varargck	argpos	panic	1
-
-#pragma	varargck	type	"lld"	vlong
-#pragma	varargck	type	"llx"	vlong
-#pragma	varargck	type	"lld"	uvlong
-#pragma	varargck	type	"llx"	uvlong
-#pragma	varargck	type	"lx"	void*
-#pragma	varargck	type	"ld"	long
-#pragma	varargck	type	"lx"	long
-#pragma	varargck	type	"ld"	ulong
-#pragma	varargck	type	"lx"	ulong
-#pragma	varargck	type	"d"	int
-#pragma	varargck	type	"x"	int
-#pragma	varargck	type	"c"	int
-#pragma	varargck	type	"C"	int
-#pragma	varargck	type	"d"	uint
-#pragma	varargck	type	"x"	uint
-#pragma	varargck	type	"c"	uint
-#pragma	varargck	type	"C"	uint
-#pragma	varargck	type	"s"	char*
-#pragma	varargck	type	"S"	Rune*
-#pragma	varargck	type	"r"	void
-#pragma	varargck	type	"%"	void
 #pragma	varargck	type	"I"	uchar*
 #pragma	varargck	type	"V"	uchar*
 #pragma	varargck	type	"E"	uchar*
 #pragma	varargck	type	"M"	uchar*
-#pragma	varargck	type	"p"	uintptr
-#pragma	varargck	type	"p"	void*
-#pragma	varargck	type	"q"	char*
-#pragma	varargck	flag	','

+ 4 - 4
sys/src/9/port/proc.c

@@ -115,7 +115,7 @@ sched(void)
 	Proc *p;
 
 	if(m->ilockdepth)
-		panic("ilockdepth %d, last lock 0x%p at 0x%lux, sched called from 0x%lux",
+		panic("ilockdepth %d, last lock %#p at %#lux, sched called from %#p",
 			m->ilockdepth, up?up->lastilock:nil,
 			(up && up->lastilock)?up->lastilock->pc:0,
 			getcallerpc(&p+2));
@@ -737,12 +737,12 @@ sleep(Rendez *r, int (*f)(void*), void *arg)
 	s = splhi();
 
 	if(up->nlocks.ref)
-		print("process %lud sleeps with %lud locks held, last lock 0x%p locked at pc 0x%lux, sleep called from 0x%lux\n",
+		print("process %lud sleeps with %lud locks held, last lock %#p locked at pc %#lux, sleep called from %#p\n",
 			up->pid, up->nlocks.ref, up->lastlock, up->lastlock->pc, getcallerpc(&r));
 	lock(r);
 	lock(&up->rlock);
 	if(r->p){
-		print("double sleep called from 0x%lux, %lud %lud\n", getcallerpc(&r), r->p->pid, up->pid);
+		print("double sleep called from %#p, %lud %lud\n", getcallerpc(&r), r->p->pid, up->pid);
 		dumpstack();
 	}
 
@@ -827,7 +827,7 @@ void
 tsleep(Rendez *r, int (*fn)(void*), void *arg, ulong ms)
 {
 	if (up->tt){
-		print("tsleep: timer active: mode %d, tf 0x%lux\n", up->tmode, up->tf);
+		print("tsleep: timer active: mode %d, tf %#p\n", up->tmode, up->tf);
 		timerdel(up);
 	}
 	up->tns = MS2NS(ms);

+ 3 - 3
sys/src/9/port/qlock.c

@@ -19,12 +19,12 @@ qlock(QLock *q)
 	Proc *p;
 
 	if(m->ilockdepth != 0)
-		print("qlock: %lux: ilockdepth %d\n", getcallerpc(&q), m->ilockdepth);
+		print("qlock: %#p: ilockdepth %d\n", getcallerpc(&q), m->ilockdepth);
 	if(up != nil && up->nlocks.ref)
-		print("qlock: %lux: nlocks %lud\n", getcallerpc(&q), up->nlocks.ref);
+		print("qlock: %#p: nlocks %lud\n", getcallerpc(&q), up->nlocks.ref);
 
 	if(q->use.key == 0x55555555)
-		panic("qlock: q %p, key 5*\n", q);
+		panic("qlock: q %#p, key 5*\n", q);
 	lock(&q->use);
 	rwstats.qlock++;
 	if(!q->locked) {

+ 1 - 1
sys/src/9/port/sdaoe.c

@@ -500,7 +500,7 @@ aoerio(SDreq *r)
 		rio = devtab[c->c->type]->write;
 		break;
 	default:
-		print("%s: bad cmd 0x%.2ux\n", name, cmd[0]);
+		print("%s: bad cmd %#.2ux\n", name, cmd[0]);
 		r->status = SDcheck;
 		return SDcheck;
 	}

+ 8 - 8
sys/src/9/port/taslock.c

@@ -33,7 +33,7 @@ deccnt(Ref *r)
 
 	x = _xdec(&r->ref);
 	if(x < 0)
-		panic("deccnt pc=0x%lux", getcallerpc(&r));
+		panic("deccnt pc=%#p", getcallerpc(&r));
 	return x;
 }
 
@@ -56,7 +56,7 @@ lockloop(Lock *l, ulong pc)
 	Proc *p;
 
 	p = l->p;
-	print("lock 0x%lux loop key 0x%lux pc 0x%lux held by pc 0x%lux proc %lud\n",
+	print("lock %#p loop key %#lux pc %#lux held by pc %#lux proc %lud\n",
 		l, l->key, pc, l->pc, p ? p->pid : 0);
 	dumpaproc(up);
 	if(p != nil)
@@ -98,7 +98,7 @@ lock(Lock *l)
 				 * Priority inversion, yield on a uniprocessor; on a
 				 * multiprocessor, the other processor will unlock
 				 */
-				print("inversion 0x%lux pc 0x%lux proc %lud held by pc 0x%lux proc %lud\n",
+				print("inversion %#p pc %#lux proc %lud held by pc %#lux proc %lud\n",
 					l, pc, up ? up->pid : 0, l->pc, l->p ? l->p->pid : 0);
 				up->edf->d = todget(nil);	/* yield to process with lock */
 			}
@@ -201,11 +201,11 @@ unlock(Lock *l)
 	}
 #endif
 	if(l->key == 0)
-		print("unlock: not locked: pc %luX\n", getcallerpc(&l));
+		print("unlock: not locked: pc %#p\n", getcallerpc(&l));
 	if(l->isilock)
 		print("unlock of ilock: pc %lux, held by %lux\n", getcallerpc(&l), l->pc);
 	if(l->p != up)
-		print("unlock: up changed: pc %lux, acquired at pc %lux, lock p 0x%p, unlock up 0x%p\n", getcallerpc(&l), l->pc, l->p, up);
+		print("unlock: up changed: pc %#p, acquired at pc %lux, lock p %#p, unlock up %#p\n", getcallerpc(&l), l->pc, l->p, up);
 	l->m = nil;
 	l->key = 0;
 	coherence();
@@ -238,11 +238,11 @@ iunlock(Lock *l)
 		ilockpcs[n++ & 0xff]  = l->pc;
 #endif
 	if(l->key == 0)
-		print("iunlock: not locked: pc %luX\n", getcallerpc(&l));
+		print("iunlock: not locked: pc %#p\n", getcallerpc(&l));
 	if(!l->isilock)
-		print("iunlock of lock: pc %lux, held by %lux\n", getcallerpc(&l), l->pc);
+		print("iunlock of lock: pc %#p, held by %#lux\n", getcallerpc(&l), l->pc);
 	if(islo())
-		print("iunlock while lo: pc %lux, held by %lux\n", getcallerpc(&l), l->pc);
+		print("iunlock while lo: pc %#p, held by %#lux\n", getcallerpc(&l), l->pc);
 
 	sr = l->sr;
 	l->m = nil;