plan9-archive/inferno-java

CHANGES+6−0

@@ -1,3 +1,9 @@
		1	20100715
		2	appl/wm/toolbar.b changed not to create new /chan/snarf if one exists, unless -p (private) option given [toolbar(1)]
		3	utils/cc/macbody - add overlooked change to implement __VA_ARGS__
		4	other minor updates to the compilers to resync
		5	20100714
		6	correctly initialise types in utils/cc/sub.c
1	20100504	7	20100504
2	change lib9/strtoull.c for MS	8	change lib9/strtoull.c for MS
3	20100503	9	20100503

appl/wm/toolbar.b+26−24

 	sys->bind("#s", "/chan", sys->MBEFORE);
 	arg->init(argv);
-	arg->setusage("toolbar [-s]");
+	arg->setusage("toolbar [-s] [-p]");
 	startmenu := 1;
+#	ownsnarf := (sys->open("/chan/snarf", Sys->ORDWR) == nil);
+	ownsnarf := sys->stat("/chan/snarf").t0 < 0;
 	while((c := arg->opt()) != 0){
 		case c {
 		's' =>
 			startmenu = 0;
+		'p' =>
+			ownsnarf = 1;
 		* =>
 			arg->usage();
 		}
 	shctxt := Context.new(ctxt);
 	shctxt.addmodule("wm", myselfbuiltin);
-	snarfIO := sys->file2chan("/chan", "snarf");
+	snarfIO: ref Sys->FileIO;
-	if(snarfIO == nil)
+	if(ownsnarf){
-		fatal(sys->sprint("cannot make /chan/snarf: %r"));
+		snarfIO = sys->file2chan("/chan", "snarf");
+		if(snarfIO == nil)
+			fatal(sys->sprint("cannot make /chan/snarf: %r"));
+	}else
+		snarfIO = ref Sys->FileIO(chan of (int, int, int, Sys->Rread), chan of (int, array of byte, int, Sys->Rwrite));
 	sync := chan of string;
 	spawn consoleproc(ctxt, sync);
 	if ((err := <-sync) != nil)
 	snarf: array of byte;
 #	write("/prog/"+string sys->pctl(0, nil)+"/ctl", "restricted"); # for testing
 	for(;;) alt{
-	s := <-tbtop.ctxt.kbd =>
+	k := <-tbtop.ctxt.kbd =>
-		tk->keyboard(tbtop, c);
+		tk->keyboard(tbtop, k);
 	m := <-tbtop.ctxt.ptr =>
 		tk->pointer(tbtop, *m);
 	s := <-tbtop.ctxt.ctl or
 		if (donesetup){
 			{
  				shctxt.run(ref Listnode(nil, s) :: nil, 0);
-			} exception e {"fail:*" =>;}
+			} exception {
+			"fail:*" =>	;
+			}
 		}
 	detask := <-task =>
 		deiconify(detask);
-	(off, data, fid, wc) := <-snarfIO.write =>
+	(off, data, nil, wc) := <-snarfIO.write =>
 		if(wc == nil)
 			break;
 		if (off == 0)			# write at zero truncates
 		tk->keyboard(top, c);
 	p := <-top.ctxt.ptr =>
 		tk->pointer(top, *p);
-	(off, nbytes, fid, rc) := <-iostdout.read =>
+	(nil, nil, nil, rc) := <-iostdout.read =>
-		if(rc == nil)
+		if(rc != nil)
-			break;
+			rc <-= (nil, "inappropriate use of file");
-		alt{
+	(nil, nil, nil, rc) := <-iostderr.read =>
-		rc <-= (nil, "inappropriate use of file") =>;
+		if(rc != nil)
-		* =>;
+			rc <-= (nil, "inappropriate use of file");
-		}
+	(nil, data, nil, wc) := <-iostdout.write =>
-	(off, nbytes, fid, rc) := <-iostderr.read =>
-		if(rc == nil)
-			break;
-		alt{
-		rc <-= (nil, "inappropriate use of file") =>;
-		* =>;
-		}
-	(off, data, fid, wc) := <-iostdout.write =>
 		conout(top, data, wc);
-	(off, data, fid, wc) := <-iostderr.write =>
+	(nil, data, nil, wc) := <-iostderr.write =>
 		conout(top, data, wc);
 		if(wc != nil)
 			tkclient->wmctl(top, "untask");

dis/wm/toolbar.dis+0−0

Binary file not shown.

emu/port/devsnarf.c+2−1

 		/* this must be the last reference: no need to lock */
 		if(c->mode == ORDWR || c->mode == OWRITE){
 			if(!waserror()){
-				clipwrite(c->aux);
+				if(c->aux != nil)
+					clipwrite(c->aux);
 				poperror();
 			}
 		}

include/version.h+1−1

@@ -1 +1 @@
1	#define VERSION "Fourth Edition (20100505)"	1	#define VERSION "Fourth Edition (20100715)"

man/1/toolbar+30−0

@@ -5,6 +5,8 @@ toolbar \- window manager toolbar · 4 unmodified lines
5	.B wm/toolbar	5	.B wm/toolbar
6	[	6	[
7	.B -s	7	.B -s
		8	] [
		9	.B -p
8	]	10	]
9	.SH DESCRIPTION	11	.SH DESCRIPTION
10	.I Toolbar	12	.I Toolbar
@@ -55,6 +57,34 @@ The standard · 44 unmodified lines
55	script executes the script	57	script executes the script
56	.BI /usr/ username /lib/wmsetup ,	58	.BI /usr/ username /lib/wmsetup ,
57	enabling each user to have their own window manager configuration.	59	enabling each user to have their own window manager configuration.
		60	.PP
		61	Normally
		62	.I toolbar
		63	packs a menu button referring to the start menu at the left hand side of the tool bar.
		64	The
		65	.B -s
		66	option suppresses that.
		67	.PP
		68	.I Toolbar
		69	serves the shared
		70	.I "snarf buffer"
		71	used by cut and paste in
		72	.IR wm (1)
		73	applications,
		74	except in hosted Inferno where the host's standard clipboard system is used instead,
		75	via
		76	.IR snarf (3).
		77	If
		78	.I toolbar
		79	cannot find
		80	.B /chan/snarf
		81	or the
		82	.B -p
		83	option is given,
		84	.I toolbar
		85	will create its own snarf buffer, private to the set of
		86	applications running under the current instance of
		87	.IR wm (1).
58	.SH FILES	88	.SH FILES
59	.TP	89	.TP
60	.B /lib/wmsetup	90	.B /lib/wmsetup

utils/8a/a.y+7−0

 	}
 |	reg
 |	omem
+|	imm
 rim:
 	rem
 		$$ = nullgen;
 		$$.type = D_INDIR+D_SP;
 	}
+|	con '(' LSREG ')'
+	{
+		$$ = nullgen;
+		$$.type = D_INDIR+$3;
+		$$.offset = $1;
+	}
 |	'(' LLREG '*' con ')'
 	{
 		$$ = nullgen;

utils/8c/list.c+3−3

@@ -70,7 +70,7 @@ Aconv(Fmt *fp) · 69 unmodified lines
70	int	70	int
71	Dconv(Fmt *fp)	71	Dconv(Fmt *fp)
72	{	72	{
73	char str[40], s[20];	73	char str[STRINGSZ], s[STRINGSZ];
74	Adr *a;	74	Adr *a;
75	int i;	75	int i;
76		76
@@ -224,7 +224,7 @@ char* regstr[] = · 147 unmodified lines
224	int	224	int
225	Rconv(Fmt *fp)	225	Rconv(Fmt *fp)
226	{	226	{
227	char str[20];	227	char str[STRINGSZ];
228	int r;	228	int r;
229		229
230	r = va_arg(fp->args, int);	230	r = va_arg(fp->args, int);
@@ -240,7 +240,7 @@ int · 9 unmodified lines
240	Sconv(Fmt *fp)	240	Sconv(Fmt *fp)
241	{	241	{
242	int i, c;	242	int i, c;
243	char str[30], p, a;	243	char str[STRINGSZ], p, a;
244		244
245	a = va_arg(fp->args, char*);	245	a = va_arg(fp->args, char*);
246	p = str;	246	p = str;

utils/8c/peep.c+6−2

 			return 2;
 		goto caseread;
-	case AMOVSL:
 	case AREP:
 	case AREPN:
-		if(v->type == D_CX || v->type == D_DI || v->type == D_SI)
+		if(v->type == D_CX)
+			return 2;
+		goto caseread;
+	case AMOVSL:
+		if(v->type == D_DI || v->type == D_SI)
 			return 2;
 		goto caseread;

utils/8c/reg.c+2−0

 		 */
 		case AFMOVDP:
 		case AFMOVFP:
+		case AFMOVLP:
 		case AFMOVVP:
+		case AFMOVWP:
 		case ACALL:
 			for(z=0; z<BITS; z++)
 				addrs.b[z] |= bit.b[z];

utils/8l/l.h+1−0

@@ -346,3 +346,4 @@ void zerosig(char*); · 345 unmodified lines
346	#pragma varargck type "P" Prog*	346	#pragma varargck type "P" Prog*
347	#pragma varargck type "R" int	347	#pragma varargck type "R" int
348	#pragma varargck type "A" int	348	#pragma varargck type "A" int
		349	#pragma varargck argpos diag 1

utils/8l/span.c+2−0

@@ -334,6 +334,8 @@ oclass(Adr *a) · 333 unmodified lines
334	return Yax;	334	return Yax;
335		335
336	case D_CL:	336	case D_CL:
		337	return Ycl;
		338
337	case D_DL:	339	case D_DL:
338	case D_BL:	340	case D_BL:
339	case D_AH:	341	case D_AH:

utils/NOTICE+3−2

 	Copyright © 1994-1999 Lucent Technologies Inc.  All rights reserved.
 	Portions Copyright © 1995-1997 C H Forsyth (forsyth@terzarima.net)
 	Portions Copyright © 1997-1999 Vita Nuova Limited
-	Portions Copyright © 2000-2007 Vita Nuova Holdings Limited (www.vitanuova.com)
+	Portions Copyright © 2000-2008 Vita Nuova Holdings Limited (www.vitanuova.com)
 	Portions Copyright © 2004,2006 Bruce Ellis
 	Portions Copyright © 2005-2007 C H Forsyth (forsyth@terzarima.net)
-	Revisions Copyright © 2000-2007 Lucent Technologies Inc. and others
+	Revisions Copyright © 2000-2008 Lucent Technologies Inc. and others
+	Portions Copyright © 2009 The Go Authors.  All rights reserved.
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

utils/cc/macbody+40−6

+#define VARMAC 0x80
 long
 getnsn(void)
 	return lookup();
 }
+Sym*
+getsymdots(int *dots)
+{
+	int c;
+	Sym *s;
+	s = getsym();
+	if(s != S)
+		return s;
+	c = getnsc();
+	if(c != '.'){
+		unget(c);
+		return S;
+	}
+	if(getc() != '.' || getc() != '.')
+		yyerror("bad dots in macro");
+	*dots = 1;
+	return slookup("__VA_ARGS__");
+}
 int
 getcom(void)
 {
 {
 	Sym *s, *a;
 	char *args[NARG], *np, *base;
-	int n, i, c, len;
+	int n, i, c, len, dots;
 	int ischr;
 	s = getsym();
 		yyerror("macro redefined: %s", s->name);
 	c = getc();
 	n = -1;
+	dots = 0;
 	if(c == '(') {
 		n++;
 		c = getnsc();
 		if(c != ')') {
 			unget(c);
 			for(;;) {
-				a = getsym();
+				a = getsymdots(&dots);
 				if(a == S)
 					goto bad;
 				if(n >= NARG) {
 				c = getnsc();
 				if(c == ')')
 					break;
-				if(c != ',')
+				if(c != ',' || dots)
 					goto bad;
 			}
 		}
 	} while(len & 3);
 	*base = n+1;
+	if(dots)
+		*base |= VARMAC;
 	s->macro = base;
 	if(debug['m'])
 		print("#define %s %s\n", s->name, s->macro+1);
 {
 	char buf[2000];
 	int n, l, c, nargs;
-	char *arg[NARG], *cp, *ob, *ecp;
+	char *arg[NARG], *cp, *ob, *ecp, dots;
 	ob = b;
-	nargs = *s->macro - 1;
+	if(*s->macro == 0) {
-	if(nargs < 0) {
 		strcpy(b, s->macro+1);
 		if(debug['m'])
 			print("#expand %s %s\n", s->name, ob);
 		return;
 	}
+	nargs = (char)(*s->macro & ~VARMAC) - 1;
+	dots = *s->macro & VARMAC;
 	c = getnsc();
 	if(c != '(')
 		goto bad;
 			}
 			if(l == 0) {
 				if(c == ',') {
+					if(n == nargs && dots) {
+						*cp++ = ',';
+						continue;
+					}
 					*cp++ = 0;
 					arg[n++] = cp;
 					if(n > nargs)
 	cp = s->macro+1;
 	for(;;) {
 		c = *cp++;
+		if(c == '\n')
+			c = ' ';
 		if(c != '#') {
 			*b++ = c;
 			if(c == 0)

utils/kc/cgen.c+2−0

@@ -493,6 +493,8 @@ cgen(Node n, Node nn) · 492 unmodified lines
493	} else	493	} else
494	gopcode(OADD, nodconst(v), Z, &nod);	494	gopcode(OADD, nodconst(v), Z, &nod);
495	gopcode(OAS, &nod, Z, &nod2);	495	gopcode(OAS, &nod, Z, &nod2);
		496	if(nn && l->op == ONAME) /* in x=++i, emit USED(i) */
		497	gins(ANOP, l, Z);
496		498
497	regfree(&nod);	499	regfree(&nod);
498	if(l->addable < INDEXED)	500	if(l->addable < INDEXED)

utils/kl/asm.c+5−0

 			}
 		}
 		break;
+	case 57:	/* op r1,r2 with reserved rs1 */
+		r = 0;
+		o1 = OP_RRR(opcode(p->as), p->from.reg, r, p->to.reg);
+		break;
 	}
 	if(aflag)
 		return o1;