[src/trunk]: src/sys/arch Reduce diff between i386/i386/genassym.cf and amd64...

[msaitoh <msaitoh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/33aaa2aefcae
branches:  trunk
changeset: 372786:33aaa2aefcae
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Mon Dec 26 09:12:42 2022 +0000

description:
Reduce diff between i386/i386/genassym.cf and amd64/amd64/genassym.cf. NFCI.

 - Whitespace fix.
 - Sort lines.

diffstat:

 sys/arch/amd64/amd64/genassym.cf |  43 +++++++++++------------
 sys/arch/i386/i386/genassym.cf   |  72 ++++++++++++++++++++--------------------
 2 files changed, 57 insertions(+), 58 deletions(-)

diffs (298 lines):

diff -r 6dcea9d18da8 -r 33aaa2aefcae sys/arch/amd64/amd64/genassym.cf
--- a/sys/arch/amd64/amd64/genassym.cf  Mon Dec 26 08:59:01 2022 +0000
+++ b/sys/arch/amd64/amd64/genassym.cf  Mon Dec 26 09:12:42 2022 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: genassym.cf,v 1.89 2022/09/07 00:40:18 knakahara Exp $
+#      $NetBSD: genassym.cf,v 1.90 2022/12/26 09:12:42 msaitoh Exp $
 
 #
 # Copyright (c) 1998, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -127,8 +127,12 @@
 
 include <sys/bus.h>
 
+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
@@ -148,19 +152,17 @@
 define VM_MAXUSER_ADDRESS      (unsigned long long)VM_MAXUSER_ADDRESS
 
 define L_PCB                   offsetof(struct lwp, l_addr)
+define L_CPU                   offsetof(struct lwp, l_cpu)
 define L_FLAG                  offsetof(struct lwp, l_flag)
 define L_PROC                  offsetof(struct lwp, l_proc)
 define L_NCSW                  offsetof(struct lwp, l_ncsw)
 define L_NOPREEMPT             offsetof(struct lwp, l_nopreempt)
 define L_DOPREEMPT             offsetof(struct lwp, l_dopreempt)
-define L_CPU                   offsetof(struct lwp, l_cpu)
 define L_KPRIORITY             offsetof(struct lwp, l_kpriority)
 define L_MD_REGS               offsetof(struct lwp, l_md.md_regs)
 define L_MD_FLAGS              offsetof(struct lwp, l_md.md_flags)
 define L_MD_ASTPENDING         offsetof(struct lwp, l_md.md_astpending)
 
-define PAGE_SIZE               PAGE_SIZE
-
 define MDL_IRET                MDL_IRET
 define MDL_COMPAT32            MDL_COMPAT32
 define MDL_FPU_IN_CPU          MDL_FPU_IN_CPU
@@ -179,11 +181,11 @@
 define IP_DST                  offsetof(struct ip, ip_dst)
 
 define PCB_CR3                 offsetof(struct pcb, pcb_cr3)
+define PCB_CR0                 offsetof(struct pcb, pcb_cr0)
+define PCB_ONFAULT             offsetof(struct pcb, pcb_onfault)
 define PCB_RBP                 offsetof(struct pcb, pcb_rbp)
 define PCB_RSP                 offsetof(struct pcb, pcb_rsp)
 define PCB_RSP0                offsetof(struct pcb, pcb_rsp0)
-define PCB_CR0                 offsetof(struct pcb, pcb_cr0)
-define PCB_ONFAULT             offsetof(struct pcb, pcb_onfault)
 define PCB_FLAGS               offsetof(struct pcb, pcb_flags)
 define PCB_COMPAT32            PCB_COMPAT32
 define PCB_FS                  offsetof(struct pcb, pcb_fs)
@@ -222,6 +224,16 @@
 # Total size includes registers pushed by hardware
 define FRAMESIZE               sizeof(struct trapframe)
 
+ifdef COMPAT_LINUX32
+define  LINUX32_SF_HANDLER     offsetof(struct linux32_sigframe, sf_handler)
+define  LINUX32_SF_SC          offsetof(struct linux32_sigframe, sf_sc)
+define  LINUX32_RT_SF_HANDLER  offsetof(struct linux32_rt_sigframe, sf_handler)
+define  LINUX32_RT_SF_UC       offsetof(struct linux32_rt_sigframe, sf_uc)
+define  LINUX32_SYS_rt_sigreturn       LINUX32_SYS_rt_sigreturn
+define  LINUX32_SYS_sigreturn          LINUX32_SYS_sigreturn
+define  LINUX32_SYS_exit               LINUX32_SYS_exit
+endif
+
 define TSS_RSP0                offsetof(struct cpu_tss, tss.tss_rsp0)
 
 define CPU_INFO_SCRATCH        offsetof(struct cpu_info, ci_scratch)
@@ -244,6 +256,7 @@
 define CPU_INFO_NSYSCALL       offsetof(struct cpu_info, ci_data.cpu_nsyscall)
 define CPU_INFO_NTRAP          offsetof(struct cpu_info, ci_data.cpu_ntrap)
 define CPU_INFO_NINTR          offsetof(struct cpu_info, ci_data.cpu_nintr)
+define CPU_INFO_CC_SKEW        offsetof(struct cpu_info, ci_data.cpu_cc_skew)
 define CPU_INFO_CURPRIORITY    offsetof(struct cpu_info, ci_schedstate.spc_curpriority)
 
 define CPU_INFO_GDT            offsetof(struct cpu_info, ci_gdt)
@@ -258,7 +271,6 @@
 define CPU_INFO_MTX_OLDSPL     offsetof(struct cpu_info, ci_mtx_oldspl)
 define  CPU_INFO_CPUID         offsetof(struct cpu_info, ci_cpuid)
 define CPU_INFO_ISTATE         offsetof(struct cpu_info, ci_istate)
-define CPU_INFO_CC_SKEW        offsetof(struct cpu_info, ci_data.cpu_cc_skew)
 
 define ACPI_SUSPEND_GDT        offsetof(struct cpu_info, ci_suspend_gdt)
 define ACPI_SUSPEND_IDT        offsetof(struct cpu_info, ci_suspend_idt)
@@ -292,7 +304,7 @@
 
 define IH_FUN                  offsetof(struct intrhand, ih_fun)
 define IH_ARG                  offsetof(struct intrhand, ih_arg)
-define  IH_LEVEL               offsetof(struct intrhand, ih_level)
+define IH_LEVEL                offsetof(struct intrhand, ih_level)
 define IH_NEXT                 offsetof(struct intrhand, ih_next)
 
 ifdef COMPAT_NETBSD32
@@ -300,16 +312,6 @@
 define SC_GS32                 offsetof(struct netbsd32_sigcontext, sc_gs)
 endif
 
-ifdef COMPAT_LINUX32
-define  LINUX32_SF_HANDLER     offsetof(struct linux32_sigframe, sf_handler)
-define  LINUX32_SF_SC          offsetof(struct linux32_sigframe, sf_sc)
-define  LINUX32_RT_SF_HANDLER  offsetof(struct linux32_rt_sigframe, sf_handler)
-define  LINUX32_RT_SF_UC       offsetof(struct linux32_rt_sigframe, sf_uc)
-define  LINUX32_SYS_rt_sigreturn       LINUX32_SYS_rt_sigreturn
-define  LINUX32_SYS_sigreturn          LINUX32_SYS_sigreturn
-define  LINUX32_SYS_exit               LINUX32_SYS_exit
-endif
-
 define IS_RECURSE      offsetof(struct intrsource, is_recurse)
 define IS_RESUME       offsetof(struct intrsource, is_resume)
 define IS_EVCNT        offsetof(struct intrsource, is_evcnt.ev_count)
@@ -336,7 +338,7 @@
 
 define SIR_NET                 SIR_NET
 define SIR_CLOCK               SIR_CLOCK
-define SIR_SERIAL              SIR_SERIAL      
+define SIR_SERIAL              SIR_SERIAL
 
 define IREENT_MAGIC            IREENT_MAGIC
 
@@ -386,9 +388,6 @@
 define NKL3_KIMG_ENTRIES       NKL3_KIMG_ENTRIES
 define NKL2_KIMG_ENTRIES       NKL2_KIMG_ENTRIES
 
-define PGOFSET                 PGOFSET
-define PGSHIFT                 PGSHIFT
-
 define VM_SPACE_SEP_HIGH32     (0xFFFF800000000000 >> 32)
 
 define SEL_RPL_MASK            SEL_RPL
diff -r 6dcea9d18da8 -r 33aaa2aefcae sys/arch/i386/i386/genassym.cf
--- a/sys/arch/i386/i386/genassym.cf    Mon Dec 26 08:59:01 2022 +0000
+++ b/sys/arch/i386/i386/genassym.cf    Mon Dec 26 09:12:42 2022 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: genassym.cf,v 1.127 2022/12/26 08:59:01 msaitoh Exp $
+#      $NetBSD: genassym.cf,v 1.128 2022/12/26 09:12:42 msaitoh Exp $
 
 #
 # Copyright (c) 1998, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
 include "opt_compat_freebsd.h"
 include "opt_compat_linux.h"
 include "opt_compat_netbsd.h"
-include        "opt_xen.h"
+include "opt_xen.h"
 endif
 
 quote #define __MUTEX_PRIVATE
@@ -133,9 +133,11 @@
 include <sys/bus.h>
 
 define PAGE_SIZE               PAGE_SIZE
-
 define UPAGES                  UPAGES
 define USPACE                  USPACE
+define PGOFSET                 PGOFSET
+define PGSHIFT                 PGSHIFT
+
 define KSTACK_SIZE             KSTACK_SIZE
 define KERNBASE                KERNBASE
 define KERNTEXTOFF             KERNTEXTOFF
@@ -158,22 +160,23 @@
 define VM_MAXUSER_ADDRESS      (int)VM_MAXUSER_ADDRESS
 
 define L_PCB                   offsetof(struct lwp, l_addr)
+define L_CPU                   offsetof(struct lwp, l_cpu)
 define L_FLAG                  offsetof(struct lwp, l_flag)
 define L_PROC                  offsetof(struct lwp, l_proc)
-define L_MD_REGS               offsetof(struct lwp, l_md.md_regs)
-define L_MD_FLAGS              offsetof(struct lwp, l_md.md_flags)
-define L_MD_ASTPENDING         offsetof(struct lwp, l_md.md_astpending)
-define L_CPU                   offsetof(struct lwp, l_cpu)
 define L_NCSW                  offsetof(struct lwp, l_ncsw)
 define L_NOPREEMPT             offsetof(struct lwp, l_nopreempt)
 define L_DOPREEMPT             offsetof(struct lwp, l_dopreempt)
 define L_KPRIORITY             offsetof(struct lwp, l_kpriority)
+define L_MD_REGS               offsetof(struct lwp, l_md.md_regs)
+define L_MD_FLAGS              offsetof(struct lwp, l_md.md_flags)
+define L_MD_ASTPENDING         offsetof(struct lwp, l_md.md_astpending)
+
+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 MDL_FPU_IN_CPU          MDL_FPU_IN_CPU
-
 define LW_SYSTEM               LW_SYSTEM
 
 define GUFS_SEL                GUFS_SEL
@@ -190,11 +193,11 @@
 define IP6_DST                 offsetof(struct ip6_hdr, ip6_dst)
 
 define PCB_CR3                 offsetof(struct pcb, pcb_cr3)
+define PCB_CR0                 offsetof(struct pcb, pcb_cr0)
+define PCB_ONFAULT             offsetof(struct pcb, pcb_onfault)
 define PCB_EBP                 offsetof(struct pcb, pcb_ebp)
 define PCB_ESP                 offsetof(struct pcb, pcb_esp)
 define PCB_ESP0                offsetof(struct pcb, pcb_esp0)
-define PCB_CR0                 offsetof(struct pcb, pcb_cr0)
-define PCB_ONFAULT             offsetof(struct pcb, pcb_onfault)
 define PCB_FSD                 offsetof(struct pcb, pcb_fsd)
 define PCB_GSD                 offsetof(struct pcb, pcb_gsd)
 define PCB_IOMAP               offsetof(struct pcb, pcb_iomap)
@@ -234,11 +237,6 @@
 define FREEBSD_SIGF_SC         offsetof(struct freebsd_sigframe, sf_sc)
 endif
 
-define IH_FUN                  offsetof(struct intrhand, ih_fun)
-define IH_ARG                  offsetof(struct intrhand, ih_arg)
-define IH_LEVEL                offsetof(struct intrhand, ih_level)
-define IH_NEXT                 offsetof(struct intrhand, ih_next)
-
 define TSS_TSS                 offsetof(struct cpu_tss, tss)
 define TSS_ESP0                offsetof(struct cpu_tss, tss.tss_esp0)
 define TSS_IOBASE              offsetof(struct cpu_tss, tss.tss_iobase)
@@ -259,21 +257,20 @@
 define CPU_INFO_NSYSCALL       offsetof(struct cpu_info, ci_data.cpu_nsyscall)
 define CPU_INFO_NTRAP          offsetof(struct cpu_info, ci_data.cpu_ntrap)
 define CPU_INFO_NINTR          offsetof(struct cpu_info, ci_data.cpu_nintr)
+define CPU_INFO_CC_SKEW        offsetof(struct cpu_info, ci_data.cpu_cc_skew)
 define CPU_INFO_CURPRIORITY    offsetof(struct cpu_info, ci_schedstate.spc_curpriority)
-define CPU_INFO_CC_SKEW        offsetof(struct cpu_info, ci_data.cpu_cc_skew)
-
 
 define CPU_INFO_VENDOR         offsetof(struct cpu_info, ci_vendor[0])
 define CPU_INFO_SIGNATURE      offsetof(struct cpu_info, ci_signature)
 
 define CPU_INFO_GDT            offsetof(struct cpu_info, ci_gdt)
+define CPU_INFO_ILEVEL         (offsetof(struct cpu_info, ci_istate) + 7)
+define CPU_INFO_IDEPTH         offsetof(struct cpu_info, ci_idepth)
 define CPU_INFO_IPENDING       offsetof(struct cpu_info, ci_istate)
 define CPU_INFO_IMASKED        offsetof(struct cpu_info, ci_imasked)
 define CPU_INFO_IMASK          offsetof(struct cpu_info, ci_imask)
+define CPU_INFO_IUNMASK        offsetof(struct cpu_info, ci_iunmask)
 define CPU_INFO_ISOURCES       offsetof(struct cpu_info, ci_isources)
-define CPU_INFO_IUNMASK        offsetof(struct cpu_info, ci_iunmask)
-define CPU_INFO_ILEVEL         (offsetof(struct cpu_info, ci_istate) + 7)
-define CPU_INFO_IDEPTH         offsetof(struct cpu_info, ci_idepth)
 define CPU_INFO_MTX_COUNT      offsetof(struct cpu_info, ci_mtx_count)
 define CPU_INFO_MTX_OLDSPL     offsetof(struct cpu_info, ci_mtx_oldspl)
 define CPU_INFO_INTRSTACK      offsetof(struct cpu_info, ci_intrstack)
@@ -301,22 +298,27 @@
 define         PIC_LOCK                offsetof(struct pic, pic_lock)
 endif
 
+define IH_FUN                  offsetof(struct intrhand, ih_fun)
+define IH_ARG                  offsetof(struct intrhand, ih_arg)
+define IH_LEVEL                offsetof(struct intrhand, ih_level)
+define IH_NEXT                 offsetof(struct intrhand, ih_next)
+
 define SIZEOF_CPU_INFO         sizeof(struct cpu_info)
 define SIZEOF_ISTUB            sizeof(struct intrstub)
 
-define SIZEOF_ISOURCE          sizeof(struct intrsource)
-define IS_RECURSE              offsetof(struct intrsource, is_recurse)
-define IS_RESUME               offsetof(struct intrsource, is_resume)
-define IS_EVCNTLO              offsetof(struct intrsource, is_evcnt.ev_count)
-define IS_EVCNTHI              offsetof(struct intrsource, is_evcnt.ev_count)+4
-define IS_HANDLERS             offsetof(struct intrsource, is_handlers)
-define IS_PIC                  offsetof(struct intrsource, is_pic)
-define IS_FLAGS                offsetof(struct intrsource, is_flags)
-define IS_PIN                  offsetof(struct intrsource, is_pin)
-define IS_TYPE                 offsetof(struct intrsource, is_type)
-define IS_MAXLEVEL             offsetof(struct intrsource, is_maxlevel)
-define IS_LWP                  offsetof(struct intrsource, is_lwp)
-define IS_MASK_COUNT           offsetof(struct intrsource, is_mask_count)
+define SIZEOF_ISOURCE  sizeof(struct intrsource)
+define IS_RECURSE      offsetof(struct intrsource, is_recurse)
+define IS_RESUME       offsetof(struct intrsource, is_resume)
+define IS_EVCNTLO      offsetof(struct intrsource, is_evcnt.ev_count)
+define IS_EVCNTHI      offsetof(struct intrsource, is_evcnt.ev_count)+4
+define IS_HANDLERS     offsetof(struct intrsource, is_handlers)
+define IS_PIC          offsetof(struct intrsource, is_pic)
+define IS_FLAGS        offsetof(struct intrsource, is_flags)
+define IS_PIN          offsetof(struct intrsource, is_pin)
+define IS_TYPE         offsetof(struct intrsource, is_type)
+define IS_MAXLEVEL     offsetof(struct intrsource, is_maxlevel)
+define IS_LWP          offsetof(struct intrsource, is_lwp)
+define IS_MASK_COUNT   offsetof(struct intrsource, is_mask_count)
 
 define IPL_NONE                IPL_NONE
 define IPL_PREEMPT             IPL_PREEMPT
@@ -369,8 +371,6 @@
 define L1_SHIFT                L1_SHIFT
 define L2_SHIFT                L2_SHIFT
 define L2_FRAME                L2_FRAME
-define PGOFSET                 PGOFSET
-define PGSHIFT                 PGSHIFT
 
 define VM_GUEST_XENPV          VM_GUEST_XENPV
 define VM_GUEST_XENPVH         VM_GUEST_XENPVH