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, 9 insertions, 23 deletions

diff --git a/sys/src/9/sgi/dat.h b/sys/src/9/sgi/dat.h
index 126eb3793..cd84b7a8e 100644
--- a/sys/src/9/sgi/dat.h
+++ b/sys/src/9/sgi/dat.h
@@ -144,48 +144,34 @@ struct Mach
 	int	machno;			/* physical id of processor */
 	Softtlb*stb;
 	Proc*	proc;			/* process on this processor */
-	ulong	splpc;			/* pc that called splhi() */
+	uintptr	splpc;			/* pc that called splhi() */
 	ulong	tlbfault;
 
 	/* the following is safe to move */
-	ulong	tlbpurge;
-	ulong	ticks;			/* of the clock since boot time */
-	Label	sched;			/* scheduler wakeup */
-	void*	alarm;			/* alarms bound to this clock */
+	PMach;
+
 	int	lastpid;		/* last pid allocated on this machine */
 	Proc*	pidproc[NTLBPID];	/* proc that owns tlbpid on this mach */
+
 	KMap*	kactive;		/* active on this machine */
 	int	knext;
 	uchar	ktlbx[NTLB];		/* tlb index used for kmap */
 	uchar	ktlbnext;
-	int	speed;			/* cpu speed */
-	ulong	delayloop;		/* for the delay() routine */
-	ulong	fairness;		/* for runproc */
-	int	flushmmu;
-	int	inclockintr;
-	int	ilockdepth;
-	Perf	perf;			/* performance counters */
-	uvlong	cyclefreq;		/* Frequency of user readable cycle counter */
 
 	/* for per-processor timers */
-	ulong	lastcount;
 	uvlong	fastticks;
+	ulong	lastcount;
+
 	ulong	hz;
+	int	speed;			/* cpu speed */
+	ulong	delayloop;		/* for the delay() routine */
 	ulong	maxperiod;
 	ulong	minperiod;
 
-	Proc*	readied;		/* for runproc */
-	ulong	schedticks;		/* next forced context switch */
-
-	int	pfault;
-	int	cs;
-	int	syscall;
-	int	load;
-	int	intr;
 	int	hashcoll;		/* soft-tlb hash collisions */
 	int	paststartup;		/* for putktlb */
 
-	int	stack[1];
+	uintptr	stack[1];
 };
 
 struct KMap