Module Name:    src
Committed By:   msaitoh
Date:           Tue Dec 27 08:40:40 UTC 2022

Modified Files:
        src/sys/arch/amd64/amd64: genassym.cf
        src/sys/arch/i386/i386: genassym.cf

Log Message:
Move some definitions. Add comment. No functional change.


To generate a diff of this commit:
cvs rdiff -u -r1.92 -r1.93 src/sys/arch/amd64/amd64/genassym.cf
cvs rdiff -u -r1.130 -r1.131 src/sys/arch/i386/i386/genassym.cf

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/amd64/amd64/genassym.cf
diff -u src/sys/arch/amd64/amd64/genassym.cf:1.92 src/sys/arch/amd64/amd64/genassym.cf:1.93
--- src/sys/arch/amd64/amd64/genassym.cf:1.92	Mon Dec 26 15:52:37 2022
+++ src/sys/arch/amd64/amd64/genassym.cf	Tue Dec 27 08:40:40 2022
@@ -1,4 +1,4 @@
-#	$NetBSD: genassym.cf,v 1.92 2022/12/26 15:52:37 msaitoh Exp $
+#	$NetBSD: genassym.cf,v 1.93 2022/12/27 08:40:40 msaitoh Exp $
 
 #
 # Copyright (c) 1998, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -165,6 +165,7 @@ define	L_MD_REGS		offsetof(struct lwp, l
 define	L_MD_FLAGS		offsetof(struct lwp, l_md.md_flags)
 define	L_MD_ASTPENDING		offsetof(struct lwp, l_md.md_astpending)
 
+define	LW_SYSTEM		LW_SYSTEM
 define	MDL_IRET		MDL_IRET
 define	MDL_COMPAT32		MDL_COMPAT32
 define	MDL_FPU_IN_CPU		MDL_FPU_IN_CPU
@@ -173,8 +174,6 @@ define	P_FLAG			offsetof(struct proc, p_
 define	P_RASLIST		offsetof(struct proc, p_raslist)
 define	P_MD_SYSCALL		offsetof(struct proc, p_md.md_syscall)
 
-define	LW_SYSTEM		LW_SYSTEM
-
 # pcb fields
 define	PCB_CR3			offsetof(struct pcb, pcb_cr3)
 define	PCB_CR0			offsetof(struct pcb, pcb_cr0)
@@ -349,6 +348,7 @@ define	M_NEXT			offsetof(struct mbuf, m_
 define	IP_SRC			offsetof(struct ip, ip_src)
 define	IP_DST			offsetof(struct ip, ip_dst)
 
+# Locking
 define	MTX_IPL			offsetof(struct kmutex, u.s.mtxs_ipl)
 define	MTX_LOCK		offsetof(struct kmutex, u.s.mtxs_lock)
 define	MTX_OWNER		offsetof(struct kmutex, u.mtxa_owner)

Index: src/sys/arch/i386/i386/genassym.cf
diff -u src/sys/arch/i386/i386/genassym.cf:1.130 src/sys/arch/i386/i386/genassym.cf:1.131
--- src/sys/arch/i386/i386/genassym.cf:1.130	Mon Dec 26 15:52:37 2022
+++ src/sys/arch/i386/i386/genassym.cf	Tue Dec 27 08:40:40 2022
@@ -1,4 +1,4 @@
-#	$NetBSD: genassym.cf,v 1.130 2022/12/26 15:52:37 msaitoh Exp $
+#	$NetBSD: genassym.cf,v 1.131 2022/12/27 08:40:40 msaitoh Exp $
 
 #
 # Copyright (c) 1998, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -154,6 +154,9 @@ define	PTE_BASE		PTE_BASE
 define	PDP_SIZE		PDP_SIZE
 define	PDE_SIZE		sizeof(pd_entry_t)
 
+define	GUFS_SEL		GUFS_SEL
+define	GUGS_SEL		GUGS_SEL
+
 define	IOMAPSIZE		IOMAPSIZE
 
 define	VM_MAXUSER_ADDRESS	(int)VM_MAXUSER_ADDRESS
@@ -171,20 +174,13 @@ define	L_MD_REGS		offsetof(struct lwp, l
 define	L_MD_FLAGS		offsetof(struct lwp, l_md.md_flags)
 define	L_MD_ASTPENDING		offsetof(struct lwp, l_md.md_astpending)
 
+define	LW_SYSTEM		LW_SYSTEM
 define	MDL_FPU_IN_CPU		MDL_FPU_IN_CPU
 
 define	P_FLAG			offsetof(struct proc, p_flag)
 define	P_RASLIST		offsetof(struct proc, p_raslist)
 define	P_MD_SYSCALL		offsetof(struct proc, p_md.md_syscall)
 
-define	LW_SYSTEM		LW_SYSTEM
-
-define	GUFS_SEL		GUFS_SEL
-define	GUGS_SEL		GUGS_SEL
-
-define	IP6_SRC			offsetof(struct ip6_hdr, ip6_src)
-define	IP6_DST			offsetof(struct ip6_hdr, ip6_dst)
-
 # pcb fields
 define	PCB_CR3			offsetof(struct pcb, pcb_cr3)
 define	PCB_CR0			offsetof(struct pcb, pcb_cr0)
@@ -349,7 +345,10 @@ define	M_LEN			offsetof(struct mbuf, m_l
 define	M_NEXT			offsetof(struct mbuf, m_next)
 define	IP_SRC			offsetof(struct ip, ip_src)
 define	IP_DST			offsetof(struct ip, ip_dst)
+define	IP6_SRC			offsetof(struct ip6_hdr, ip6_src)
+define	IP6_DST			offsetof(struct ip6_hdr, ip6_dst)
 
+# Locking
 define	MTX_IPL			offsetof(struct kmutex, u.s.mtxs_ipl)
 define	MTX_LOCK		offsetof(struct kmutex, mtx_lock)
 define	MTX_OWNER		offsetof(struct kmutex, u.mtxa_owner)

Reply via email to