Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch Make a common genassym.cf (powerpc/genassym.cf) and...
details: https://anonhg.NetBSD.org/src/rev/1c144230c4ec
branches: trunk
changeset: 766210:1c144230c4ec
user: matt <matt%NetBSD.org@localhost>
date: Sat Jun 18 21:17:28 2011 +0000
description:
Make a common genassym.cf (powerpc/genassym.cf) and then
only put specific stuff in foo/genassym.cf
diffstat:
sys/arch/amigappc/amigappc/locore.S | 3 +-
sys/arch/bebox/bebox/locore.S | 3 +-
sys/arch/evbppc/ev64260/ev64260_locore.S | 3 +-
sys/arch/evbppc/pmppc/pmppc_locore.S | 3 +-
sys/arch/ibmnws/ibmnws/locore.S | 3 +-
sys/arch/macppc/macppc/locore.S | 3 +-
sys/arch/mvmeppc/mvmeppc/locore.S | 3 +-
sys/arch/ofppc/ofppc/locore.S | 3 +-
sys/arch/powerpc/booke/genassym.cf | 173 +-----------------------
sys/arch/powerpc/conf/Makefile.powerpc | 8 +-
sys/arch/powerpc/ibm4xx/genassym.cf | 161 +---------------------
sys/arch/powerpc/oea/genassym.cf | 197 +++-----------------------
sys/arch/powerpc/powerpc/genassym.cf | 227 +++++++++++++++++++++++++++++++
sys/arch/prep/prep/locore.S | 3 +-
sys/arch/rs6000/rs6000/locore.S | 3 +-
sys/arch/sandpoint/sandpoint/locore.S | 3 +-
16 files changed, 267 insertions(+), 532 deletions(-)
diffs (truncated from 1093 to 300 lines):
diff -r 47eed4a54395 -r 1c144230c4ec sys/arch/amigappc/amigappc/locore.S
--- a/sys/arch/amigappc/amigappc/locore.S Sat Jun 18 21:14:43 2011 +0000
+++ b/sys/arch/amigappc/amigappc/locore.S Sat Jun 18 21:17:28 2011 +0000
@@ -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>
diff -r 47eed4a54395 -r 1c144230c4ec sys/arch/bebox/bebox/locore.S
--- a/sys/arch/bebox/bebox/locore.S Sat Jun 18 21:14:43 2011 +0000
+++ b/sys/arch/bebox/bebox/locore.S Sat Jun 18 21:17:28 2011 +0000
@@ -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>
diff -r 47eed4a54395 -r 1c144230c4ec sys/arch/evbppc/ev64260/ev64260_locore.S
--- a/sys/arch/evbppc/ev64260/ev64260_locore.S Sat Jun 18 21:14:43 2011 +0000
+++ b/sys/arch/evbppc/ev64260/ev64260_locore.S Sat Jun 18 21:17:28 2011 +0000
@@ -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>
diff -r 47eed4a54395 -r 1c144230c4ec sys/arch/evbppc/pmppc/pmppc_locore.S
--- a/sys/arch/evbppc/pmppc/pmppc_locore.S Sat Jun 18 21:14:43 2011 +0000
+++ b/sys/arch/evbppc/pmppc/pmppc_locore.S Sat Jun 18 21:17:28 2011 +0000
@@ -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>
diff -r 47eed4a54395 -r 1c144230c4ec sys/arch/ibmnws/ibmnws/locore.S
--- a/sys/arch/ibmnws/ibmnws/locore.S Sat Jun 18 21:14:43 2011 +0000
+++ b/sys/arch/ibmnws/ibmnws/locore.S Sat Jun 18 21:17:28 2011 +0000
@@ -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>
diff -r 47eed4a54395 -r 1c144230c4ec sys/arch/macppc/macppc/locore.S
--- a/sys/arch/macppc/macppc/locore.S Sat Jun 18 21:14:43 2011 +0000
+++ b/sys/arch/macppc/macppc/locore.S Sat Jun 18 21:17:28 2011 +0000
@@ -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>
diff -r 47eed4a54395 -r 1c144230c4ec sys/arch/mvmeppc/mvmeppc/locore.S
--- a/sys/arch/mvmeppc/mvmeppc/locore.S Sat Jun 18 21:14:43 2011 +0000
+++ b/sys/arch/mvmeppc/mvmeppc/locore.S Sat Jun 18 21:17:28 2011 +0000
@@ -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>
diff -r 47eed4a54395 -r 1c144230c4ec sys/arch/ofppc/ofppc/locore.S
--- a/sys/arch/ofppc/ofppc/locore.S Sat Jun 18 21:14:43 2011 +0000
+++ b/sys/arch/ofppc/ofppc/locore.S Sat Jun 18 21:17:28 2011 +0000
@@ -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>
diff -r 47eed4a54395 -r 1c144230c4ec sys/arch/powerpc/booke/genassym.cf
--- a/sys/arch/powerpc/booke/genassym.cf Sat Jun 18 21:14:43 2011 +0000
+++ b/sys/arch/powerpc/booke/genassym.cf Sat Jun 18 21:17:28 2011 +0000
@@ -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])
Home |
Main Index |
Thread Index |
Old Index