Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/src/sys/arch/amd64/amd64/genassym.cf,v rcsdiff: /ftp/cvs/cvsroot/src/sys/arch/amd64/amd64/genassym.cf,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.40.2.3 retrieving revision 1.41 diff -u -p -r1.40.2.3 -r1.41 --- src/sys/arch/amd64/amd64/genassym.cf 2011/08/27 15:37:22 1.40.2.3 +++ src/sys/arch/amd64/amd64/genassym.cf 2009/11/21 03:11:01 1.41 @@ -1,4 +1,4 @@ -# $NetBSD: genassym.cf,v 1.40.2.3 2011/08/27 15:37:22 jym Exp $ +# $NetBSD: genassym.cf,v 1.41 2009/11/21 03:11:01 rmind Exp $ # # Copyright (c) 1998, 2006, 2007, 2008 The NetBSD Foundation, Inc. @@ -122,7 +122,7 @@ ifdef XEN include endif -include +include define LSRUN LSRUN define LSONPROC LSONPROC @@ -147,7 +147,7 @@ define PDIR_SLOT_PTE PDIR_SLOT_PTE define VM_MAXUSER_ADDRESS (unsigned long long)VM_MAXUSER_ADDRESS -define L_PCB offsetof(struct lwp, l_addr) +define L_ADDR offsetof(struct lwp, l_addr) define L_FLAG offsetof(struct lwp, l_flag) define L_PROC offsetof(struct lwp, l_proc) define L_CTXSWTCH offsetof(struct lwp, l_ctxswtch) @@ -177,6 +177,9 @@ define M_NEXT offsetof(struct mbuf, m_ define IP_SRC offsetof(struct ip, ip_src) define IP_DST offsetof(struct ip, ip_dst) +define V_TRAP offsetof(struct uvmexp, traps) +define V_INTR offsetof(struct uvmexp, intrs) + define PCB_CR3 offsetof(struct pcb, pcb_cr3) define PCB_RBP offsetof(struct pcb, pcb_rbp) define PCB_RSP offsetof(struct pcb, pcb_rsp) @@ -185,10 +188,6 @@ define PCB_RSP0 offsetof(struct pcb, pc define PCB_CR0 offsetof(struct pcb, pcb_cr0) define PCB_ONFAULT offsetof(struct pcb, pcb_onfault) define PCB_FPCPU offsetof(struct pcb, pcb_fpcpu) -define PCB_FLAGS offsetof(struct pcb, pcb_flags) -define PCB_COMPAT32 PCB_COMPAT32 -define PCB_FS offsetof(struct pcb, pcb_fs) -define PCB_GS offsetof(struct pcb, pcb_gs) define TF_RDI offsetof(struct trapframe, tf_rdi) define TF_RSI offsetof(struct trapframe, tf_rsi) @@ -226,8 +225,11 @@ define CPU_INFO_SCRATCH offsetof(struct 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) +define CPU_INFO_PMAP_CPU offsetof(struct cpu_info, ci_pmap_cpu) define CPU_INFO_TLBSTATE offsetof(struct cpu_info, ci_tlbstate) define TLBSTATE_VALID TLBSTATE_VALID +define TLBSTATE_LAZY TLBSTATE_LAZY +define TLBSTATE_STALE TLBSTATE_STALE define CPU_INFO_TLB_EVCNT offsetof(struct cpu_info, ci_tlb_evcnt) define CPU_INFO_CURLWP offsetof(struct cpu_info, ci_curlwp) define CPU_INFO_CURLDT offsetof(struct cpu_info, ci_curldt) @@ -237,7 +239,6 @@ define CPU_INFO_CPUMASK offsetof(struct define CPU_INFO_RSP0 offsetof(struct cpu_info, ci_tss.tss_rsp0) 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_CURPRIORITY offsetof(struct cpu_info, ci_schedstate.spc_curpriority) define CPU_INFO_FPCURLWP offsetof(struct cpu_info, ci_fpcurlwp) @@ -297,7 +298,7 @@ define LINUX32_RT_SF_HANDLER offsetof(s 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 +define LINUX32_SYS_exit LINUX32_SYS_netbsd32_exit endif ifdef XEN @@ -323,6 +324,7 @@ define IPL_NONE IPL_NONE define IPL_PREEMPT IPL_PREEMPT define IPL_CLOCK IPL_CLOCK define IPL_HIGH IPL_HIGH +define IPL_IPI IPL_IPI define LIR_IPI LIR_IPI define LIR_TIMER LIR_TIMER @@ -348,14 +350,21 @@ define RW_THREAD RW_THREAD define RW_READER RW_READER define RW_WRITER RW_WRITER +define MB_POINTER offsetof(struct pmap_mbox, mb_pointer) +define MB_GLOBAL offsetof(struct pmap_mbox, mb_global) +define MB_ADDR1 offsetof(struct pmap_mbox, mb_addr1) +define MB_ADDR2 offsetof(struct pmap_mbox, mb_addr2) +define MB_HEAD offsetof(struct pmap_mbox, mb_head) +define MB_TAIL offsetof(struct pmap_mbox, mb_tail) + +define PM_CPUS offsetof(struct pmap, pm_cpus) + define EV_COUNT offsetof(struct evcnt, ev_count) define OPTERON_MSR_PASSCODE OPTERON_MSR_PASSCODE define X86_BUS_SPACE_IO X86_BUS_SPACE_IO -define BST_TYPE offsetof(struct bus_space_tag, bst_type) - ifdef XEN define CPU_INFO_VCPU offsetof(struct cpu_info, ci_vcpu) define EVTCHN_UPCALL_MASK offsetof(struct vcpu_info, evtchn_upcall_mask)