Module Name: src
Committed By: msaitoh
Date: Mon Dec 26 09:39:30 UTC 2022
Modified Files:
src/sys/arch/amd64/amd64: genassym.cf
src/sys/arch/i386/i386: genassym.cf
Log Message:
Sort lines. Add comment. No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.90 -r1.91 src/sys/arch/amd64/amd64/genassym.cf
cvs rdiff -u -r1.128 -r1.129 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.90 src/sys/arch/amd64/amd64/genassym.cf:1.91
--- src/sys/arch/amd64/amd64/genassym.cf:1.90 Mon Dec 26 09:12:42 2022
+++ src/sys/arch/amd64/amd64/genassym.cf Mon Dec 26 09:39:30 2022
@@ -1,4 +1,4 @@
-# $NetBSD: genassym.cf,v 1.90 2022/12/26 09:12:42 msaitoh Exp $
+# $NetBSD: genassym.cf,v 1.91 2022/12/26 09:39:30 msaitoh Exp $
#
# Copyright (c) 1998, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -127,13 +127,13 @@ endif
include <sys/bus.h>
+# general constants
define PAGE_SIZE PAGE_SIZE
define UPAGES UPAGES
define USPACE USPACE
define PGOFSET PGOFSET
define PGSHIFT PGSHIFT
-
define KERNBASE_LO KERNBASE_LO
define KERNBASE_HI KERNBASE_HI
define KERNBASE KERNBASE
@@ -151,6 +151,7 @@ define PDE_SIZE sizeof(pd_entry_t)
define VM_MAXUSER_ADDRESS (unsigned long long)VM_MAXUSER_ADDRESS
+# lwp & proc fields and values
define L_PCB offsetof(struct lwp, l_addr)
define L_CPU offsetof(struct lwp, l_cpu)
define L_FLAG offsetof(struct lwp, l_flag)
@@ -173,13 +174,7 @@ define P_MD_SYSCALL offsetof(struct pro
define LW_SYSTEM LW_SYSTEM
-define M_DATA offsetof(struct mbuf, m_data)
-define M_LEN offsetof(struct mbuf, m_len)
-define M_NEXT offsetof(struct mbuf, m_next)
-
-define IP_SRC offsetof(struct ip, ip_src)
-define IP_DST offsetof(struct ip, ip_dst)
-
+# pcb fields
define PCB_CR3 offsetof(struct pcb, pcb_cr3)
define PCB_CR0 offsetof(struct pcb, pcb_cr0)
define PCB_ONFAULT offsetof(struct pcb, pcb_onfault)
@@ -236,6 +231,7 @@ endif
define TSS_RSP0 offsetof(struct cpu_tss, tss.tss_rsp0)
+# CPU info structure
define CPU_INFO_SCRATCH offsetof(struct cpu_info, ci_scratch)
define CPU_INFO_SELF offsetof(struct cpu_info, ci_self)
define CPU_INFO_RESCHED offsetof(struct cpu_info, ci_want_resched)
@@ -302,6 +298,7 @@ define IOAPIC_SC_DATA offsetof(struct
define PIC_LOCK offsetof(struct pic, pic_lock)
endif
+# interrupt handler fields
define IH_FUN offsetof(struct intrhand, ih_fun)
define IH_ARG offsetof(struct intrhand, ih_arg)
define IH_LEVEL offsetof(struct intrhand, ih_level)
@@ -344,6 +341,13 @@ define IREENT_MAGIC IREENT_MAGIC
define PSL_MBO PSL_MBO
+# Constants required for in_cksum() and friends.
+define M_DATA offsetof(struct mbuf, m_data)
+define M_LEN offsetof(struct mbuf, m_len)
+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 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.128 src/sys/arch/i386/i386/genassym.cf:1.129
--- src/sys/arch/i386/i386/genassym.cf:1.128 Mon Dec 26 09:12:42 2022
+++ src/sys/arch/i386/i386/genassym.cf Mon Dec 26 09:39:29 2022
@@ -1,4 +1,4 @@
-# $NetBSD: genassym.cf,v 1.128 2022/12/26 09:12:42 msaitoh Exp $
+# $NetBSD: genassym.cf,v 1.129 2022/12/26 09:39:29 msaitoh Exp $
#
# Copyright (c) 1998, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -132,6 +132,7 @@ endif
include <sys/bus.h>
+# general constants
define PAGE_SIZE PAGE_SIZE
define UPAGES UPAGES
define USPACE USPACE
@@ -159,6 +160,7 @@ define IOMAPSIZE IOMAPSIZE
define VM_MAXUSER_ADDRESS (int)VM_MAXUSER_ADDRESS
+# lwp & proc fields and values
define L_PCB offsetof(struct lwp, l_addr)
define L_CPU offsetof(struct lwp, l_cpu)
define L_FLAG offsetof(struct lwp, l_flag)
@@ -182,16 +184,10 @@ define LW_SYSTEM LW_SYSTEM
define GUFS_SEL GUFS_SEL
define GUGS_SEL GUGS_SEL
-define M_DATA offsetof(struct mbuf, m_data)
-define M_LEN offsetof(struct mbuf, m_len)
-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)
+# pcb fields
define PCB_CR3 offsetof(struct pcb, pcb_cr3)
define PCB_CR0 offsetof(struct pcb, pcb_cr0)
define PCB_ONFAULT offsetof(struct pcb, pcb_onfault)
@@ -242,6 +238,7 @@ define TSS_ESP0 offsetof(struct cpu_tss
define TSS_IOBASE offsetof(struct cpu_tss, tss.tss_iobase)
define TSS_IOMAP offsetof(struct cpu_tss, iomap)
+# CPU info structure
define CPU_INFO_SELF offsetof(struct cpu_info, ci_self)
define CPU_INFO_RESCHED offsetof(struct cpu_info, ci_want_resched)
define CPU_INFO_WANT_PMAPLOAD offsetof(struct cpu_info, ci_want_pmapload)
@@ -298,6 +295,7 @@ define IOAPIC_SC_DATA offsetof(struct
define PIC_LOCK offsetof(struct pic, pic_lock)
endif
+# interrupt handler fields
define IH_FUN offsetof(struct intrhand, ih_fun)
define IH_ARG offsetof(struct intrhand, ih_arg)
define IH_LEVEL offsetof(struct intrhand, ih_level)
@@ -347,6 +345,13 @@ define PSL_MBO PSL_MBO
define PSL_ID PSL_ID
define PSL_I PSL_I
+# Constants required for in_cksum() and friends.
+define M_DATA offsetof(struct mbuf, m_data)
+define M_LEN offsetof(struct mbuf, m_len)
+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 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)
