kernel: simplify notify() adding common popnote() function

Handlin notes is common for all architectures
except how the note has to be pushed on the user
stack.

This change adds a popnote() function that returns
only the note string or nil if the process should
not be notified (no notes or user notes hold off).

Popnote() also handles common errors like notify
during note handling or missing note handler and
will suicide the process in that case.

1 files changed, 4 insertions, 29 deletions

diff --git a/sys/src/9/zynq/trap.c b/sys/src/9/zynq/trap.c
index c245be526..0fc34a573 100644
--- a/sys/src/9/zynq/trap.c
+++ b/sys/src/9/zynq/trap.c
@@ -285,9 +285,8 @@ syscall(Ureg *ureg)
 int
 notify(Ureg *ureg)
 {
-	int l;
 	ulong s, sp;
-	Note *n;
+	char *msg;
 
 	if(up->procctl)
 		procctl();
@@ -302,32 +301,13 @@ notify(Ureg *ureg)
 
 	s = spllo();
 	qlock(&up->debug);
-	up->notepending = 0;
-	n = &up->note[0];
-	if(strncmp(n->msg, "sys:", 4) == 0){
-		l = strlen(n->msg);
-		if(l > ERRMAX-15)	/* " pc=0x12345678\0" */
-			l = ERRMAX-15;
-		sprint(n->msg+l, " pc=0x%.8lux", ureg->pc);
-	}
-
-	if(n->flag!=NUser && (up->notified || up->notify==0)){
-		qunlock(&up->debug);
-		if(n->flag == NDebug)
-			pprint("suicide: %s\n", n->msg);
-		pexit(n->msg, n->flag!=NDebug);
-	}
-
-	if(up->notified){
+	msg = popnote(ureg);
+	if(msg == nil){
 		qunlock(&up->debug);
 		splhi();
 		return 0;
 	}
 
-	if(!up->notify){
-		qunlock(&up->debug);
-		pexit(n->msg, n->flag!=NDebug);
-	}
 	sp = ureg->sp;
 	sp -= 256;	/* debugging: preserve context causing problem */
 	sp -= sizeof(Ureg);
@@ -345,7 +325,7 @@ notify(Ureg *ureg)
 	*(Ureg**)(sp-BY2WD) = up->ureg;	/* word under Ureg is old up->ureg */
 	up->ureg = (void*)sp;
 	sp -= BY2WD+ERRMAX;
-	memmove((char*)sp, up->note[0].msg, ERRMAX);
+	memmove((char*)sp, msg, ERRMAX);
 	sp -= 3*BY2WD;
 	*(ulong*)(sp+2*BY2WD) = sp+3*BY2WD;
 	*(ulong*)(sp+1*BY2WD) = (ulong)up->ureg;
@@ -353,11 +333,6 @@ notify(Ureg *ureg)
 	ureg->sp = sp;
 	ureg->pc = (uintptr) up->notify;
 	ureg->r14 = 0;
-	up->notified = 1;
-	up->nnote--;
-	memmove(&up->lastnote, &up->note[0], sizeof(Note));
-	memmove(&up->note[0], &up->note[1], up->nnote*sizeof(Note));
-
 	qunlock(&up->debug);
 	splx(s);
 	return 1;