kernel: handle tos and per process pcycle counters in port/

we might as well handle the per process cycle
counter in the portable part instead of duplicating the code
in every arch and have inconsistent implementations.

we now have a portable kenter() and kexit() function,
that is ment to be used in trap/syscall from user,
which updates the counters.

some kernels missed initializing Mach.cyclefreq.

3 files changed, 13 insertions, 60 deletions

diff --git a/sys/src/9/sgi/clock.c b/sys/src/9/sgi/clock.c
index c7a0da440..cb63dd959 100644
--- a/sys/src/9/sgi/clock.c
+++ b/sys/src/9/sgi/clock.c
@@ -80,7 +80,7 @@ clockinit(void)
 
 	m->speed = mips;
 	m->hz = m->speed*Mhz;
-
+	m->cyclefreq = Basetickfreq;
 	m->maxperiod = Basetickfreq / HZ;
 	m->minperiod = Basetickfreq / (100*HZ);
 	m->lastcount = rdcount();
diff --git a/sys/src/9/sgi/main.c b/sys/src/9/sgi/main.c
index c86f8801b..3ccdd505c 100644
--- a/sys/src/9/sgi/main.c
+++ b/sys/src/9/sgi/main.c
@@ -289,9 +289,6 @@ procsetup(Proc *p)
 {
 	p->fpstate = FPinit;
 	memmove(p->fpsave, &initfp, sizeof(FPsave));
-
-	cycles(&p->kentry);
-	p->pcycles = -p->kentry;
 }
 
 void
@@ -299,9 +296,6 @@ procfork(Proc *p)
 {
 	int s;
 
-	p->kentry = up->kentry;
-	p->pcycles = -p->kentry;
-
 	s = splhi();
 	switch(up->fpstate & ~FPillegal){
 	case FPactive:
@@ -318,28 +312,17 @@ procfork(Proc *p)
 void
 procsave(Proc *p)
 {
-	uvlong t;
-
 	if(p->fpstate == FPactive){
 		if(p->state != Moribund) {
 			savefpregs(p->fpsave);
 			p->fpstate = FPinactive;
 		}
 	}
-	
-	cycles(&t);
-	p->pcycles += t;
 }
 
 void
 procrestore(Proc *p)
 {
-	uvlong t;
-
-	if(p->kp)
-		return;
-	cycles(&t);
-	p->pcycles -= t;
 }
 
 void
diff --git a/sys/src/9/sgi/trap.c b/sys/src/9/sgi/trap.c
index 08b3960df..2bea55c34 100644
--- a/sys/src/9/sgi/trap.c
+++ b/sys/src/9/sgi/trap.c
@@ -152,23 +152,6 @@ kvce(Ureg *ur, int ecode)
 	}
 }
 
-/* prepare to go to user space */
-void
-kexit(Ureg *ur)
-{
-	Tos *tos;
-
-	/* replicate fpstate to ureg status */
-	if(up->fpstate != FPactive)
-		ur->status &= ~CU1;
-
-	/* precise time accounting, kernel exit */
-	tos = (Tos*)(USTKTOP-sizeof(Tos));
-	tos->kcycles += fastticks(&tos->cyclefreq) - up->kentry;
-	tos->pcycles = up->pcycles;
-	tos->pid = up->pid;
-}
-
 void
 trap(Ureg *ur)
 {
@@ -190,18 +173,11 @@ trap(Ureg *ur)
 		dumpstack();
 		for(;;);
 	}
-
-	ecode = (ur->cause>>2)&EXCMASK;
-	user = userureg(ur);
+	user = kenter(ur);
 	if (ur->cause & TS)
 		panic("trap: tlb shutdown");
-
+	ecode = (ur->cause>>2)&EXCMASK;
 	fpchk = 0;
-	if(user){
-		up->dbgreg = ur;
-		cycles(&up->kentry);
-	}
-
 	clockintr = 0;
 	switch(ecode){
 	case CINT:
@@ -308,6 +284,9 @@ trap(Ureg *ur)
 
 	if(user){
 		notify(ur);
+		/* replicate fpstate to ureg status */
+		if(up->fpstate != FPactive)
+			ur->status &= ~CU1;
 		kexit(ur);
 	}
 }
@@ -701,12 +680,12 @@ syscall(Ureg *ur)
 	vlong startns;
 	char *e;
 
-	cycles(&up->kentry);
+	if(!kenter(ur))
+		panic("syscall from kernel");
 
 	m->syscall++;
 	up->insyscall = 1;
 	up->pc = ur->pc;
-	up->dbgreg = ur;
 	ur->cause = 16<<2;	/* for debugging: system call is undef 16 */
 
 	scallnr = ur->r1;
@@ -774,6 +753,9 @@ syscall(Ureg *ur)
 	/* if we delayed sched because we held a lock, sched now */
 	if(up->delaysched)
 		sched();
+	/* replicate fpstate to ureg status */
+	if(up->fpstate != FPactive)
+		ur->status &= ~CU1;
 	kexit(ur);
 }
 
@@ -794,23 +776,11 @@ forkchild(Proc *p, Ureg *ur)
 	cur->pc += 4;
 }
 
-static
 void
-linkproc(void)
+kprocchild(Proc *p, void (*entry)(void))
 {
-	spllo();
-	up->kpfun(up->kparg);
-	pexit("kproc exiting", 0);
-}
-
-void
-kprocchild(Proc *p, void (*func)(void*), void *arg)
-{
-	p->sched.pc = (ulong)linkproc;
+	p->sched.pc = (ulong)entry;
 	p->sched.sp = (ulong)p->kstack+KSTACK;
-
-	p->kpfun = func;
-	p->kparg = arg;
 }
 
 /* set up user registers before return from exec() */