Plan 9 from Bell Labs 2005-04-19

dist/replica/_plan9.db

@@ -17,7 +17,7 @@
 386/bin/8a - 775 sys sys 1108285260 115096
 386/bin/8c - 775 sys sys 1113620963 358011
 386/bin/8l - 775 sys sys 1107835553 115728
-386/bin/9660srv - 775 sys sys 1108354539 103973
+386/bin/9660srv - 775 sys sys 1113794389 103976
 386/bin/aan - 775 sys sys 1108354539 130710
 386/bin/acid - 775 sys sys 1108960003 355983
 386/bin/acme - 775 sys sys 1111637282 428512
@@ -112,7 +112,7 @@
 386/bin/aux/lpdaemon - 775 sys sys 1094040084 168085
 386/bin/aux/lpdsend - 775 sys sys 1087442507 153635
 386/bin/aux/lpsend - 775 sys sys 1104121978 52540
-386/bin/aux/mapd - 775 sys sys 1104121978 192896
+386/bin/aux/mapd - 775 sys sys 1113794389 190746
 386/bin/aux/mkflashfs - 775 sys sys 1104121979 67357
 386/bin/aux/mklatinkbd - 775 sys sys 1104121979 64179
 386/bin/aux/mnihongo - 775 sys sys 1106799170 138512
@@ -120,7 +120,7 @@
 386/bin/aux/ms2 - 775 sys sys 1108008332 81689
 386/bin/aux/msexceltables - 775 sys sys 1106453225 80995
 386/bin/aux/mswordstrings - 775 sys sys 1104121980 65317
-386/bin/aux/na - 775 sys sys 1104121980 154635
+386/bin/aux/na - 775 sys sys 1113794390 154186
 386/bin/aux/nfsmount - 775 sys sys 1104121981 234092
 386/bin/aux/nfsserver - 775 sys sys 1108354546 185411
 386/bin/aux/olefs - 775 sys sys 1108354547 143259
@@ -160,11 +160,11 @@
 386/bin/bind - 775 sys sys 1104121989 59566
 386/bin/bitsy - 20000000775 sys sys 1018721039 0
 386/bin/bitsy/bitsyload - 775 sys sys 1104121989 63363
-386/bin/bitsy/keyboard - 775 sys sys 1106799171 305361
+386/bin/bitsy/keyboard - 775 sys sys 1113794391 305415
 386/bin/bitsy/light - 775 sys sys 1020319072 242
 386/bin/bitsy/params - 775 sys sys 1104121990 58776
 386/bin/bitsy/pencal - 775 sys sys 1104121991 117190
-386/bin/bitsy/prompter - 775 sys sys 1106799172 285651
+386/bin/bitsy/prompter - 775 sys sys 1113794391 285703
 386/bin/bmp - 775 sys sys 1108960005 157595
 386/bin/bunzip2 - 775 sys sys 1104121992 97499
 386/bin/bzip2 - 775 sys sys 1104121992 114034
@@ -183,7 +183,7 @@
 386/bin/comm - 775 sys sys 1104121996 61360
 386/bin/con - 775 sys sys 1109909287 78211
 386/bin/cp - 775 sys sys 1104121996 63215
-386/bin/cpp - 775 sys sys 1104121997 150308
+386/bin/cpp - 775 sys sys 1113794392 149779
 386/bin/cpu - 775 sys sys 1108354550 137694
 386/bin/crop - 775 sys sys 1104121998 115763
 386/bin/date - 775 sys sys 1104121998 43261
@@ -256,11 +256,11 @@
 386/bin/getmap - 775 sys sys 1104122014 65180
 386/bin/gif - 775 sys sys 1108960006 158063
 386/bin/grap - 775 sys sys 1094040086 280301
-386/bin/graph - 775 sys sys 1104122016 129263
+386/bin/graph - 775 sys sys 1113794392 127329
 386/bin/grep - 775 sys sys 1104122016 79051
 386/bin/gs - 775 sys sys 1094040110 11124993
 386/bin/gunzip - 775 sys sys 1104122016 80284
-386/bin/gview - 775 sys sys 1106799175 237200
+386/bin/gview - 775 sys sys 1113794393 237262
 386/bin/gzip - 775 sys sys 1104122017 84762
 386/bin/hayes - 775 sys sys 1104122017 64556
 386/bin/hget - 775 sys sys 1109132002 231848
@@ -305,7 +305,7 @@
 386/bin/ip/tftpd - 775 sys sys 1106971479 129489
 386/bin/ip/traceroute - 775 sys sys 1104122030 73497
 386/bin/ip/udpecho - 775 sys sys 1104122030 43159
-386/bin/join - 775 sys sys 1104122031 116241
+386/bin/join - 775 sys sys 1113794393 114091
 386/bin/jpg - 775 sys sys 1108960009 174528
 386/bin/kbmap - 775 sys sys 1106799176 142498
 386/bin/kprof - 775 sys sys 1108960009 99723
@@ -353,7 +353,7 @@
 386/bin/pcc - 775 sys sys 1112757395 67806
 386/bin/pic - 775 sys sys 1094040111 305519
 386/bin/pipefile - 775 sys sys 1104122044 39396
-386/bin/plot - 775 sys sys 1106799178 221135
+386/bin/plot - 775 sys sys 1113794394 221197
 386/bin/plumb - 775 sys sys 1104122045 66969
 386/bin/plumber - 775 sys sys 1108960011 169863
 386/bin/png - 775 sys sys 1108960012 164172
@@ -365,7 +365,7 @@
 386/bin/ps - 775 sys sys 1104122047 65805
 386/bin/pwd - 775 sys sys 1104122047 36897
 386/bin/ramfs - 775 sys sys 1109650122 89167
-386/bin/rc - 775 sys sys 1104122048 143215
+386/bin/rc - 775 sys sys 1113794394 143163
 386/bin/rdbfs - 775 sys sys 1108354561 168396
 386/bin/read - 775 sys sys 1104122049 58046
 386/bin/replica - 20000000775 sys sys 1018321168 0
@@ -383,7 +383,7 @@
 386/bin/rm - 775 sys sys 1104122051 61333
 386/bin/rx - 775 sys sys 1104122051 82055
 386/bin/sam - 775 sys sys 1112583961 158368
-386/bin/scat - 775 sys sys 1106799180 283256
+386/bin/scat - 775 sys sys 1113794395 283314
 386/bin/scp - 775 sys sys 1104122053 151911
 386/bin/scuzz - 775 sys sys 1104122053 111613
 386/bin/sed - 775 sys sys 1104122054 89523
@@ -410,12 +410,12 @@
 386/bin/swap - 775 sys sys 1104122060 62094
 386/bin/syscall - 775 sys sys 1104122060 73536
 386/bin/tail - 775 sys sys 1104122060 65938
-386/bin/tar - 775 sys sys 1109045334 95456
+386/bin/tar - 775 sys sys 1113794395 96205
 386/bin/tbl - 775 sys sys 1104122061 113124
 386/bin/tcs - 775 sys sys 1104122062 256588
 386/bin/tee - 775 sys sys 1104122062 38428
 386/bin/telco - 775 sys sys 1108354564 103315
-386/bin/telnet - 775 sys sys 1104122062 81952
+386/bin/telnet - 775 sys sys 1113794395 80364
 386/bin/test - 775 sys sys 1104122062 69853
 386/bin/time - 775 sys sys 1104122063 61386
 386/bin/tlsclient - 775 sys sys 1109132004 197187
@@ -439,28 +439,28 @@
 386/bin/unzip - 775 sys sys 1104122069 89733
 386/bin/upas - 20000000775 sys sys 1016857390 0
 386/bin/upas/addhash - 775 sys sys 1064598343 67859
-386/bin/upas/aliasmail - 775 sys sys 1104122069 104752
+386/bin/upas/aliasmail - 775 sys sys 1113794396 104790
 386/bin/upas/bayes - 775 sys sys 1064598344 70530
-386/bin/upas/deliver - 775 sys sys 1104122069 99781
-386/bin/upas/filter - 775 sys sys 1109563698 147311
-386/bin/upas/fs - 775 sys sys 1109132005 332256
+386/bin/upas/deliver - 775 sys sys 1113794396 99819
+386/bin/upas/filter - 775 sys sys 1113794396 147349
+386/bin/upas/fs - 775 sys sys 1113794397 332294
 386/bin/upas/isspam - 775 sys sys 1064598349 38
 386/bin/upas/list - 775 sys sys 1104122071 82776
-386/bin/upas/marshal - 775 sys sys 1107490159 132595
-386/bin/upas/ml - 775 sys sys 1104122072 123499
-386/bin/upas/mlmgr - 775 sys sys 1104122072 104185
+386/bin/upas/marshal - 775 sys sys 1113794397 132633
+386/bin/upas/ml - 775 sys sys 1113794398 123537
+386/bin/upas/mlmgr - 775 sys sys 1113794398 104223
 386/bin/upas/mlowner - 775 sys sys 1104122072 92108
 386/bin/upas/msgcat - 775 sys sys 1064598353 38
 386/bin/upas/msgtok - 775 sys sys 1064598354 75149
-386/bin/upas/nedmail - 775 sys sys 1104122073 156258
-386/bin/upas/pop3 - 775 sys sys 1109132006 259782
-386/bin/upas/qer - 775 sys sys 1104122073 99840
+386/bin/upas/nedmail - 775 sys sys 1113794399 156296
+386/bin/upas/pop3 - 775 sys sys 1113794399 259820
+386/bin/upas/qer - 775 sys sys 1113794399 99878
 386/bin/upas/ratfs - 775 sys sys 1108354565 111342
-386/bin/upas/runq - 775 sys sys 1104122074 113086
-386/bin/upas/scanmail - 775 sys sys 1104122075 128749
-386/bin/upas/send - 775 sys sys 1109563698 191536
-386/bin/upas/smtp - 775 sys sys 1109132007 273564
-386/bin/upas/smtpd - 775 sys sys 1109132008 328719
+386/bin/upas/runq - 775 sys sys 1113794400 113527
+386/bin/upas/scanmail - 775 sys sys 1113794400 128787
+386/bin/upas/send - 775 sys sys 1113794401 191574
+386/bin/upas/smtp - 775 sys sys 1113794402 273602
+386/bin/upas/smtpd - 775 sys sys 1113794402 328757
 386/bin/upas/spam - 775 sys sys 1064598366 36
 386/bin/upas/testscan - 775 sys sys 1104122077 83668
 386/bin/upas/token - 775 sys sys 1104122077 77554
@@ -470,7 +470,7 @@
 386/bin/usb - 20000000775 sys sys 1019538890 0
 386/bin/usb/usbaudio - 775 sys sys 1112155768 185541
 386/bin/usb/usbd - 775 sys sys 1104898010 129846
-386/bin/usb/usbmouse - 775 sys sys 1112155768 140268
+386/bin/usb/usbmouse - 775 sys sys 1113794403 138127
 386/bin/usb/usbprinter - 775 sys sys 1089408719 222
 386/bin/vac - 775 sys sys 1104122079 169392
 386/bin/vacfs - 775 sys sys 1108354566 174866
@@ -558,7 +558,7 @@
 386/lib/libregexp.a - 664 sys sys 1108268401 37464
 386/lib/libscribble.a - 664 sys sys 1108699740 107280
 386/lib/libsec.a - 664 sys sys 1109132031 643998
-386/lib/libstdio.a - 664 sys sys 1108268403 126382
+386/lib/libstdio.a - 664 sys sys 1113794404 126206
 386/lib/libsunrpc.a - 664 sys sys 1108268404 355994
 386/lib/libthread.a - 664 sys sys 1108268404 71162
 386/lib/libventi.a - 664 sys sys 1108268404 97708
@@ -5881,7 +5881,7 @@ sys/src/9/pc/init9.c - 664 sys sys 1040002518 94
 sys/src/9/pc/initcode.s - 664 sys sys 1015014519 282
 sys/src/9/pc/io.h - 664 sys sys 1099761152 8095
 sys/src/9/pc/kbd.c - 664 sys sys 1079617269 11655
-sys/src/9/pc/l.s - 664 sys sys 1108068066 23574
+sys/src/9/pc/l.s - 664 sys sys 1113878623 23631
 sys/src/9/pc/main.c - 664 sys sys 1089046997 14677
 sys/src/9/pc/mem.h - 664 sys sys 1018553448 4573
 sys/src/9/pc/memory.c - 664 sys sys 1071245460 13028
@@ -12948,34 +12948,4 @@ usr/glenda/lib/profile - 664 glenda glenda 1105128663 890
 usr/glenda/readme.acme - 664 glenda glenda 1019860628 4753
 usr/glenda/readme.rio - 664 glenda glenda 1019860628 6370
 usr/glenda/tmp - 20000000775 glenda glenda 1018802620 0
-386/bin/9660srv - 775 sys sys 1113794389 103976
-386/bin/bitsy/keyboard - 775 sys sys 1113794391 305415
-386/bin/bitsy/prompter - 775 sys sys 1113794391 285703
-386/bin/cpp - 775 sys sys 1113794392 149779
-386/bin/usb/usbmouse - 775 sys sys 1113794403 138127
-386/bin/graph - 775 sys sys 1113794392 127329
-386/bin/join - 775 sys sys 1113794393 114091
-386/bin/plot - 775 sys sys 1113794394 221197
-386/bin/rc - 775 sys sys 1113794394 143163
-386/bin/scat - 775 sys sys 1113794395 283314
-386/bin/aux/mapd - 775 sys sys 1113794389 190746
-386/bin/aux/na - 775 sys sys 1113794390 154186
-386/bin/gview - 775 sys sys 1113794393 237262
-386/bin/tar - 775 sys sys 1113794395 96205
-386/bin/telnet - 775 sys sys 1113794395 80364
-386/bin/upas/aliasmail - 775 sys sys 1113794396 104790
-386/bin/upas/deliver - 775 sys sys 1113794396 99819
-386/bin/upas/filter - 775 sys sys 1113794396 147349
-386/bin/upas/fs - 775 sys sys 1113794397 332294
-386/bin/upas/marshal - 775 sys sys 1113794397 132633
-386/bin/upas/ml - 775 sys sys 1113794398 123537
-386/bin/upas/mlmgr - 775 sys sys 1113794398 104223
-386/bin/upas/nedmail - 775 sys sys 1113794399 156296
-386/bin/upas/pop3 - 775 sys sys 1113794399 259820
-386/bin/upas/qer - 775 sys sys 1113794399 99878
-386/bin/upas/runq - 775 sys sys 1113794400 113527
-386/bin/upas/scanmail - 775 sys sys 1113794400 128787
-386/bin/upas/send - 775 sys sys 1113794401 191574
-386/bin/upas/smtp - 775 sys sys 1113794402 273602
-386/bin/upas/smtpd - 775 sys sys 1113794402 328757
-386/lib/libstdio.a - 664 sys sys 1113794404 126206
+sys/src/9/pc/l.s - 664 sys sys 1113879928 23699

dist/replica/plan9.db

@@ -5881,7 +5881,7 @@ sys/src/9/pc/init9.c - 664 sys sys 1040002518 94
 sys/src/9/pc/initcode.s - 664 sys sys 1015014519 282
 sys/src/9/pc/io.h - 664 sys sys 1099761152 8095
 sys/src/9/pc/kbd.c - 664 sys sys 1079617269 11655
-sys/src/9/pc/l.s - 664 sys sys 1108068066 23574
+sys/src/9/pc/l.s - 664 sys sys 1113879928 23699
 sys/src/9/pc/main.c - 664 sys sys 1089046997 14677
 sys/src/9/pc/mem.h - 664 sys sys 1018553448 4573
 sys/src/9/pc/memory.c - 664 sys sys 1071245460 13028

dist/replica/plan9.log

@@ -14717,3 +14717,5 @@
 1113795082 28 c 386/bin/upas/smtp - 775 sys sys 1113794402 273602
 1113795082 29 c 386/bin/upas/smtpd - 775 sys sys 1113794402 328757
 1113795082 30 c 386/lib/libstdio.a - 664 sys sys 1113794404 126206
+1113879700 0 c sys/src/9/pc/l.s - 664 sys sys 1113878623 23631
+1113881500 0 c sys/src/9/pc/l.s - 664 sys sys 1113879928 23699

sys/src/9/pc/l.s

@@ -442,8 +442,13 @@ _aamloop:
  * FNxxx variations) so WAIT instructions must be explicitly placed in the
  * code as necessary.
  */
-#define	FPOFF								;\
-	WAIT								;\
+#define	FPOFF(l)							;\
+	MOVL	CR0, AX 					 ;\
+	ANDL	$0xC, AX			/* EM, TS */	 ;\
+	CMPL	AX, $0x8					 ;\
+	JEQ 	l						 ;\
+	WAIT							 ;\
+l:								 ;\
 	MOVL	CR0, AX							;\
 	ANDL	$~0x4, AX			/* EM=0 */		;\
 	ORL	$0x28, AX			/* NE=1, TS=1 */	;\
@@ -455,7 +460,7 @@ _aamloop:
 	MOVL	AX, CR0
 	
 TEXT fpoff(SB), $0				/* disable */
-	FPOFF
+	FPOFF(l1)
 	RET
 
 TEXT fpinit(SB), $0				/* enable and init */
@@ -473,7 +478,7 @@ TEXT fpinit(SB), $0				/* enable and init */
 TEXT fpsave(SB), $0				/* save state and disable */
 	MOVL	p+0(FP), AX
 	FSAVE	0(AX)				/* no WAIT */
-	FPOFF
+	FPOFF(l2)
 	RET
 
 TEXT fprestore(SB), $0				/* enable and restore state */
@@ -495,7 +500,7 @@ TEXT fpenv(SB), $0				/* save state without waiting */
 TEXT fpclear(SB), $0				/* clear pending exceptions */
 	FPON
 	FCLEX					/* no WAIT */
-	FPOFF
+	FPOFF(l3)
 	RET
 
 /*