kernel: clean up Mach structure

Remove unused fields and factor common fields into a
new PMach struct in port/portdat.h.

The fields machno, splpc and proc are not moved to
PMach as they are part of the known offsets from
assembly (l.s).

1 files changed, 5 insertions, 29 deletions

diff --git a/sys/src/9/kw/dat.h b/sys/src/9/kw/dat.h
index 6e149837b..bf1dcdaff 100644
--- a/sys/src/9/kw/dat.h
+++ b/sys/src/9/kw/dat.h
@@ -130,43 +130,19 @@ struct Mach
 {
 	int	machno;			/* physical id of processor */
 	uintptr	splpc;			/* pc of last caller to splhi */
-
 	Proc*	proc;			/* current process */
-
 	MMMU;
-	int	flushmmu;		/* flush current proc mmu state */
+	/* end of offsets known to asm */
 
-	ulong	ticks;			/* of the clock since boot time */
-	Label	sched;			/* scheduler wakeup */
-	Lock	alarmlock;		/* access to alarm list */
-	void*	alarm;			/* alarms bound to this clock */
-	int	inclockintr;
+	PMach;
 
-	Proc*	readied;		/* for runproc */
-	ulong	schedticks;		/* next forced context switch */
+	vlong	fastclock;		/* last sampled value */
+	int	inclockintr;
 
 	int	cputype;
 	int	socrev;			/* system-on-chip revision */
 	ulong	delayloop;
-
-	/* stats */
-	int	tlbfault;
-	int	tlbpurge;
-	int	pfault;
-	int	cs;
-	int	syscall;
-	int	load;
-	int	intr;
-	vlong	fastclock;		/* last sampled value */
-	uvlong	inidle;			/* time spent in idlehands() */
-	ulong	spuriousintr;
-	int	lastintr;
-	int	ilockdepth;
-	Perf	perf;			/* performance counters */
-
-//	int	cpumhz;
 	uvlong	cpuhz;			/* speed of cpu */
-	uvlong	cyclefreq;		/* Frequency of user readable cycle counter */
 
 	/* save areas for exceptions */
 	u32int	sfiq[5];
@@ -178,7 +154,7 @@ struct Mach
 #define abtstack sabt
 #define undstack sund
 
-	int	stack[1];
+	uintptr	stack[1];
 };
 
 /*