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.

4 files changed, 5 insertions, 57 deletions

diff --git a/sys/src/9/cycv/fns.h b/sys/src/9/cycv/fns.h
index 0e8ef57c0..60c642ee1 100644
--- a/sys/src/9/cycv/fns.h
+++ b/sys/src/9/cycv/fns.h
@@ -30,7 +30,6 @@ void mmuinit(void);
 uintptr ttbget(void);
 void ttbput(uintptr);
 void cycles(uvlong *);
-void kexit(Ureg *);
 ulong getifsr(void);
 ulong getdfsr(void);
 uintptr getifar(void);
diff --git a/sys/src/9/cycv/main.c b/sys/src/9/cycv/main.c
index 20f0d72e2..7b0275189 100644
--- a/sys/src/9/cycv/main.c
+++ b/sys/src/9/cycv/main.c
@@ -43,9 +43,6 @@ procfork(Proc *p)
 {
 	ulong s;
 
-	p->kentry = up->kentry;
-	p->pcycles = -p->kentry;
-	
 	s = splhi();
 	switch(up->fpstate & ~FPillegal){
 	case FPactive:
@@ -63,22 +60,6 @@ procsetup(Proc *p)
 {
 	p->fpstate = FPinit;
 	fpoff();
-	
-	cycles(&p->kentry);
-	p->pcycles = -p->kentry;
-}
-
-void
-kexit(Ureg *)
-{
-	Tos *tos;
-	uvlong t;
-
-	tos = (Tos*)(USTKTOP-sizeof(Tos));
-	cycles(&t);
-	tos->kcycles += t - up->kentry;
-	tos->pcycles = t + up->pcycles;
-	tos->pid = up->pid;
 }
 
 static void
diff --git a/sys/src/9/cycv/timer.c b/sys/src/9/cycv/timer.c
index 68cd20fa6..24f0b54d0 100644
--- a/sys/src/9/cycv/timer.c
+++ b/sys/src/9/cycv/timer.c
@@ -96,6 +96,7 @@ timerinit(void)
 	hz = HPS_CLK * 1000000 * (numer + 1) / ((denum + 1) * 2 * (mpuclk + 1));
 	m->cpumhz = (hz + 500000) / 1000000;
 	m->cpuhz = hz;
+	m->cyclefreq = hz;
 	timerhz = m->cpuhz / 4;
 
 	mpcore[GTIMERCTL] = TIMERDIV - 1 << 8 | 3;
diff --git a/sys/src/9/cycv/trap.c b/sys/src/9/cycv/trap.c
index 52f08ba2d..a47238cc3 100644
--- a/sys/src/9/cycv/trap.c
+++ b/sys/src/9/cycv/trap.c
@@ -150,13 +150,7 @@ trap(Ureg *ureg)
 	int user;
 	ulong opc, cp;
 
-	user = userureg(ureg);
-	if(user){
-		if(up == nil)
-			panic("user trap: up=nil");
-		up->dbgreg = ureg;
-		cycles(&up->kentry);
-	}
+	user = kenter(ureg);
 	switch(ureg->type){
 	case PsrMund:
 		ureg->pc -= 4;
@@ -213,15 +207,12 @@ syscall(Ureg *ureg)
 	ulong scallnr;
 	vlong startns, stopns;
 	
-	if(!userureg(ureg))
+	if(!kenter(ureg))
 		panic("syscall: pc=%#.8lux", ureg->pc);
 	
-	cycles(&up->kentry);
-	
 	m->syscall++;
 	up->insyscall = 1;
 	up->pc = ureg->pc;
-	up->dbgreg = ureg;
 	
 	sp = ureg->sp;
 	up->scallnr = scallnr = ureg->r0;
@@ -511,8 +502,6 @@ dbgpc(Proc *)
 void
 procsave(Proc *p)
 {
-	uvlong t;
-
 	if(p->fpstate == FPactive){
 		if(p->state == Moribund)
 			fpclear();
@@ -520,9 +509,6 @@ procsave(Proc *p)
 			fpsave(p->fpsave);
 		p->fpstate = FPinactive;
 	}
-	cycles(&t);
-	p->kentry -= t;
-	p->pcycles += t;
 
 	l1switch(&m->l1, 0);
 }
@@ -530,32 +516,13 @@ procsave(Proc *p)
 void
 procrestore(Proc *p)
 {
-	uvlong t;
-
-	if(p->kp)
-		return;
-
-	cycles(&t);
-	p->kentry += t;
-	p->pcycles -= t;
-}
-
-static void
-linkproc(void)
-{
-	spllo();
-	up->kpfun(up->kparg);
-	pexit("kproc dying", 0);
 }
 
 void
-kprocchild(Proc* p, void (*func)(void*), void* arg)
+kprocchild(Proc *p, void (*entry)(void))
 {
-	p->sched.pc = (uintptr) linkproc;
+	p->sched.pc = (uintptr) entry;
 	p->sched.sp = (uintptr) p->kstack + KSTACK;
-
-	p->kpfun = func;
-	p->kparg = arg;
 }
 
 void