--- /sys/games/lib/fortunes Wed Mar 20 18:17:45 2013 +++ /sys/games/lib/fortunes Thu Apr 4 21:52:18 2013 @@ -4309,3 +4309,4 @@ If it is good information which comes from nowhere it is all right but this is wrong information that comes from nowhere and it is completely wrong. - Arsène Wenger. I fixed their fix and it does work. - forsyth To maintain backward compatibility, the relationships between the many options are quite complex. - ls(1) OS X Manual Page +qemu: could not open serial device 'dev': Success --- /sys/src/9/kw/syscall.c Tue Jan 4 01:57:51 2011 +++ /sys/src/9/kw/syscall.c Wed Apr 3 01:22:15 2013 @@ -163,6 +163,7 @@ memmove(nf->msg, up->note[0].msg, ERRMAX); nf->arg1 = nf->msg; nf->arg0 = &nf->ureg; + ureg->r0 = PTR2UINT(nf->arg0); nf->ip = 0; ureg->sp = sp; --- /sys/src/9/omap/devuart.c Fri Feb 25 23:17:37 2011 +++ /sys/src/9/omap/devuart.c Mon Apr 8 22:16:53 2013 @@ -75,17 +75,17 @@ p->cts = 1; p->ctsbackoff = 0; -if (up) { - if(p->bits == 0) - uartctl(p, "l8"); - if(p->stop == 0) - uartctl(p, "s1"); - if(p->parity == 0) - uartctl(p, "pn"); - if(p->baud == 0) - uartctl(p, "b9600"); - (*p->phys->enable)(p, 1); -} + if (up) { + if(p->bits == 0) + uartctl(p, "l8"); + if(p->stop == 0) + uartctl(p, "s1"); + if(p->parity == 0) + uartctl(p, "pn"); + if(p->baud == 0) + uartctl(p, "b9600"); + (*p->phys->enable)(p, 1); + } /* * use ilock because uartclock can otherwise interrupt here @@ -767,8 +767,14 @@ void uartputc(int c) { - if(consuart == nil || consuart->phys->putc == nil) + char c2; + + if(consuart == nil || consuart->phys->putc == nil) { + c2 = c; + if (lprint) + (*lprint)(&c2, 1); return; + } consuart->phys->putc(consuart, c); } @@ -777,8 +783,11 @@ { char *e; - if(consuart == nil || consuart->phys->putc == nil) + if(consuart == nil || consuart->phys->putc == nil) { + if (lprint) + (*lprint)(s, n); return; + } e = s+n; for(; smsg, up->note[0].msg, ERRMAX); nf->arg1 = nf->msg; nf->arg0 = &nf->ureg; + ureg->r0 = PTR2UINT(nf->arg0); nf->ip = 0; ureg->sp = sp; --- /sys/src/9/port/devproc.c Mon Oct 22 21:42:47 2012 +++ /sys/src/9/port/devproc.c Mon Apr 8 20:18:31 2013 @@ -7,7 +7,7 @@ #include "fns.h" #include "../port/error.h" #include "ureg.h" -#include "edf.h" +#include "../port/edf.h" enum { --- /sys/src/9/port/devuart.c Tue Aug 2 00:53:23 2011 +++ /sys/src/9/port/devuart.c Mon Apr 8 20:18:26 2013 @@ -36,7 +36,7 @@ /* * enable/disable uart and add/remove to list of enabled uarts */ -static Uart* +Uart* uartenable(Uart *p) { Uart **l; @@ -767,8 +767,14 @@ void uartputc(int c) { - if(consuart == nil || consuart->phys->putc == nil) + char c2; + + if(consuart == nil || consuart->phys->putc == nil) { + c2 = c; + if (lprint) + (*lprint)(&c2, 1); return; + } consuart->phys->putc(consuart, c); } @@ -777,9 +783,11 @@ { char *e; - if(consuart == nil || consuart->phys->putc == nil) + if(consuart == nil || consuart->phys->putc == nil) { + if (lprint) + (*lprint)(s, n); return; - + } e = s+n; for(; s int schedgain = 30; /* units in seconds */ --- /sys/src/9/port/sysproc.c Wed Feb 13 21:50:37 2013 +++ /sys/src/9/port/sysproc.c Mon Apr 8 20:18:51 2013 @@ -5,7 +5,7 @@ #include "dat.h" #include "fns.h" #include "../port/error.h" -#include "edf.h" +#include "../port/edf.h" #include --- /sys/src/9/port/taslock.c Sun Aug 10 06:19:55 2008 +++ /sys/src/9/port/taslock.c Mon Apr 8 20:18:51 2013 @@ -4,7 +4,7 @@ #include "dat.h" #include "fns.h" #include "../port/error.h" -#include "edf.h" +#include "../port/edf.h" long maxlockcycles; long maxilockcycles; --- /sys/src/9/teg2/devuart.c Thu Apr 19 21:23:04 2012 +++ /sys/src/9/teg2/devuart.c Mon Apr 8 22:16:53 2013 @@ -771,7 +771,8 @@ if(consuart == nil || consuart->phys->putc == nil) { c2 = c; - _uartputs(&c2, 1); + if (lprint) + (*lprint)(&c2, 1); return; } consuart->phys->putc(consuart, c); @@ -783,7 +784,8 @@ char *e; if(consuart == nil || consuart->phys->putc == nil) { - _uartputs(s, n); + if (lprint) + (*lprint)(s, n); return; } --- /sys/src/9/teg2/syscall.c Tue Apr 24 07:20:58 2012 +++ /sys/src/9/teg2/syscall.c Wed Apr 3 01:22:15 2013 @@ -169,6 +169,7 @@ memmove(nf->msg, up->note[0].msg, ERRMAX); nf->arg1 = nf->msg; nf->arg0 = &nf->ureg; + ureg->r0 = PTR2UINT(nf->arg0); nf->ip = 0; ureg->sp = sp; --- /sys/src/cmd/postscript/common/mkfile Sat Mar 18 02:57:05 2000 +++ /sys/src/cmd/postscript/common/mkfile Mon Apr 8 22:14:26 2013 @@ -7,7 +7,6 @@ glob.$O\ misc.$O\ request.$O\ - rune.$O\ tempnam.$O\ getopt.$O\ @@ -16,7 +15,6 @@ ext.h\ request.h\ path.h\ - rune.h\ T1 - */ - c = *(unsigned char*)str; - if(c < Tx) { - *rune = c; - return 1; - } - - /* - * two character sequence - * 0080-07FF => T2 Tx - */ - c1 = *(unsigned char*)(str+1) ^ Tx; - if(c1 & Testx) - goto bad; - if(c < T3) { - if(c < T2) - goto bad; - l = ((c << Bitx) | c1) & Rune2; - if(l <= Rune1) - goto bad; - *rune = l; - return 2; - } - - /* - * three character sequence - * 0800-FFFF => T3 Tx Tx - */ - c2 = *(unsigned char*)(str+2) ^ Tx; - if(c2 & Testx) - goto bad; - if(c < T4) { - l = ((((c << Bitx) | c1) << Bitx) | c2) & Rune3; - if(l <= Rune2) - goto bad; - *rune = l; - return 3; - } - - /* - * bad decoding - */ -bad: - *rune = Bad; - return 1; -} - -int -runetochar(char *str, Rune *rune) -{ - long c; - - /* - * one character sequence - * 00000-0007F => 00-7F - */ - c = *rune; - if(c <= Rune1) { - str[0] = c; - return 1; - } - - /* - * two character sequence - * 0080-07FF => T2 Tx - */ - if(c <= Rune2) { - str[0] = T2 | (c >> 1*Bitx); - str[1] = Tx | (c & Maskx); - return 2; - } - - /* - * three character sequence - * 0800-FFFF => T3 Tx Tx - */ - str[0] = T3 | (c >> 2*Bitx); - str[1] = Tx | ((c >> 1*Bitx) & Maskx); - str[2] = Tx | (c & Maskx); - return 3; -} - -int -runelen(long c) -{ - Rune rune; - char str[10]; - - rune = c; - return runetochar(str, &rune); -} - -int -fullrune(char *str, int n) -{ - int c; - - if(n > 0) { - c = *(unsigned char*)str; - if(c < Tx) - return 1; - if(n > 1) - if(c < T3 || n > 2) - return 1; - } - return 0; -} --- /sys/src/cmd/postscript/common/rune.h Sat Apr 1 21:04:43 2006 +++ /sys/src/cmd/postscript/common/rune.h Thu Jan 1 01:00:00 1970 @@ -1,19 +0,0 @@ -/* - * - * Rune declarations - for supporting UTF encoding. - * - */ - -#define RUNELIB 1 - -#ifdef RUNELIB -typedef unsigned short Rune; - -enum -{ - UTFmax = 3, /* maximum bytes per rune */ - Runesync = 0x80, /* cannot represent part of a utf sequence (<) */ - Runeself = 0x80, /* rune and utf sequences are the same (<) */ - Runeerror = 0xFFFD, /* decoding error in utf */ -}; -#endif --- /sys/src/cmd/postscript/mkfile Sun Mar 26 04:26:49 2000 +++ /sys/src/cmd/postscript/mkfile Mon Apr 8 22:14:02 2013 @@ -44,7 +44,10 @@ &:VQ: test -d $POSTBIN || mkdir $POSTBIN for (i in $TARGETS) @{ - echo ---- Making $target in $i ----; - cd $i; + echo ---- Making $target in $i ---- + cd $i + rfork e + if (~ $target default) + target=() mk $target } --- /sys/src/libc/mips/c_fcr0.s Thu Jan 1 01:00:00 1970 +++ /sys/src/libc/mips/c_fcr0.s Mon Apr 8 20:17:30 2013 @@ -0,0 +1,3 @@ + TEXT C_fcr0(SB), $0 + MOVW FCR0, R1 + RET --- /sys/src/libc/mips/mkfile Fri Mar 18 22:47:24 2011 +++ /sys/src/libc/mips/mkfile Mon Apr 8 20:17:25 2013 @@ -5,6 +5,7 @@ SFILES=\ argv0.s\ atom.s\ + c_fcr0.s\ getcallerpc.s\ getfcr.s\ main9.s\ --- /sys/src/libc/mips/tas.s Sun Dec 12 02:21:54 1999 +++ /sys/src/libc/mips/tas.s Mon Apr 8 20:17:25 2013 @@ -1,5 +1,5 @@ /* - * magnum user level lock code + * mips user level lock code */ #define LL(base, rt) WORD $((060<<26)|((base)<<21)|((rt)<<16)) @@ -26,8 +26,4 @@ SC(2, 3) NOOP BEQ R3, tas1 - RET - - TEXT C_fcr0(SB), $0 - MOVW FCR0, R1 RET