From c0d4498ab8a4e564156f49e5b6633a6335b91fc4 Mon Sep 17 00:00:00 2001
From: cinap_lenrek <cinap_lenrek@felloff.net>
Date: Sun, 25 Apr 2021 17:41:34 +0200
Subject: 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).
---
 sys/src/9/ppc/dat.h | 42 +++++++++---------------------------------
 1 file changed, 9 insertions(+), 33 deletions(-)

(limited to 'sys/src/9/ppc')

diff --git a/sys/src/9/ppc/dat.h b/sys/src/9/ppc/dat.h
index 954ca1f89..925d35af7 100644
--- a/sys/src/9/ppc/dat.h
+++ b/sys/src/9/ppc/dat.h
@@ -137,55 +137,31 @@ struct Mach
 /*0x14*/	ulong	dmiss;	/* number of data misses */
 
 	/* ordering from here on irrelevant */
+	PMach;
 
 	Imap*	imap;
 
-	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;
+	uintptr	ptabbase;	/* start of page table in kernel virtual space */
+	int	slotgen;	/* next pte (byte offset) when pteg is full */
+	int	mmupid;		/* next mmu pid to use */
+	int	sweepcolor;
+	int	trigcolor;
+	Rendez	sweepr;
+
 	int	cputype;
 	ulong	loopconst;
-	Perf	perf;		/* performance counters */
-
-	Proc*	readied;	/* for runproc */
-	ulong	schedticks;	/* next forced context switch */
 
 	ulong	clkin;		/* basic clock frequency */
 	ulong	vco_out;
 	vlong	cpuhz;
-	uvlong	cyclefreq;	/* Frequency of user readable cycle counter */
 	ulong	bushz;
 	ulong	dechz;
 	ulong	tbhz;
 	ulong	cpmhz;		/* communications processor module frequency */
 	ulong	brghz;		/* baud rate generator frequency */
 
-	ulong	pcclast;
-	uvlong	fastclock;
-
-	int	tlbpurge;	/* # of tlb purges */
-	int	pfault;		/* # of page faults */
-	int	cs;
-	int	syscall;
-	int	load;
-	int	intr;
-	int	flushmmu;	/* make current proc flush it's mmu state */
-	int	ilockdepth;
-
-	ulong	ptabbase;	/* start of page table in kernel virtual space */
-	int	slotgen;	/* next pte (byte offset) when pteg is full */
-	int	mmupid;		/* next mmu pid to use */
-	int	sweepcolor;
-	int	trigcolor;
-	Rendez	sweepr;
-
-	ulong	spuriousintr;
-	int	lastintr;
-
 	/* MUST BE LAST */
-	int	stack[1];
+	uintptr	stack[1];
 };
 
 struct
-- 
cgit v1.2.3