From 6740a5b157e6b6898d28e8a8b92ec705d40a66c0 Mon Sep 17 00:00:00 2001
From: miod <miod@openbsd.org>
Date: Fri, 29 Mar 2024 21:14:56 +0000
Subject: [PATCH] Get rid of unnecessary defines in assym.h.

ok claudio@ kettenis@
---
 sys/arch/sparc64/sparc64/genassym.cf | 75 +---------------------------
 1 file changed, 1 insertion(+), 74 deletions(-)

diff --git a/sys/arch/sparc64/sparc64/genassym.cf b/sys/arch/sparc64/sparc64/genassym.cf
index 4432b9528c0..9ac36443741 100644
--- a/sys/arch/sparc64/sparc64/genassym.cf
+++ b/sys/arch/sparc64/sparc64/genassym.cf
@@ -1,4 +1,4 @@
-#	$OpenBSD: genassym.cf,v 1.42 2024/03/29 21:14:31 miod Exp $
+#	$OpenBSD: genassym.cf,v 1.43 2024/03/29 21:14:56 miod Exp $
 #	$NetBSD: genassym.cf,v 1.23 2001/08/08 00:09:30 eeh Exp $
 
 #
@@ -72,35 +72,17 @@ include <sys/param.h>
 include <sys/buf.h>
 include <sys/proc.h>
 include <sys/mbuf.h>
-include <sys/msgbuf.h>
 include <sys/syscall.h>
 include <sys/user.h>
-include <sys/device.h>
-include <sys/disklabel.h>
-include <sys/disk.h>
 
 include <uvm/uvm_extern.h>
 
-ifdef DDB
-include <machine/db_machdep.h>
-endif
 include <machine/pmap.h>
 include <machine/cpu.h>
-include <machine/mutex.h>
 
 include <machine/fsr.h>
 include <machine/reg.h>
 
-ifdef notyet
-include <sparc64/dev/zsreg.h>
-include <sparc64/dev/zsvar.h>
-endif
-
-ifdef notyet
-include <dev/ic/am7930reg.h>
-include <dev/ic/am7930var.h>
-endif
-
 # proc fields and values
 struct	proc
 member	p_addr
@@ -121,7 +103,6 @@ define	VM_PMAP		offsetof(struct vmspace, vm_map.pmap)
 # pmap structure fields
 struct	pmap
 member	pm_ctx
-member	pm_segs
 member	PM_PHYS		pm_physaddr
 
 # interrupt/fault metering
@@ -135,11 +116,7 @@ struct	cpu_info
 member	ci_self
 member	ci_curproc
 member	ci_cpcb
-member	ci_next
 member	ci_fpproc
-member	ci_cpuid
-member	ci_upaid
-member	ci_want_resched
 member	ci_handled_intr_level
 member	ci_intrpending
 member	ci_tickintr
@@ -153,9 +130,6 @@ member	ci_mmfsa
 member	ci_cpumq
 member	ci_devmq
 endif
-ifdef DIAGNOSTIC
-member	ci_mutex_level
-endif
 
 # FPU state
 struct	fpstate
@@ -168,8 +142,6 @@ export	FPRS_DL
 
 # system calls
 export	SYS_sigreturn
-export	SYS_execve
-export	SYS_exit
 
 # errno
 export	EFAULT
@@ -187,8 +159,6 @@ member	pcb_rwsp
 member	pcb_sp
 member	pcb_wcookie
 member	pcb_pc
-member	PCB_LASTCALL	lastcall
-define	PCB_SIZE	sizeof(struct pcb)
 
 # trapframe fields
 struct	trapframe
@@ -202,9 +172,6 @@ member	tf_pil
 member	tf_oldpil
 member	tf_tt
 member	tf_global
-member	tf_out
-member	tf_local
-member	tf_in
 # shortened versions
 member	TF_G		tf_global
 member	TF_O		tf_out
@@ -212,25 +179,10 @@ member	TF_L		tf_local
 member	TF_I		tf_in
 define	TF_SIZE		sizeof(struct trapframe)
 
-ifdef notyet
-# clockframe fields 
-struct	clockframe	CF_
-member	tstate
-member	pc
-member	npc
-member	pil
-member	oldpil
-member	fp
-endif
-
 # interrupt handler fields
 struct	intrhand
-member	ih_fun
-member	ih_arg
-member	ih_number
 member	ih_pil
 member	IH_PEND		ih_pending
-member	ih_next
 member	ih_ack
 member	IH_COUNT	ih_count.ec_count
 
@@ -240,26 +192,6 @@ member	m_next
 member	m_data
 member	m_len
 
-ifdef notyet
-# db_regs structure so we can save all registers
-struct	db_regs
-member	dbr_traps
-member	dbr_y
-member	dbr_tl
-member	dbr_canrestore
-member	dbr_cansave
-member	dbr_cleanwin
-member	dbr_cwp
-member	dbr_wstate
-member	dbr_g
-member	dbr_ag
-member	dbr_ig
-member	dbr_mg
-member	dbr_out
-member	dbr_local
-member	dbr_in
-endif
-
 export	TSB_TAG_LOCKED
 
 export	SUN4U_TLB_ACCESS
@@ -275,10 +207,5 @@ export	SUN4V_TLB_REAL_W
 export	SUN4V_TLB_EXEC
 export	SUN4V_TLB_W
 
-struct	mutex
-member	mtx_wantipl
-member	mtx_oldipl
-member	mtx_owner
-
 export	CPU_SUN4U
 export	CPU_SUN4V
-- 
2.20.1