Browse Source

Plan 9 from Bell Labs 2010-12-28

David du Colombier 13 years ago
parent
commit
c5e8e9bda4
3 changed files with 12 additions and 12 deletions
  1. 6 6
      sys/src/9/kw/ether1116.c
  2. 4 4
      sys/src/9/kw/syscall.c
  3. 2 2
      sys/src/9/omap/syscall.c

+ 6 - 6
sys/src/9/kw/ether1116.c

@@ -570,8 +570,8 @@ rxreplenish(Ctlr *ctlr)
 
 		/* and fire */
 		r->cs = RCSdmaown | RCSenableintr;
-		cachedwbse(&r->cs, BY2SE);
-		l2cacheuwbse(&r->cs, BY2SE);
+		cachedwbse(&r->cs, BY2WD);
+		l2cacheuwbse(&r->cs, BY2WD);
 
 		ctlr->rxtail = NEXT(ctlr->rxtail, Nrx);
 	}
@@ -668,8 +668,8 @@ txreplenish(Ether *ether)			/* free transmitted packets */
 
 	ctlr = ether->ctlr;
 	while(ctlr->txtail != ctlr->txhead) {
-		l2cacheuinvse(&ctlr->tx[ctlr->txtail].cs, BY2SE);
-		cachedinvse(&ctlr->tx[ctlr->txtail].cs, BY2SE);
+		l2cacheuinvse(&ctlr->tx[ctlr->txtail].cs, BY2WD);
+		cachedinvse(&ctlr->tx[ctlr->txtail].cs, BY2WD);
 		if(ctlr->tx[ctlr->txtail].cs & TCSdmaown)
 			break;
 		if(ctlr->txb[ctlr->txtail] == nil)
@@ -735,8 +735,8 @@ transmit(Ether *ether)
 		/* and fire */
 		t->cs = TCSpadding | TCSfirst | TCSlast | TCSdmaown |
 			TCSenableintr;
-		cachedwbse(&t->cs, BY2SE);
-		l2cacheuwbse(&t->cs, BY2SE);
+		cachedwbse(&t->cs, BY2WD);
+		l2cacheuwbse(&t->cs, BY2WD);
 
 		kick++;
 		ctlr->txhead = NEXT(ctlr->txhead, Ntx);

+ 4 - 4
sys/src/9/kw/syscall.c

@@ -57,7 +57,7 @@ noted(Ureg* cur, uintptr arg0)
 	switch((int)arg0){
 	case NCONT:
 	case NRSTR:
-		if(!okaddr(nur->pc, BY2SE, 0) || !okaddr(nur->sp, BY2SE, 0)){
+		if(!okaddr(nur->pc, BY2WD, 0) || !okaddr(nur->sp, BY2WD, 0)){
 			qunlock(&up->debug);
 			pprint("suicide: trap in noted\n");
 			pexit("Suicide", 0);
@@ -66,7 +66,7 @@ noted(Ureg* cur, uintptr arg0)
 		qunlock(&up->debug);
 		break;
 	case NSAVE:
-		if(!okaddr(nur->pc, BY2SE, 0) || !okaddr(nur->sp, BY2SE, 0)){
+		if(!okaddr(nur->pc, BY2WD, 0) || !okaddr(nur->sp, BY2WD, 0)){
 			qunlock(&up->debug);
 			pprint("suicide: trap in noted\n");
 			pexit("Suicide", 0);
@@ -217,7 +217,7 @@ syscall(Ureg* ureg)
 		if(sp < (USTKTOP-BY2PG) || sp > (USTKTOP-sizeof(Sargs)-BY2WD))
 			validaddr(sp, sizeof(Sargs)+BY2WD, 0);
 
-		syscallfmt(scallnr, ureg->pc, (va_list)(sp+BY2SE));
+		syscallfmt(scallnr, ureg->pc, (va_list)(sp+BY2WD));
 		up->procctl = Proc_stopme;
 		procctl(up);
 		if (up->syscalltrace) 
@@ -271,7 +271,7 @@ syscall(Ureg* ureg)
 	if(up->procctl == Proc_tracesyscall){
 		stopns = todget(nil);
 		up->procctl = Proc_stopme;
-		sysretfmt(scallnr, (va_list)(sp+BY2SE), ret, startns, stopns);
+		sysretfmt(scallnr, (va_list)(sp+BY2WD), ret, startns, stopns);
 		s = splhi();
 		procctl(up);
 		splx(s);

+ 2 - 2
sys/src/9/omap/syscall.c

@@ -57,7 +57,7 @@ noted(Ureg* cur, uintptr arg0)
 	switch((int)arg0){
 	case NCONT:
 	case NRSTR:
-		if(!okaddr(nur->pc, BY2SE, 0) || !okaddr(nur->sp, BY2SE, 0)){
+		if(!okaddr(nur->pc, BY2WD, 0) || !okaddr(nur->sp, BY2WD, 0)){
 			qunlock(&up->debug);
 			pprint("suicide: trap in noted\n");
 			pexit("Suicide", 0);
@@ -66,7 +66,7 @@ noted(Ureg* cur, uintptr arg0)
 		qunlock(&up->debug);
 		break;
 	case NSAVE:
-		if(!okaddr(nur->pc, BY2SE, 0) || !okaddr(nur->sp, BY2SE, 0)){
+		if(!okaddr(nur->pc, BY2WD, 0) || !okaddr(nur->sp, BY2WD, 0)){
 			qunlock(&up->debug);
 			pprint("suicide: trap in noted\n");
 			pexit("Suicide", 0);