Module Name: src
Committed By: matt
Date: Sat Jun 18 21:17:30 UTC 2011
Modified Files:
src/sys/arch/amigappc/amigappc: locore.S
src/sys/arch/bebox/bebox: locore.S
src/sys/arch/evbppc/ev64260: ev64260_locore.S
src/sys/arch/evbppc/pmppc: pmppc_locore.S
src/sys/arch/ibmnws/ibmnws: locore.S
src/sys/arch/macppc/macppc: locore.S
src/sys/arch/mvmeppc/mvmeppc: locore.S
src/sys/arch/ofppc/ofppc: locore.S
src/sys/arch/powerpc/booke: genassym.cf
src/sys/arch/powerpc/conf: Makefile.powerpc
src/sys/arch/powerpc/ibm4xx: genassym.cf
src/sys/arch/powerpc/oea: genassym.cf
src/sys/arch/prep/prep: locore.S
src/sys/arch/rs6000/rs6000: locore.S
src/sys/arch/sandpoint/sandpoint: locore.S
Added Files:
src/sys/arch/powerpc/powerpc: genassym.cf
Log Message:
Make a common genassym.cf (powerpc/genassym.cf) and then
only put specific stuff in foo/genassym.cf
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/amigappc/amigappc/locore.S
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/bebox/bebox/locore.S
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/evbppc/ev64260/ev64260_locore.S
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbppc/pmppc/pmppc_locore.S
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/ibmnws/ibmnws/locore.S
cvs rdiff -u -r1.68 -r1.69 src/sys/arch/macppc/macppc/locore.S
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/mvmeppc/mvmeppc/locore.S
cvs rdiff -u -r1.46 -r1.47 src/sys/arch/ofppc/ofppc/locore.S
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/powerpc/booke/genassym.cf
cvs rdiff -u -r1.45 -r1.46 src/sys/arch/powerpc/conf/Makefile.powerpc
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/powerpc/ibm4xx/genassym.cf
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/powerpc/oea/genassym.cf
cvs rdiff -u -r0 -r1.7 src/sys/arch/powerpc/powerpc/genassym.cf
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/prep/prep/locore.S
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/rs6000/rs6000/locore.S
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/sandpoint/sandpoint/locore.S
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/amigappc/amigappc/locore.S
diff -u src/sys/arch/amigappc/amigappc/locore.S:1.22 src/sys/arch/amigappc/amigappc/locore.S:1.23
--- src/sys/arch/amigappc/amigappc/locore.S:1.22 Mon Jan 17 08:23:54 2011
+++ src/sys/arch/amigappc/amigappc/locore.S Sat Jun 18 21:17:28 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.22 2011/01/17 08:23:54 matt Exp $ */
+/* $NetBSD: locore.S,v 1.23 2011/06/18 21:17:28 matt Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -46,7 +46,6 @@
#include <sys/syscall.h>
#include <machine/param.h>
-#include <machine/vmparam.h>
#include <machine/pmap.h>
#include <machine/psl.h>
#include <machine/trap.h>
Index: src/sys/arch/bebox/bebox/locore.S
diff -u src/sys/arch/bebox/bebox/locore.S:1.22 src/sys/arch/bebox/bebox/locore.S:1.23
--- src/sys/arch/bebox/bebox/locore.S:1.22 Mon Jan 17 08:23:54 2011
+++ src/sys/arch/bebox/bebox/locore.S Sat Jun 18 21:17:28 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.22 2011/01/17 08:23:54 matt Exp $ */
+/* $NetBSD: locore.S,v 1.23 2011/06/18 21:17:28 matt Exp $ */
/* $OpenBSD: locore.S,v 1.4 1997/01/26 09:06:38 rahnds Exp $ */
/*
@@ -44,7 +44,6 @@
#include <sys/syscall.h>
#include <machine/param.h>
-#include <machine/vmparam.h>
#include <machine/pmap.h>
#include <machine/psl.h>
#include <machine/trap.h>
Index: src/sys/arch/evbppc/ev64260/ev64260_locore.S
diff -u src/sys/arch/evbppc/ev64260/ev64260_locore.S:1.17 src/sys/arch/evbppc/ev64260/ev64260_locore.S:1.18
--- src/sys/arch/evbppc/ev64260/ev64260_locore.S:1.17 Tue Feb 1 01:24:04 2011
+++ src/sys/arch/evbppc/ev64260/ev64260_locore.S Sat Jun 18 21:17:28 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ev64260_locore.S,v 1.17 2011/02/01 01:24:04 matt Exp $ */
+/* $NetBSD: ev64260_locore.S,v 1.18 2011/06/18 21:17:28 matt Exp $ */
/* $OpenBSD: locore.S,v 1.4 1997/01/26 09:06:38 rahnds Exp $ */
/*
@@ -43,7 +43,6 @@
#include <sys/syscall.h>
#include <machine/param.h>
-#include <machine/vmparam.h>
#include <machine/pmap.h>
#include <machine/psl.h>
#include <machine/trap.h>
Index: src/sys/arch/evbppc/pmppc/pmppc_locore.S
diff -u src/sys/arch/evbppc/pmppc/pmppc_locore.S:1.9 src/sys/arch/evbppc/pmppc/pmppc_locore.S:1.10
--- src/sys/arch/evbppc/pmppc/pmppc_locore.S:1.9 Mon Jan 17 08:23:55 2011
+++ src/sys/arch/evbppc/pmppc/pmppc_locore.S Sat Jun 18 21:17:28 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pmppc_locore.S,v 1.9 2011/01/17 08:23:55 matt Exp $ */
+/* $NetBSD: pmppc_locore.S,v 1.10 2011/06/18 21:17:28 matt Exp $ */
/* $OpenBSD: locore.S,v 1.4 1997/01/26 09:06:38 rahnds Exp $ */
/*
@@ -43,7 +43,6 @@
#include <sys/syscall.h>
#include <machine/param.h>
-#include <machine/vmparam.h>
#include <machine/pmap.h>
#include <machine/psl.h>
#include <machine/trap.h>
Index: src/sys/arch/ibmnws/ibmnws/locore.S
diff -u src/sys/arch/ibmnws/ibmnws/locore.S:1.9 src/sys/arch/ibmnws/ibmnws/locore.S:1.10
--- src/sys/arch/ibmnws/ibmnws/locore.S:1.9 Mon Jan 17 08:23:55 2011
+++ src/sys/arch/ibmnws/ibmnws/locore.S Sat Jun 18 21:17:28 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.9 2011/01/17 08:23:55 matt Exp $ */
+/* $NetBSD: locore.S,v 1.10 2011/06/18 21:17:28 matt Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -40,7 +40,6 @@
#include <sys/syscall.h>
#include <machine/param.h>
-#include <machine/vmparam.h>
#include <machine/pmap.h>
#include <machine/psl.h>
#include <machine/trap.h>
Index: src/sys/arch/macppc/macppc/locore.S
diff -u src/sys/arch/macppc/macppc/locore.S:1.68 src/sys/arch/macppc/macppc/locore.S:1.69
--- src/sys/arch/macppc/macppc/locore.S:1.68 Thu Jun 16 03:54:40 2011
+++ src/sys/arch/macppc/macppc/locore.S Sat Jun 18 21:17:28 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.68 2011/06/16 03:54:40 matt Exp $ */
+/* $NetBSD: locore.S,v 1.69 2011/06/18 21:17:28 matt Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -49,7 +49,6 @@
#include <machine/psl.h>
#include <machine/trap.h>
#include <machine/asm.h>
-#include <machine/vmparam.h>
#include <powerpc/spr.h>
#include <powerpc/oea/spr.h>
Index: src/sys/arch/mvmeppc/mvmeppc/locore.S
diff -u src/sys/arch/mvmeppc/mvmeppc/locore.S:1.13 src/sys/arch/mvmeppc/mvmeppc/locore.S:1.14
--- src/sys/arch/mvmeppc/mvmeppc/locore.S:1.13 Mon Jan 17 08:23:56 2011
+++ src/sys/arch/mvmeppc/mvmeppc/locore.S Sat Jun 18 21:17:29 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.13 2011/01/17 08:23:56 matt Exp $ */
+/* $NetBSD: locore.S,v 1.14 2011/06/18 21:17:29 matt Exp $ */
/* $OpenBSD: locore.S,v 1.4 1997/01/26 09:06:38 rahnds Exp $ */
/*
@@ -43,7 +43,6 @@
#include <sys/syscall.h>
#include <machine/param.h>
-#include <machine/vmparam.h>
#include <machine/pmap.h>
#include <machine/psl.h>
#include <machine/trap.h>
Index: src/sys/arch/ofppc/ofppc/locore.S
diff -u src/sys/arch/ofppc/ofppc/locore.S:1.46 src/sys/arch/ofppc/ofppc/locore.S:1.47
--- src/sys/arch/ofppc/ofppc/locore.S:1.46 Mon Jan 17 08:23:56 2011
+++ src/sys/arch/ofppc/ofppc/locore.S Sat Jun 18 21:17:29 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.46 2011/01/17 08:23:56 matt Exp $ */
+/* $NetBSD: locore.S,v 1.47 2011/06/18 21:17:29 matt Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -46,7 +46,6 @@
#include <machine/psl.h>
#include <machine/trap.h>
#include <machine/asm.h>
-#include <machine/vmparam.h>
#include <powerpc/spr.h>
#include <powerpc/oea/spr.h>
Index: src/sys/arch/powerpc/booke/genassym.cf
diff -u src/sys/arch/powerpc/booke/genassym.cf:1.5 src/sys/arch/powerpc/booke/genassym.cf:1.6
--- src/sys/arch/powerpc/booke/genassym.cf:1.5 Sat Jun 18 06:37:38 2011
+++ src/sys/arch/powerpc/booke/genassym.cf Sat Jun 18 21:17:29 2011
@@ -1,4 +1,4 @@
-# $NetBSD: genassym.cf,v 1.5 2011/06/18 06:37:38 matt Exp $
+# $NetBSD: genassym.cf,v 1.6 2011/06/18 21:17:29 matt Exp $
#-
# Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
@@ -41,169 +41,29 @@
# POSSIBILITY OF SUCH DAMAGE.
#+
-include "opt_ppcarch.h"
-
-quote #define __MUTEX_PRIVATE
-quote #define __RWLOCK_PRIVATE
-quote #define __INTR_PRIVATE
-
include <sys/param.h>
-include <sys/time.h>
-include <sys/mutex.h>
-include <sys/rwlock.h>
-include <sys/proc.h>
include <sys/bitops.h>
include <uvm/uvm_extern.h>
-include <machine/pcb.h>
include <machine/frame.h>
+include <machine/psl.h>
include <machine/pmap.h>
-include <powerpc/cpu.h>
include <powerpc/booke/trap.h>
include <powerpc/booke/pte.h>
-define FRAMELEN FRAMELEN
-define FRAME_TF offsetof(struct ktrapframe, ktf_tf)
-define FRAME_R0 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[0])
-define FRAME_R1 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[1])
-define FRAME_R2 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[2])
-define FRAME_R3 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[3])
-define FRAME_R4 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[4])
-define FRAME_R5 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[5])
-define FRAME_R6 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[6])
-define FRAME_R7 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[7])
-define FRAME_R8 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[8])
-define FRAME_R9 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[9])
-define FRAME_R10 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[10])
-define FRAME_R11 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[11])
-define FRAME_R12 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[12])
-define FRAME_R13 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[13])
-define FRAME_R14 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[14])
-define FRAME_R15 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[15])
-define FRAME_R16 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[16])
-define FRAME_R17 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[17])
-define FRAME_R18 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[18])
-define FRAME_R19 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[19])
-define FRAME_R20 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[20])
-define FRAME_R21 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[21])
-define FRAME_R22 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[22])
-define FRAME_R23 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[23])
-define FRAME_R24 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[24])
-define FRAME_R25 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[25])
-define FRAME_R26 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[26])
-define FRAME_R27 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[27])
-define FRAME_R28 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[28])
-define FRAME_R29 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[29])
-define FRAME_R30 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[30])
-define FRAME_R31 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[31])
-define FRAME_LR offsetof(struct ktrapframe, ktf_tf.tf_lr)
-define FRAME_CR offsetof(struct ktrapframe, ktf_tf.tf_cr)
-define FRAME_CTR offsetof(struct ktrapframe, ktf_tf.tf_ctr)
-define FRAME_XER offsetof(struct ktrapframe, ktf_tf.tf_xer)
-define FRAME_CF offsetof(struct ktrapframe, ktf_tf.tf_cf)
-define FRAME_SRR0 offsetof(struct ktrapframe, ktf_tf.tf_srr0)
-define FRAME_SRR1 offsetof(struct ktrapframe, ktf_tf.tf_srr1)
-define FRAME_IDEPTH offsetof(struct ktrapframe, ktf_tf.tf_idepth)
define FRAME_DEAR offsetof(struct ktrapframe, ktf_tf.tf_dear)
define FRAME_ESR offsetof(struct ktrapframe, ktf_tf.tf_esr)
-define FRAME_EXC offsetof(struct ktrapframe, ktf_tf.tf_exc)
define FRAME_MCSR offsetof(struct ktrapframe, ktf_tf.tf_mcsr)
define FRAME_MCAR offsetof(struct ktrapframe, ktf_tf.tf_mcar)
define FRAME_SPRG1 offsetof(struct ktrapframe, ktf_tf.tf_sprg1)
define FRAME_SPEFSCR offsetof(struct ktrapframe, ktf_tf.tf_spefscr)
-define CALLFRAMELEN CALLFRAMELEN
-define CFRAME_SP offsetof(struct callframe, cf_sp)
-define CFRAME_LR offsetof(struct callframe, cf_lr)
-define CFRAME_R30 offsetof(struct callframe, cf_r30)
-define CFRAME_R31 offsetof(struct callframe, cf_r31)
-
-define SFRAMELEN SFRAMELEN
-define SFRAME_SP offsetof(struct switchframe, sf_sp)
-define SFRAME_LR offsetof(struct switchframe, sf_lr)
-define SFRAME_USER_SR offsetof(struct switchframe, sf_user_sr)
-define SFRAME_CR offsetof(struct switchframe, sf_cr)
-define SFRAME_R2 offsetof(struct switchframe, sf_fixreg2)
-define SFRAME_R13 offsetof(struct switchframe, sf_fixreg[0])
-define SFRAME_R14 offsetof(struct switchframe, sf_fixreg[1])
-define SFRAME_R15 offsetof(struct switchframe, sf_fixreg[2])
-define SFRAME_R16 offsetof(struct switchframe, sf_fixreg[3])
-define SFRAME_R17 offsetof(struct switchframe, sf_fixreg[4])
-define SFRAME_R18 offsetof(struct switchframe, sf_fixreg[5])
-define SFRAME_R19 offsetof(struct switchframe, sf_fixreg[6])
-define SFRAME_R20 offsetof(struct switchframe, sf_fixreg[7])
-define SFRAME_R21 offsetof(struct switchframe, sf_fixreg[8])
-define SFRAME_R22 offsetof(struct switchframe, sf_fixreg[9])
-define SFRAME_R23 offsetof(struct switchframe, sf_fixreg[10])
-define SFRAME_R24 offsetof(struct switchframe, sf_fixreg[11])
-define SFRAME_R25 offsetof(struct switchframe, sf_fixreg[12])
-define SFRAME_R26 offsetof(struct switchframe, sf_fixreg[13])
-define SFRAME_R27 offsetof(struct switchframe, sf_fixreg[14])
-define SFRAME_R28 offsetof(struct switchframe, sf_fixreg[15])
-define SFRAME_R29 offsetof(struct switchframe, sf_fixreg[16])
-define SFRAME_R30 offsetof(struct switchframe, sf_fixreg[17])
-define SFRAME_R31 offsetof(struct switchframe, sf_fixreg[18])
-
-define PCB_PM offsetof(struct pcb, pcb_pm)
-define PCB_SP offsetof(struct pcb, pcb_sp)
-define PCB_ONFAULT offsetof(struct pcb, pcb_onfault)
-define PCB_USPRG0 offsetof(struct pcb, pcb_usprg0)
-
-define L_PCB offsetof(struct lwp, l_addr)
-define L_CPU offsetof(struct lwp, l_cpu)
-define L_CTXSWTCH offsetof(struct lwp, l_ctxswtch)
-define L_MD_ASTPENDING offsetof(struct lwp, l_md.md_astpending)
-define L_MD_UTF offsetof(struct lwp, l_md.md_utf)
-define L_PROC offsetof(struct lwp, l_proc)
-
-define P_MD_SYSCALL offsetof(struct proc, p_md.md_syscall)
-
-define CI_SIZE sizeof(struct cpu_info)
-define CI_CURLWP offsetof(struct cpu_info, ci_curlwp)
-define CI_CURPCB offsetof(struct cpu_info, ci_curpcb)
-define CI_CURPM offsetof(struct cpu_info, ci_curpm)
-define CI_WANT_RESCHED offsetof(struct cpu_info, ci_want_resched)
-define CI_CPL offsetof(struct cpu_info, ci_cpl)
-define CI_IDEPTH offsetof(struct cpu_info, ci_idepth)
-define CI_IDLESPIN offsetof(struct cpu_info, ci_idlespin)
-define CI_IDLELWP offsetof(struct cpu_info, ci_data.cpu_idlelwp)
-define CI_MTX_COUNT offsetof(struct cpu_info, ci_mtx_count)
-define CI_MTX_OLDSPL offsetof(struct cpu_info, ci_mtx_oldspl)
define CI_SAVELIFO offsetof(struct cpu_info, ci_savelifo)
define CI_PMAP_SEGTAB offsetof(struct cpu_info, ci_pmap_segtabs[0])
define CI_EV_TLBMISS_SOFT offsetof(struct cpu_info, ci_ev_tlbmiss_soft.ev_count)
-define FB_PC offsetof(struct faultbuf, fb_pc)
-define FB_MSR offsetof(struct faultbuf, fb_msr)
-define FB_SP offsetof(struct faultbuf, fb_sp)
-define FB_R2 offsetof(struct faultbuf, fb_r2)
-define FB_CR offsetof(struct faultbuf, fb_cr)
-define FB_R13 offsetof(struct faultbuf, fb_fixreg[0])
-define FB_R14 offsetof(struct faultbuf, fb_fixreg[1])
-define FB_R15 offsetof(struct faultbuf, fb_fixreg[2])
-define FB_R16 offsetof(struct faultbuf, fb_fixreg[3])
-define FB_R17 offsetof(struct faultbuf, fb_fixreg[4])
-define FB_R18 offsetof(struct faultbuf, fb_fixreg[5])
-define FB_R19 offsetof(struct faultbuf, fb_fixreg[6])
-define FB_R20 offsetof(struct faultbuf, fb_fixreg[7])
-define FB_R21 offsetof(struct faultbuf, fb_fixreg[8])
-define FB_R22 offsetof(struct faultbuf, fb_fixreg[9])
-define FB_R23 offsetof(struct faultbuf, fb_fixreg[10])
-define FB_R24 offsetof(struct faultbuf, fb_fixreg[11])
-define FB_R25 offsetof(struct faultbuf, fb_fixreg[12])
-define FB_R26 offsetof(struct faultbuf, fb_fixreg[13])
-define FB_R27 offsetof(struct faultbuf, fb_fixreg[14])
-define FB_R28 offsetof(struct faultbuf, fb_fixreg[15])
-define FB_R29 offsetof(struct faultbuf, fb_fixreg[16])
-define FB_R30 offsetof(struct faultbuf, fb_fixreg[17])
-define FB_R31 offsetof(struct faultbuf, fb_fixreg[18])
-
-define CACHELINESIZE CACHELINESIZE
-
-define CPU_CI offsetof(struct cpu_info, ci_ci)
-
define PAGE_SIZE PAGE_SIZE
define PAGE_MASK PAGE_MASK
define PAGE_SHIFT PAGE_SHIFT
@@ -232,39 +92,10 @@
define T_EMBEDDED_PERF_MONITOR T_EMBEDDED_PERF_MONITOR
define T_AST T_AST
-ifdef __HAVE_FAST_SOFTINTS
-define __HAVE_FAST_SOFTINTS __HAVE_FAST_SOFTINTS
-endif
-
-define IPL_HIGH IPL_HIGH
-define IPL_SCHED IPL_SCHED
-define IPL_VM IPL_VM
-
-ifdef __HAVE_MUTEX_STUBS
-define __HAVE_MUTEX_STUBS __HAVE_MUTEX_STUBS
-endif
-ifdef __HAVE_MUTEX_SPIN_STUBS
-define __HAVE_MUTEX_SPIN_STUBS __HAVE_MUTEX_SPIN_STUBS
-endif
-define MTX_OWNER offsetof(struct kmutex, mtx_owner)
-define MTX_LOCK offsetof(struct kmutex, mtx_lock)
-define MTX_IPL offsetof(struct kmutex, mtx_ipl)
-
-ifdef __HAVE_RW_STUBS
-define __HAVE_RW_STUBS __HAVE_RW_STUBS
-endif
-define RW_OWNER offsetof(struct krwlock, rw_owner)
-define RW_WRITE_LOCKED RW_WRITE_LOCKED
-define RW_READ_INCR RW_READ_INCR
-define RW_READER RW_READER
-
-##define USPACE USPACE
-
define PTE_SCALESHIFT ilog2(sizeof(pt_entry_t))
define PTR_SCALESHIFT ilog2(sizeof(void *))
define NSEGPG_SCALESHIFT PAGE_SHIFT - ilog2(sizeof(void *))
define NPTEPG_SCALESHIFT PAGE_SHIFT - ilog2(sizeof(pt_entry_t))
-define MSR_PR 31 - ilog2(PSL_PR)
define MSR_DS 31 - ilog2(PSL_DS)
define MSR_IS 31 - ilog2(PSL_IS)
Index: src/sys/arch/powerpc/conf/Makefile.powerpc
diff -u src/sys/arch/powerpc/conf/Makefile.powerpc:1.45 src/sys/arch/powerpc/conf/Makefile.powerpc:1.46
--- src/sys/arch/powerpc/conf/Makefile.powerpc:1.45 Sat Jun 4 17:51:09 2011
+++ src/sys/arch/powerpc/conf/Makefile.powerpc Sat Jun 18 21:17:29 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.powerpc,v 1.45 2011/06/04 17:51:09 matt Exp $
+# $NetBSD: Makefile.powerpc,v 1.46 2011/06/18 21:17:29 matt Exp $
#
# Makefile for NetBSD
#
@@ -27,10 +27,10 @@
##
THISPPC= $S/arch/${MACHINE}
POWERPC= $S/arch/powerpc
+GENASSYM_CONF= ${POWERPC}/powerpc/genassym.cf
+GENASSYM_CONF+= ${POWERPC}/${PPCDIR}/genassym.cf
.if exists(${THISPPC}/${MACHINE}/genassym.cf)
-GENASSYM_CONF= ${THISPPC}/${MACHINE}/genassym.cf
-.else
-GENASSYM_CONF= ${POWERPC}/${PPCDIR}/genassym.cf
+GENASSYM_CONF+= ${THISPPC}/${MACHINE}/genassym.cf
.endif
.-include "${THISPPC}/conf/Makefile.${MACHINE}.inc"
Index: src/sys/arch/powerpc/ibm4xx/genassym.cf
diff -u src/sys/arch/powerpc/ibm4xx/genassym.cf:1.20 src/sys/arch/powerpc/ibm4xx/genassym.cf:1.21
--- src/sys/arch/powerpc/ibm4xx/genassym.cf:1.20 Sat Jun 18 20:28:48 2011
+++ src/sys/arch/powerpc/ibm4xx/genassym.cf Sat Jun 18 21:17:29 2011
@@ -1,4 +1,4 @@
-# $NetBSD: genassym.cf,v 1.20 2011/06/18 20:28:48 matt Exp $
+# $NetBSD: genassym.cf,v 1.21 2011/06/18 21:17:29 matt Exp $
#
# Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -31,133 +31,22 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
-quote #define __MUTEX_PRIVATE
-quote #define __RWLOCK_PRIVATE
-
include <sys/param.h>
-include <sys/time.h>
-include <sys/proc.h>
include <sys/bitops.h>
-include <uvm/uvm_extern.h>
-
-include <machine/pcb.h>
include <machine/pmap.h>
-define FRAMELEN FRAMELEN
-define FRAME_TF offsetof(struct ktrapframe, ktf_tf)
-define FRAME_R0 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[0])
-define FRAME_R1 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[1])
-define FRAME_R2 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[2])
-define FRAME_R3 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[3])
-define FRAME_R4 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[4])
-define FRAME_R5 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[5])
-define FRAME_R6 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[6])
-define FRAME_R7 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[7])
-define FRAME_R8 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[8])
-define FRAME_R9 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[9])
-define FRAME_R10 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[10])
-define FRAME_R11 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[11])
-define FRAME_R12 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[12])
-define FRAME_R13 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[13])
-define FRAME_R14 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[14])
-define FRAME_R15 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[15])
-define FRAME_R16 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[16])
-define FRAME_R17 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[17])
-define FRAME_R18 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[18])
-define FRAME_R19 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[19])
-define FRAME_R20 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[20])
-define FRAME_R21 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[21])
-define FRAME_R22 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[22])
-define FRAME_R23 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[23])
-define FRAME_R24 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[24])
-define FRAME_R25 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[25])
-define FRAME_R26 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[26])
-define FRAME_R27 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[27])
-define FRAME_R28 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[28])
-define FRAME_R29 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[29])
-define FRAME_R30 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[30])
-define FRAME_R31 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[31])
-define FRAME_LR offsetof(struct ktrapframe, ktf_tf.tf_lr)
-define FRAME_CR offsetof(struct ktrapframe, ktf_tf.tf_cr)
-define FRAME_CTR offsetof(struct ktrapframe, ktf_tf.tf_ctr)
-define FRAME_XER offsetof(struct ktrapframe, ktf_tf.tf_xer)
-define FRAME_CF offsetof(struct ktrapframe, ktf_tf.tf_cf)
-define FRAME_IDEPTH offsetof(struct ktrapframe, ktf_tf.tf_idepth)
-define FRAME_SRR0 offsetof(struct ktrapframe, ktf_tf.tf_srr0)
-define FRAME_SRR1 offsetof(struct ktrapframe, ktf_tf.tf_srr1)
define FRAME_DEAR offsetof(struct ktrapframe, ktf_tf.tf_dear)
-define FRAME_EXC offsetof(struct ktrapframe, ktf_tf.tf_exc)
define FRAME_ESR offsetof(struct ktrapframe, ktf_tf.tf_esr)
define FRAME_PID offsetof(struct ktrapframe, ktf_tf.tf_pid)
-define CALLFRAMELEN CALLFRAMELEN
-define CFRAME_SP offsetof(struct callframe, cf_sp)
-define CFRAME_LR offsetof(struct callframe, cf_lr)
-define CFRAME_R30 offsetof(struct callframe, cf_r30)
-define CFRAME_R31 offsetof(struct callframe, cf_r31)
-
-define SFRAMELEN SFRAMELEN
-define SFRAME_SP offsetof(struct switchframe, sf_sp)
-define SFRAME_LR offsetof(struct switchframe, sf_lr)
-define SFRAME_USER_SR offsetof(struct switchframe, sf_user_sr)
-define SFRAME_CR offsetof(struct switchframe, sf_cr)
-define SFRAME_R2 offsetof(struct switchframe, sf_fixreg2)
-define SFRAME_R13 offsetof(struct switchframe, sf_fixreg[0])
-define SFRAME_R14 offsetof(struct switchframe, sf_fixreg[1])
-define SFRAME_R15 offsetof(struct switchframe, sf_fixreg[2])
-define SFRAME_R16 offsetof(struct switchframe, sf_fixreg[3])
-define SFRAME_R17 offsetof(struct switchframe, sf_fixreg[4])
-define SFRAME_R18 offsetof(struct switchframe, sf_fixreg[5])
-define SFRAME_R19 offsetof(struct switchframe, sf_fixreg[6])
-define SFRAME_R20 offsetof(struct switchframe, sf_fixreg[7])
-define SFRAME_R21 offsetof(struct switchframe, sf_fixreg[8])
-define SFRAME_R22 offsetof(struct switchframe, sf_fixreg[9])
-define SFRAME_R23 offsetof(struct switchframe, sf_fixreg[10])
-define SFRAME_R24 offsetof(struct switchframe, sf_fixreg[11])
-define SFRAME_R25 offsetof(struct switchframe, sf_fixreg[12])
-define SFRAME_R26 offsetof(struct switchframe, sf_fixreg[13])
-define SFRAME_R27 offsetof(struct switchframe, sf_fixreg[14])
-define SFRAME_R28 offsetof(struct switchframe, sf_fixreg[15])
-define SFRAME_R29 offsetof(struct switchframe, sf_fixreg[16])
-define SFRAME_R30 offsetof(struct switchframe, sf_fixreg[17])
-define SFRAME_R31 offsetof(struct switchframe, sf_fixreg[18])
-
-define PCB_PM offsetof(struct pcb, pcb_pm)
-define PCB_SP offsetof(struct pcb, pcb_sp)
-define PCB_ONFAULT offsetof(struct pcb, pcb_onfault)
-
define PM_CTX offsetof(struct pmap, pm_ctx)
-define MSR_PR 31-ilog2(PSL_PR)
-
-define L_CPU offsetof(struct lwp, l_cpu)
-define L_CTXSWTCH offsetof(struct lwp, l_ctxswtch)
-define L_MD_ASTPENDING offsetof(struct lwp, l_md.md_astpending)
-define L_MD_UTF offsetof(struct lwp, l_md.md_utf)
-define L_PCB offsetof(struct lwp, l_addr)
-define L_PROC offsetof(struct lwp, l_proc)
-
-define P_MD_SYSCALL offsetof(struct proc, p_md.md_syscall)
-
-ifdef __HAVE_FAST_SOFTINTS
-define __HAVE_FAST_SOFTINTS __HAVE_FAST_SOFTINTS
-endif
-
-define CI_SIZE sizeof(struct cpu_info)
-define CI_CURLWP offsetof(struct cpu_info, ci_curlwp)
-define CI_CURPCB offsetof(struct cpu_info, ci_curpcb)
-define CI_CURPM offsetof(struct cpu_info, ci_curpm)
-define CI_WANT_RESCHED offsetof(struct cpu_info, ci_want_resched)
-define CI_CPL offsetof(struct cpu_info, ci_cpl)
-define CI_IDEPTH offsetof(struct cpu_info, ci_idepth)
define CI_INTSTK offsetof(struct cpu_info, ci_intstk)
define CI_TEMPSAVE offsetof(struct cpu_info, ci_tempsave)
define CI_DDBSAVE offsetof(struct cpu_info, ci_ddbsave)
define CI_IPKDBSAVE offsetof(struct cpu_info, ci_ipkdbsave)
define CI_TLBMISSSAVE offsetof(struct cpu_info, ci_tlbmisssave)
-define CI_IDLESPIN offsetof(struct cpu_info, ci_idlespin)
-define CI_MTX_COUNT offsetof(struct cpu_info, ci_mtx_count)
define CPUSAVE_R28 CPUSAVE_R28*sizeof(register_t)
define CPUSAVE_R29 CPUSAVE_R29*sizeof(register_t)
@@ -167,51 +56,3 @@
define CPUSAVE_ESR CPUSAVE_ESR*sizeof(register_t)
define CPUSAVE_SRR0 CPUSAVE_SRR0*sizeof(register_t)
define CPUSAVE_SRR1 CPUSAVE_SRR1*sizeof(register_t)
-
-define FB_PC offsetof(struct faultbuf, fb_pc)
-define FB_SP offsetof(struct faultbuf, fb_sp)
-define FB_R2 offsetof(struct faultbuf, fb_r2)
-define FB_CR offsetof(struct faultbuf, fb_cr)
-define FB_R13 offsetof(struct faultbuf, fb_fixreg[0])
-define FB_R14 offsetof(struct faultbuf, fb_fixreg[1])
-define FB_R15 offsetof(struct faultbuf, fb_fixreg[2])
-define FB_R16 offsetof(struct faultbuf, fb_fixreg[3])
-define FB_R17 offsetof(struct faultbuf, fb_fixreg[4])
-define FB_R18 offsetof(struct faultbuf, fb_fixreg[5])
-define FB_R19 offsetof(struct faultbuf, fb_fixreg[6])
-define FB_R20 offsetof(struct faultbuf, fb_fixreg[7])
-define FB_R21 offsetof(struct faultbuf, fb_fixreg[8])
-define FB_R22 offsetof(struct faultbuf, fb_fixreg[9])
-define FB_R23 offsetof(struct faultbuf, fb_fixreg[10])
-define FB_R24 offsetof(struct faultbuf, fb_fixreg[11])
-define FB_R25 offsetof(struct faultbuf, fb_fixreg[12])
-define FB_R26 offsetof(struct faultbuf, fb_fixreg[13])
-define FB_R27 offsetof(struct faultbuf, fb_fixreg[14])
-define FB_R28 offsetof(struct faultbuf, fb_fixreg[15])
-define FB_R29 offsetof(struct faultbuf, fb_fixreg[16])
-define FB_R30 offsetof(struct faultbuf, fb_fixreg[17])
-define FB_R31 offsetof(struct faultbuf, fb_fixreg[18])
-
-define PAGE_SIZE PAGE_SIZE
-define PAGE_MASK PAGE_MASK
-define CACHELINESIZE CACHELINESIZE
-
-define CPU_CI offsetof(struct cpu_info, ci_ci)
-
-ifdef __HAVE_MUTEX_STUBS
-define __HAVE_MUTEX_STUBS __HAVE_MUTEX_STUBS
-endif
-ifdef __HAVE_MUTEX_SPIN_STUBS
-define __HAVE_MUTEX_SPIN_STUBS __HAVE_MUTEX_SPIN_STUBS
-endif
-define MTX_OWNER offsetof(struct kmutex, mtx_owner)
-define MTX_LOCK offsetof(struct kmutex, mtx_lock)
-define MTX_IPL offsetof(struct kmutex, mtx_ipl)
-
-ifdef __HAVE_RW_STUBS
-define __HAVE_RW_STUBS __HAVE_RW_STUBS
-endif
-define RW_OWNER offsetof(struct krwlock, rw_owner)
-define RW_WRITE_LOCKED RW_WRITE_LOCKED
-define RW_READ_INCR RW_READ_INCR
-define RW_READER RW_READER
Index: src/sys/arch/powerpc/oea/genassym.cf
diff -u src/sys/arch/powerpc/oea/genassym.cf:1.22 src/sys/arch/powerpc/oea/genassym.cf:1.23
--- src/sys/arch/powerpc/oea/genassym.cf:1.22 Fri Jun 17 23:15:09 2011
+++ src/sys/arch/powerpc/oea/genassym.cf Sat Jun 18 21:17:29 2011
@@ -1,4 +1,4 @@
-# $NetBSD: genassym.cf,v 1.22 2011/06/17 23:15:09 matt Exp $
+# $NetBSD: genassym.cf,v 1.23 2011/06/18 21:17:29 matt Exp $
#
# Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -33,9 +33,6 @@
include "opt_ppcarch.h"
-quote #define __MUTEX_PRIVATE
-quote #define __RWLOCK_PRIVATE
-
include <sys/param.h>
include <sys/time.h>
include <sys/mutex.h>
@@ -51,100 +48,42 @@
include <powerpc/cpu.h>
include <powerpc/oea/cpufeat.h>
-define IPL_HIGH IPL_HIGH
-define IPL_SCHED IPL_SCHED
-
-define FRAMELEN FRAMELEN
-define FRAME_TF offsetof(struct ktrapframe, ktf_tf)
-define FRAME_R0 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[0])
-define FRAME_R1 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[1])
-define FRAME_R2 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[2])
-define FRAME_R3 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[3])
-define FRAME_R4 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[4])
-define FRAME_R5 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[5])
-define FRAME_R6 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[6])
-define FRAME_R7 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[7])
-define FRAME_R8 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[8])
-define FRAME_R9 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[9])
-define FRAME_R10 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[10])
-define FRAME_R11 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[11])
-define FRAME_R12 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[12])
-define FRAME_R13 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[13])
-define FRAME_R14 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[14])
-define FRAME_R15 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[15])
-define FRAME_R16 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[16])
-define FRAME_R17 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[17])
-define FRAME_R18 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[18])
-define FRAME_R19 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[19])
-define FRAME_R20 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[20])
-define FRAME_R21 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[21])
-define FRAME_R22 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[22])
-define FRAME_R23 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[23])
-define FRAME_R24 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[24])
-define FRAME_R25 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[25])
-define FRAME_R26 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[26])
-define FRAME_R27 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[27])
-define FRAME_R28 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[28])
-define FRAME_R29 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[29])
-define FRAME_R30 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[30])
-define FRAME_R31 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[31])
-define FRAME_LR offsetof(struct ktrapframe, ktf_tf.tf_lr)
-define FRAME_CR offsetof(struct ktrapframe, ktf_tf.tf_cr)
-define FRAME_CTR offsetof(struct ktrapframe, ktf_tf.tf_ctr)
-define FRAME_XER offsetof(struct ktrapframe, ktf_tf.tf_xer)
-define FRAME_CF offsetof(struct ktrapframe, ktf_tf.tf_cf)
-define FRAME_SRR0 offsetof(struct ktrapframe, ktf_tf.tf_srr0)
-define FRAME_SRR1 offsetof(struct ktrapframe, ktf_tf.tf_srr1)
-define FRAME_IDEPTH offsetof(struct ktrapframe, ktf_tf.tf_idepth)
define FRAME_DAR offsetof(struct ktrapframe, ktf_tf.tf_dar)
define FRAME_DSISR offsetof(struct ktrapframe, ktf_tf.tf_dsisr)
-define FRAME_EXC offsetof(struct ktrapframe, ktf_tf.tf_exc)
define FRAME_VRSAVE offsetof(struct ktrapframe, ktf_tf.tf_vrsave)
define FRAME_MQ offsetof(struct ktrapframe, ktf_tf.tf_mq)
ifdef PPC_OEA64
define PM_STEG offsetof(struct pmap, pm_steg_table)
else
+define USER_SR USER_SR
+define KERNEL_SR KERNEL_SR
define PM_SR offsetof(struct pmap, pm_sr[0])
define PM_USRSR offsetof(struct pmap, pm_sr[USER_SR])
define PM_KERNELSR offsetof(struct pmap, pm_sr[KERNEL_SR])
endif
-define CALLFRAMELEN CALLFRAMELEN
-define CFRAME_SP offsetof(struct callframe, cf_sp)
-define CFRAME_LR offsetof(struct callframe, cf_lr)
-define CFRAME_R30 offsetof(struct callframe, cf_r30)
-define CFRAME_R31 offsetof(struct callframe, cf_r31)
-
-define SFRAMELEN SFRAMELEN
-define SFRAME_SP offsetof(struct switchframe, sf_sp)
-define SFRAME_LR offsetof(struct switchframe, sf_lr)
-define SFRAME_USER_SR offsetof(struct switchframe, sf_user_sr)
-define SFRAME_CR offsetof(struct switchframe, sf_cr)
-define SFRAME_R2 offsetof(struct switchframe, sf_fixreg2)
-define SFRAME_R13 offsetof(struct switchframe, sf_fixreg[0])
-define SFRAME_R14 offsetof(struct switchframe, sf_fixreg[1])
-define SFRAME_R15 offsetof(struct switchframe, sf_fixreg[2])
-define SFRAME_R16 offsetof(struct switchframe, sf_fixreg[3])
-define SFRAME_R17 offsetof(struct switchframe, sf_fixreg[4])
-define SFRAME_R18 offsetof(struct switchframe, sf_fixreg[5])
-define SFRAME_R19 offsetof(struct switchframe, sf_fixreg[6])
-define SFRAME_R20 offsetof(struct switchframe, sf_fixreg[7])
-define SFRAME_R21 offsetof(struct switchframe, sf_fixreg[8])
-define SFRAME_R22 offsetof(struct switchframe, sf_fixreg[9])
-define SFRAME_R23 offsetof(struct switchframe, sf_fixreg[10])
-define SFRAME_R24 offsetof(struct switchframe, sf_fixreg[11])
-define SFRAME_R25 offsetof(struct switchframe, sf_fixreg[12])
-define SFRAME_R26 offsetof(struct switchframe, sf_fixreg[13])
-define SFRAME_R27 offsetof(struct switchframe, sf_fixreg[14])
-define SFRAME_R28 offsetof(struct switchframe, sf_fixreg[15])
-define SFRAME_R29 offsetof(struct switchframe, sf_fixreg[16])
-define SFRAME_R30 offsetof(struct switchframe, sf_fixreg[17])
-define SFRAME_R31 offsetof(struct switchframe, sf_fixreg[18])
-
-define PCB_PM offsetof(struct pcb, pcb_pm)
-define PCB_SP offsetof(struct pcb, pcb_sp)
-define PCB_ONFAULT offsetof(struct pcb, pcb_onfault)
+define CI_TEMPSAVE offsetof(struct cpu_info, ci_tempsave)
+define CI_DDBSAVE offsetof(struct cpu_info, ci_ddbsave)
+define CI_IPKDBSAVE offsetof(struct cpu_info, ci_ipkdbsave)
+define CI_DISISAVE offsetof(struct cpu_info, ci_disisave)
+
+define CPUSAVE_R28 CPUSAVE_R28*sizeof(register_t)
+define CPUSAVE_R29 CPUSAVE_R29*sizeof(register_t)
+define CPUSAVE_R30 CPUSAVE_R30*sizeof(register_t)
+define CPUSAVE_R31 CPUSAVE_R31*sizeof(register_t)
+define CPUSAVE_DAR CPUSAVE_DAR*sizeof(register_t)
+define CPUSAVE_DSISR CPUSAVE_DSISR*sizeof(register_t)
+define CPUSAVE_SRR0 CPUSAVE_SRR0*sizeof(register_t)
+define CPUSAVE_SRR1 CPUSAVE_SRR1*sizeof(register_t)
+
+define OEACPU_64 OEACPU_64
+define OEACPU_64_BRIDGE OEACPU_64_BRIDGE
+define OEACPU_NOBAT OEACPU_NOBAT
+define OEACPU_HIGHBAT OEACPU_HIGHBAT
+define OEACPU_601 OEACPU_601
+define OEACPU_HIGHSPRG OEACPU_HIGHSPRG
+define OEACPU_ALTIVEC OEACPU_ALTIVEC
define FPREG_F0 offsetof(struct fpreg, fpreg[0])
define FPREG_F1 offsetof(struct fpreg, fpreg[1])
@@ -214,95 +153,3 @@
define VREG_V31 offsetof(struct vreg, vreg[31][0])
define VREG_VRSAVE offsetof(struct vreg, vrsave)
define VREG_VSCR offsetof(struct vreg, vscr)
-
-ifdef __HAVE_FAST_SOFTINTS
-define __HAVE_FAST_SOFTINTS __HAVE_FAST_SOFTINTS
-endif
-
-define L_PCB offsetof(struct lwp, l_addr)
-define L_CPU offsetof(struct lwp, l_cpu)
-define L_MD_ASTPENDING offsetof(struct lwp, l_md.md_astpending)
-define L_MD_UTF offsetof(struct lwp, l_md.md_utf)
-define L_PROC offsetof(struct lwp, l_proc)
-define L_CTXSWTCH offsetof(struct lwp, l_ctxswtch)
-
-define P_MD_SYSCALL offsetof(struct proc, p_md.md_syscall)
-
-define CI_SIZE sizeof(struct cpu_info)
-define CI_CURLWP offsetof(struct cpu_info, ci_curlwp)
-define CI_CURPCB offsetof(struct cpu_info, ci_curpcb)
-define CI_CURPM offsetof(struct cpu_info, ci_curpm)
-define CI_WANT_RESCHED offsetof(struct cpu_info, ci_want_resched)
-define CI_CPL offsetof(struct cpu_info, ci_cpl)
-define CI_IDEPTH offsetof(struct cpu_info, ci_idepth)
-define CI_TEMPSAVE offsetof(struct cpu_info, ci_tempsave)
-define CI_DDBSAVE offsetof(struct cpu_info, ci_ddbsave)
-define CI_IPKDBSAVE offsetof(struct cpu_info, ci_ipkdbsave)
-define CI_DISISAVE offsetof(struct cpu_info, ci_disisave)
-define CI_IDLESPIN offsetof(struct cpu_info, ci_idlespin)
-define CI_MTX_COUNT offsetof(struct cpu_info, ci_mtx_count)
-
-define CPUSAVE_R28 CPUSAVE_R28*sizeof(register_t)
-define CPUSAVE_R29 CPUSAVE_R29*sizeof(register_t)
-define CPUSAVE_R30 CPUSAVE_R30*sizeof(register_t)
-define CPUSAVE_R31 CPUSAVE_R31*sizeof(register_t)
-define CPUSAVE_DAR CPUSAVE_DAR*sizeof(register_t)
-define CPUSAVE_DSISR CPUSAVE_DSISR*sizeof(register_t)
-define CPUSAVE_SRR0 CPUSAVE_SRR0*sizeof(register_t)
-define CPUSAVE_SRR1 CPUSAVE_SRR1*sizeof(register_t)
-
-define FB_PC offsetof(struct faultbuf, fb_pc)
-define FB_SP offsetof(struct faultbuf, fb_sp)
-define FB_R2 offsetof(struct faultbuf, fb_r2)
-define FB_CR offsetof(struct faultbuf, fb_cr)
-define FB_R13 offsetof(struct faultbuf, fb_fixreg[0])
-define FB_R14 offsetof(struct faultbuf, fb_fixreg[1])
-define FB_R15 offsetof(struct faultbuf, fb_fixreg[2])
-define FB_R16 offsetof(struct faultbuf, fb_fixreg[3])
-define FB_R17 offsetof(struct faultbuf, fb_fixreg[4])
-define FB_R18 offsetof(struct faultbuf, fb_fixreg[5])
-define FB_R19 offsetof(struct faultbuf, fb_fixreg[6])
-define FB_R20 offsetof(struct faultbuf, fb_fixreg[7])
-define FB_R21 offsetof(struct faultbuf, fb_fixreg[8])
-define FB_R22 offsetof(struct faultbuf, fb_fixreg[9])
-define FB_R23 offsetof(struct faultbuf, fb_fixreg[10])
-define FB_R24 offsetof(struct faultbuf, fb_fixreg[11])
-define FB_R25 offsetof(struct faultbuf, fb_fixreg[12])
-define FB_R26 offsetof(struct faultbuf, fb_fixreg[13])
-define FB_R27 offsetof(struct faultbuf, fb_fixreg[14])
-define FB_R28 offsetof(struct faultbuf, fb_fixreg[15])
-define FB_R29 offsetof(struct faultbuf, fb_fixreg[16])
-define FB_R30 offsetof(struct faultbuf, fb_fixreg[17])
-define FB_R31 offsetof(struct faultbuf, fb_fixreg[18])
-
-define CACHELINESIZE CACHELINESIZE
-
-define CPU_CI offsetof(struct cpu_info, ci_ci)
-
-define OEACPU_64 OEACPU_64
-define OEACPU_64_BRIDGE OEACPU_64_BRIDGE
-define OEACPU_NOBAT OEACPU_NOBAT
-define OEACPU_HIGHBAT OEACPU_HIGHBAT
-define OEACPU_601 OEACPU_601
-define OEACPU_HIGHSPRG OEACPU_HIGHSPRG
-define OEACPU_ALTIVEC OEACPU_ALTIVEC
-
-ifdef __HAVE_MUTEX_STUBS
-define __HAVE_MUTEX_STUBS __HAVE_MUTEX_STUBS
-endif
-ifdef __HAVE_MUTEX_SPIN_STUBS
-define __HAVE_MUTEX_SPIN_STUBS __HAVE_MUTEX_SPIN_STUBS
-endif
-define MTX_OWNER offsetof(struct kmutex, mtx_owner)
-define MTX_LOCK offsetof(struct kmutex, mtx_lock)
-define MTX_IPL offsetof(struct kmutex, mtx_ipl)
-
-ifdef __HAVE_RW_STUBS
-define __HAVE_RW_STUBS __HAVE_RW_STUBS
-endif
-define RW_OWNER offsetof(struct krwlock, rw_owner)
-define RW_WRITE_LOCKED RW_WRITE_LOCKED
-define RW_READ_INCR RW_READ_INCR
-define RW_READER RW_READER
-
-define MSR_PR 31-ilog2(PSL_PR)
Index: src/sys/arch/prep/prep/locore.S
diff -u src/sys/arch/prep/prep/locore.S:1.16 src/sys/arch/prep/prep/locore.S:1.17
--- src/sys/arch/prep/prep/locore.S:1.16 Mon Jan 17 08:23:56 2011
+++ src/sys/arch/prep/prep/locore.S Sat Jun 18 21:17:30 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.16 2011/01/17 08:23:56 matt Exp $ */
+/* $NetBSD: locore.S,v 1.17 2011/06/18 21:17:30 matt Exp $ */
/* $OpenBSD: locore.S,v 1.4 1997/01/26 09:06:38 rahnds Exp $ */
/*
@@ -43,7 +43,6 @@
#include <sys/syscall.h>
#include <machine/param.h>
-#include <machine/vmparam.h>
#include <machine/pmap.h>
#include <machine/psl.h>
#include <machine/trap.h>
Index: src/sys/arch/rs6000/rs6000/locore.S
diff -u src/sys/arch/rs6000/rs6000/locore.S:1.8 src/sys/arch/rs6000/rs6000/locore.S:1.9
--- src/sys/arch/rs6000/rs6000/locore.S:1.8 Mon Jan 17 08:23:57 2011
+++ src/sys/arch/rs6000/rs6000/locore.S Sat Jun 18 21:17:30 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.8 2011/01/17 08:23:57 matt Exp $ */
+/* $NetBSD: locore.S,v 1.9 2011/06/18 21:17:30 matt Exp $ */
/* $OpenBSD: locore.S,v 1.4 1997/01/26 09:06:38 rahnds Exp $ */
/*
@@ -43,7 +43,6 @@
#include <sys/syscall.h>
#include <machine/param.h>
-#include <machine/vmparam.h>
#include <machine/pmap.h>
#include <machine/psl.h>
#include <machine/trap.h>
Index: src/sys/arch/sandpoint/sandpoint/locore.S
diff -u src/sys/arch/sandpoint/sandpoint/locore.S:1.21 src/sys/arch/sandpoint/sandpoint/locore.S:1.22
--- src/sys/arch/sandpoint/sandpoint/locore.S:1.21 Sat Mar 12 16:46:31 2011
+++ src/sys/arch/sandpoint/sandpoint/locore.S Sat Jun 18 21:17:30 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.21 2011/03/12 16:46:31 phx Exp $ */
+/* $NetBSD: locore.S,v 1.22 2011/06/18 21:17:30 matt Exp $ */
/* $OpenBSD: locore.S,v 1.4 1997/01/26 09:06:38 rahnds Exp $ */
/*
@@ -43,7 +43,6 @@
#include <sys/syscall.h>
#include <machine/param.h>
-#include <machine/vmparam.h>
#include <machine/pmap.h>
#include <machine/psl.h>
#include <machine/trap.h>
Added files:
Index: src/sys/arch/powerpc/powerpc/genassym.cf
diff -u /dev/null src/sys/arch/powerpc/powerpc/genassym.cf:1.7
--- /dev/null Sat Jun 18 21:17:30 2011
+++ src/sys/arch/powerpc/powerpc/genassym.cf Sat Jun 18 21:17:29 2011
@@ -0,0 +1,227 @@
+# $NetBSD: genassym.cf,v 1.7 2011/06/18 21:17:29 matt Exp $
+
+#-
+# Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# This code is derived from software contributed to The NetBSD Foundation
+# by Raytheon BBN Technologies Corp and Defense Advanced Research Projects
+# Agency and which was developed by Matt Thomas of 3am Software Foundry.
+#
+# This material is based upon work supported by the Defense Advanced Research
+# Projects Agency and Space and Naval Warfare Systems Center, Pacific, under
+# Contract No. N66001-09-C-2073.
+# Approved for Public Release, Distribution Unlimited
+#
+# Copyright (c) 2010 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# This code is derived from software contributed to The NetBSD Foundation
+# by Matt Thomas of 3am Software Foundry.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#+
+
+include "opt_ppcarch.h"
+
+quote #define __MUTEX_PRIVATE
+quote #define __RWLOCK_PRIVATE
+quote #define __INTR_PRIVATE
+
+include <sys/param.h>
+include <sys/intr.h>
+include <sys/cpu.h>
+include <sys/mutex.h>
+include <sys/rwlock.h>
+include <sys/lwp.h>
+include <sys/proc.h>
+include <sys/bitops.h>
+
+include <uvm/uvm_extern.h>
+
+include <machine/pcb.h>
+include <machine/frame.h>
+
+define IPL_HIGH IPL_HIGH
+define IPL_SCHED IPL_SCHED
+define IPL_VM IPL_VM
+
+define FRAMELEN FRAMELEN
+define FRAME_TF offsetof(struct ktrapframe, ktf_tf)
+define FRAME_R0 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[0])
+define FRAME_R1 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[1])
+define FRAME_R2 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[2])
+define FRAME_R3 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[3])
+define FRAME_R4 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[4])
+define FRAME_R5 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[5])
+define FRAME_R6 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[6])
+define FRAME_R7 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[7])
+define FRAME_R8 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[8])
+define FRAME_R9 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[9])
+define FRAME_R10 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[10])
+define FRAME_R11 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[11])
+define FRAME_R12 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[12])
+define FRAME_R13 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[13])
+define FRAME_R14 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[14])
+define FRAME_R15 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[15])
+define FRAME_R16 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[16])
+define FRAME_R17 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[17])
+define FRAME_R18 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[18])
+define FRAME_R19 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[19])
+define FRAME_R20 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[20])
+define FRAME_R21 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[21])
+define FRAME_R22 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[22])
+define FRAME_R23 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[23])
+define FRAME_R24 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[24])
+define FRAME_R25 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[25])
+define FRAME_R26 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[26])
+define FRAME_R27 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[27])
+define FRAME_R28 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[28])
+define FRAME_R29 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[29])
+define FRAME_R30 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[30])
+define FRAME_R31 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[31])
+define FRAME_LR offsetof(struct ktrapframe, ktf_tf.tf_lr)
+define FRAME_CR offsetof(struct ktrapframe, ktf_tf.tf_cr)
+define FRAME_CTR offsetof(struct ktrapframe, ktf_tf.tf_ctr)
+define FRAME_XER offsetof(struct ktrapframe, ktf_tf.tf_xer)
+define FRAME_CF offsetof(struct ktrapframe, ktf_tf.tf_cf)
+define FRAME_SRR0 offsetof(struct ktrapframe, ktf_tf.tf_srr0)
+define FRAME_SRR1 offsetof(struct ktrapframe, ktf_tf.tf_srr1)
+define FRAME_IDEPTH offsetof(struct ktrapframe, ktf_tf.tf_idepth)
+define FRAME_EXC offsetof(struct ktrapframe, ktf_tf.tf_exc)
+
+define CALLFRAMELEN CALLFRAMELEN
+define CFRAME_SP offsetof(struct callframe, cf_sp)
+define CFRAME_LR offsetof(struct callframe, cf_lr)
+define CFRAME_R30 offsetof(struct callframe, cf_r30)
+define CFRAME_R31 offsetof(struct callframe, cf_r31)
+
+define SFRAMELEN SFRAMELEN
+define SFRAME_SP offsetof(struct switchframe, sf_sp)
+define SFRAME_LR offsetof(struct switchframe, sf_lr)
+define SFRAME_USER_SR offsetof(struct switchframe, sf_user_sr)
+define SFRAME_CR offsetof(struct switchframe, sf_cr)
+define SFRAME_R2 offsetof(struct switchframe, sf_fixreg2)
+define SFRAME_R13 offsetof(struct switchframe, sf_fixreg[0])
+define SFRAME_R14 offsetof(struct switchframe, sf_fixreg[1])
+define SFRAME_R15 offsetof(struct switchframe, sf_fixreg[2])
+define SFRAME_R16 offsetof(struct switchframe, sf_fixreg[3])
+define SFRAME_R17 offsetof(struct switchframe, sf_fixreg[4])
+define SFRAME_R18 offsetof(struct switchframe, sf_fixreg[5])
+define SFRAME_R19 offsetof(struct switchframe, sf_fixreg[6])
+define SFRAME_R20 offsetof(struct switchframe, sf_fixreg[7])
+define SFRAME_R21 offsetof(struct switchframe, sf_fixreg[8])
+define SFRAME_R22 offsetof(struct switchframe, sf_fixreg[9])
+define SFRAME_R23 offsetof(struct switchframe, sf_fixreg[10])
+define SFRAME_R24 offsetof(struct switchframe, sf_fixreg[11])
+define SFRAME_R25 offsetof(struct switchframe, sf_fixreg[12])
+define SFRAME_R26 offsetof(struct switchframe, sf_fixreg[13])
+define SFRAME_R27 offsetof(struct switchframe, sf_fixreg[14])
+define SFRAME_R28 offsetof(struct switchframe, sf_fixreg[15])
+define SFRAME_R29 offsetof(struct switchframe, sf_fixreg[16])
+define SFRAME_R30 offsetof(struct switchframe, sf_fixreg[17])
+define SFRAME_R31 offsetof(struct switchframe, sf_fixreg[18])
+
+define PCB_PM offsetof(struct pcb, pcb_pm)
+define PCB_SP offsetof(struct pcb, pcb_sp)
+define PCB_ONFAULT offsetof(struct pcb, pcb_onfault)
+define PCB_USPRG0 offsetof(struct pcb, pcb_usprg0)
+
+define L_CPU offsetof(struct lwp, l_cpu)
+define L_CTXSWTCH offsetof(struct lwp, l_ctxswtch)
+define L_MD_ASTPENDING offsetof(struct lwp, l_md.md_astpending)
+define L_MD_UTF offsetof(struct lwp, l_md.md_utf)
+define L_PCB offsetof(struct lwp, l_addr)
+define L_PROC offsetof(struct lwp, l_proc)
+
+define P_MD_SYSCALL offsetof(struct proc, p_md.md_syscall)
+
+define CI_SIZE sizeof(struct cpu_info)
+define CI_CURLWP offsetof(struct cpu_info, ci_curlwp)
+define CI_CURPCB offsetof(struct cpu_info, ci_curpcb)
+define CI_CURPM offsetof(struct cpu_info, ci_curpm)
+define CI_WANT_RESCHED offsetof(struct cpu_info, ci_want_resched)
+define CI_CPL offsetof(struct cpu_info, ci_cpl)
+define CI_IDEPTH offsetof(struct cpu_info, ci_idepth)
+define CI_IDLESPIN offsetof(struct cpu_info, ci_idlespin)
+define CI_IDLELWP offsetof(struct cpu_info, ci_data.cpu_idlelwp)
+define CI_MTX_COUNT offsetof(struct cpu_info, ci_mtx_count)
+define CI_MTX_OLDSPL offsetof(struct cpu_info, ci_mtx_oldspl)
+define CPU_CI offsetof(struct cpu_info, ci_ci)
+
+define FB_PC offsetof(struct faultbuf, fb_pc)
+define FB_MSR offsetof(struct faultbuf, fb_msr)
+define FB_SP offsetof(struct faultbuf, fb_sp)
+define FB_R2 offsetof(struct faultbuf, fb_r2)
+define FB_CR offsetof(struct faultbuf, fb_cr)
+define FB_R13 offsetof(struct faultbuf, fb_fixreg[0])
+define FB_R14 offsetof(struct faultbuf, fb_fixreg[1])
+define FB_R15 offsetof(struct faultbuf, fb_fixreg[2])
+define FB_R16 offsetof(struct faultbuf, fb_fixreg[3])
+define FB_R17 offsetof(struct faultbuf, fb_fixreg[4])
+define FB_R18 offsetof(struct faultbuf, fb_fixreg[5])
+define FB_R19 offsetof(struct faultbuf, fb_fixreg[6])
+define FB_R20 offsetof(struct faultbuf, fb_fixreg[7])
+define FB_R21 offsetof(struct faultbuf, fb_fixreg[8])
+define FB_R22 offsetof(struct faultbuf, fb_fixreg[9])
+define FB_R23 offsetof(struct faultbuf, fb_fixreg[10])
+define FB_R24 offsetof(struct faultbuf, fb_fixreg[11])
+define FB_R25 offsetof(struct faultbuf, fb_fixreg[12])
+define FB_R26 offsetof(struct faultbuf, fb_fixreg[13])
+define FB_R27 offsetof(struct faultbuf, fb_fixreg[14])
+define FB_R28 offsetof(struct faultbuf, fb_fixreg[15])
+define FB_R29 offsetof(struct faultbuf, fb_fixreg[16])
+define FB_R30 offsetof(struct faultbuf, fb_fixreg[17])
+define FB_R31 offsetof(struct faultbuf, fb_fixreg[18])
+
+define CACHELINESIZE CACHELINESIZE
+
+define PAGE_SIZE PAGE_SIZE
+define PAGE_MASK PAGE_MASK
+define PAGE_SHIFT PAGE_SHIFT
+
+ifdef __HAVE_FAST_SOFTINTS
+define __HAVE_FAST_SOFTINTS __HAVE_FAST_SOFTINTS
+endif
+
+ifdef __HAVE_MUTEX_STUBS
+define __HAVE_MUTEX_STUBS __HAVE_MUTEX_STUBS
+endif
+
+ifdef __HAVE_MUTEX_SPIN_STUBS
+define __HAVE_MUTEX_SPIN_STUBS __HAVE_MUTEX_SPIN_STUBS
+endif
+
+ifdef __HAVE_RW_STUBS
+define __HAVE_RW_STUBS __HAVE_RW_STUBS
+endif
+
+define MTX_OWNER offsetof(struct kmutex, mtx_owner)
+define MTX_LOCK offsetof(struct kmutex, mtx_lock)
+define MTX_IPL offsetof(struct kmutex, mtx_ipl)
+
+define RW_OWNER offsetof(struct krwlock, rw_owner)
+define RW_WRITE_LOCKED RW_WRITE_LOCKED
+define RW_READ_INCR RW_READ_INCR
+define RW_READER RW_READER
+
+define MSR_PR 31 - ilog2(PSL_PR)
