Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch Use a common genassym.cf for all the PPC_MPC6XX por...
details: https://anonhg.NetBSD.org/src/rev/bdc35cabab44
branches: trunk
changeset: 525851:bdc35cabab44
user: matt <matt%NetBSD.org@localhost>
date: Thu Apr 18 20:08:05 2002 +0000
description:
Use a common genassym.cf for all the PPC_MPC6XX ports. Add a makeoptions to
std.foo to indicate the directory to get genassym.cf from. Add an intrframe
to <powerpc/frame.h> and make trap_subr.S use symbolic offsets into it.
diffstat:
sys/arch/amigappc/amigappc/genassym.cf | 73 --------------------
sys/arch/amigappc/conf/std.amigappc | 4 +-
sys/arch/bebox/bebox/genassym.cf | 74 --------------------
sys/arch/bebox/conf/std.bebox | 3 +-
sys/arch/macppc/conf/std.macppc | 3 +-
sys/arch/macppc/macppc/genassym.cf | 95 --------------------------
sys/arch/mvmeppc/conf/std.mvmeppc | 3 +-
sys/arch/mvmeppc/mvmeppc/genassym.cf | 77 ---------------------
sys/arch/powerpc/conf/Makefile.powerpc | 6 +-
sys/arch/powerpc/include/frame.h | 31 ++++++++-
sys/arch/powerpc/include/reg.h | 28 +++++++-
sys/arch/powerpc/mpc6xx/genassym.cf | 118 +++++++++++++++++++++++++++++++++
sys/arch/powerpc/powerpc/trap_subr.S | 96 +++++++++++++-------------
sys/arch/prep/conf/std.prep | 3 +-
sys/arch/prep/prep/genassym.cf | 74 --------------------
15 files changed, 239 insertions(+), 449 deletions(-)
diffs (truncated from 871 to 300 lines):
diff -r cb091dfc95f2 -r bdc35cabab44 sys/arch/amigappc/amigappc/genassym.cf
--- a/sys/arch/amigappc/amigappc/genassym.cf Thu Apr 18 19:48:41 2002 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,73 +0,0 @@
-# $NetBSD: genassym.cf,v 1.4 2001/11/29 20:04:19 atatat Exp $
-
-#
-# Copyright (C) 1995, 1996 Wolfgang Solfrank.
-# Copyright (C) 1995, 1996 TooLs GmbH.
-# All rights reserved.
-#
-# 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.
-# 3. All advertising materials mentioning features or use of this software
-# must display the following acknowledgement:
-# This product includes software developed by TooLs GmbH.
-# 4. The name of TooLs GmbH may not be used to endorse or promote products
-# derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY TOOLS GMBH ``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 TOOLS GMBH 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 <sys/param.h>
-include <sys/time.h>
-include <sys/proc.h>
-
-include <uvm/uvm.h>
-
-include <machine/pcb.h>
-include <machine/pmap.h>
-
-define FRAMELEN FRAMELEN
-define FRAME_0 offsetof(struct trapframe, fixreg[0])
-define FRAME_1 offsetof(struct trapframe, fixreg[1])
-define FRAME_2 offsetof(struct trapframe, fixreg[2])
-define FRAME_3 offsetof(struct trapframe, fixreg[3])
-define FRAME_LR offsetof(struct trapframe, lr)
-define FRAME_CR offsetof(struct trapframe, cr)
-define FRAME_CTR offsetof(struct trapframe, ctr)
-define FRAME_XER offsetof(struct trapframe, xer)
-define FRAME_SRR0 offsetof(struct trapframe, srr0)
-define FRAME_SRR1 offsetof(struct trapframe, srr1)
-define FRAME_DAR offsetof(struct trapframe, dar)
-define FRAME_DSISR offsetof(struct trapframe, dsisr)
-define FRAME_EXC offsetof(struct trapframe, exc)
-
-define SFRAMELEN roundup(sizeof(struct switchframe), 16)
-
-define PCB_PMR offsetof(struct pcb, pcb_pmreal)
-define PCB_SP offsetof(struct pcb, pcb_sp)
-define PCB_SPL offsetof(struct pcb, pcb_spl)
-define PCB_FAULT offsetof(struct pcb, pcb_onfault)
-
-define PM_USRSR offsetof(struct pmap, pm_sr[USER_SR])
-define PM_KERNELSR offsetof(struct pmap, pm_sr[KERNEL_SR])
-
-define P_FORW offsetof(struct proc, p_forw)
-define P_BACK offsetof(struct proc, p_back)
-define P_ADDR offsetof(struct proc, p_addr)
-define P_STAT offsetof(struct proc, p_stat)
-
-define SONPROC SONPROC
diff -r cb091dfc95f2 -r bdc35cabab44 sys/arch/amigappc/conf/std.amigappc
--- a/sys/arch/amigappc/conf/std.amigappc Thu Apr 18 19:48:41 2002 +0000
+++ b/sys/arch/amigappc/conf/std.amigappc Thu Apr 18 20:08:05 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: std.amigappc,v 1.1 2000/05/25 22:11:58 is Exp $
+# $NetBSD: std.amigappc,v 1.2 2002/04/18 20:08:08 matt Exp $
# standard amiga information
@@ -12,3 +12,5 @@
options EXEC_ELF
options EXEC_SCRIPT
+options PPC_MPC6XX
+makeoptions PPCDIR="mpc6xx" # Tell Makefile.powerpc what dir to use
diff -r cb091dfc95f2 -r bdc35cabab44 sys/arch/bebox/bebox/genassym.cf
--- a/sys/arch/bebox/bebox/genassym.cf Thu Apr 18 19:48:41 2002 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,74 +0,0 @@
-# $NetBSD: genassym.cf,v 1.5 2001/07/01 21:41:02 matt Exp $
-
-#
-# Copyright (C) 1995, 1996 Wolfgang Solfrank.
-# Copyright (C) 1995, 1996 TooLs GmbH.
-# All rights reserved.
-#
-# 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.
-# 3. All advertising materials mentioning features or use of this software
-# must display the following acknowledgement:
-# This product includes software developed by TooLs GmbH.
-# 4. The name of TooLs GmbH may not be used to endorse or promote products
-# derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY TOOLS GMBH ``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 TOOLS GMBH 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 <sys/param.h>
-include <sys/time.h>
-include <sys/proc.h>
-
-include <uvm/uvm.h>
-
-include <machine/pcb.h>
-include <machine/pmap.h>
-
-define FRAMELEN FRAMELEN
-define FRAME_0 offsetof(struct trapframe, fixreg[0])
-define FRAME_1 offsetof(struct trapframe, fixreg[1])
-define FRAME_2 offsetof(struct trapframe, fixreg[2])
-define FRAME_3 offsetof(struct trapframe, fixreg[3])
-define FRAME_LR offsetof(struct trapframe, lr)
-define FRAME_CR offsetof(struct trapframe, cr)
-define FRAME_CTR offsetof(struct trapframe, ctr)
-define FRAME_XER offsetof(struct trapframe, xer)
-define FRAME_SRR0 offsetof(struct trapframe, srr0)
-define FRAME_SRR1 offsetof(struct trapframe, srr1)
-define FRAME_DAR offsetof(struct trapframe, dar)
-define FRAME_DSISR offsetof(struct trapframe, dsisr)
-define FRAME_EXC offsetof(struct trapframe, exc)
-
-define SFRAMELEN roundup(sizeof(struct switchframe), 16)
-
-define PCB_PMR offsetof(struct pcb, pcb_pmreal)
-define PCB_SP offsetof(struct pcb, pcb_sp)
-define PCB_SPL offsetof(struct pcb, pcb_spl)
-define PCB_FAULT offsetof(struct pcb, pcb_onfault)
-
-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])
-
-define P_FORW offsetof(struct proc, p_forw)
-define P_BACK offsetof(struct proc, p_back)
-define P_ADDR offsetof(struct proc, p_addr)
-define P_STAT offsetof(struct proc, p_stat)
-
-define SONPROC SONPROC
diff -r cb091dfc95f2 -r bdc35cabab44 sys/arch/bebox/conf/std.bebox
--- a/sys/arch/bebox/conf/std.bebox Thu Apr 18 19:48:41 2002 +0000
+++ b/sys/arch/bebox/conf/std.bebox Thu Apr 18 20:08:05 2002 +0000
@@ -1,10 +1,11 @@
-# $NetBSD: std.bebox,v 1.8 2001/11/20 12:56:23 lukem Exp $
+# $NetBSD: std.bebox,v 1.9 2002/04/18 20:08:07 matt Exp $
#
# standard, required NetBSD/bebox 'options'
machine bebox powerpc
options PPC_MPC6XX # BeBox uses Motorola PPC60x CPUs
+makeoptions PPCDIR="mpc6xx" # Tell Makefile.powerpc what dir to use
options EXEC_ELF32 # exec ELF binaries
options EXEC_SCRIPT # exec #! scripts
diff -r cb091dfc95f2 -r bdc35cabab44 sys/arch/macppc/conf/std.macppc
--- a/sys/arch/macppc/conf/std.macppc Thu Apr 18 19:48:41 2002 +0000
+++ b/sys/arch/macppc/conf/std.macppc Thu Apr 18 20:08:05 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: std.macppc,v 1.12 2001/06/12 17:36:55 tsubai Exp $
+# $NetBSD: std.macppc,v 1.13 2002/04/18 20:08:08 matt Exp $
#
# Standard/required options for NetBSD/macppc.
@@ -6,6 +6,7 @@
# standard ("mandatory") kernel options.
options PPC_MPC6XX # OEA class PowerPC chips
+makeoptions PPCDIR="mpc6xx" # Tell Makefile.powerpc what dir to use
# Executable support:
options EXEC_ELF32 # (native) ELF32 binary support
diff -r cb091dfc95f2 -r bdc35cabab44 sys/arch/macppc/macppc/genassym.cf
--- a/sys/arch/macppc/macppc/genassym.cf Thu Apr 18 19:48:41 2002 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,95 +0,0 @@
-# $NetBSD: genassym.cf,v 1.9 2001/11/29 00:16:35 mjl Exp $
-
-#
-# Copyright (C) 1995, 1996 Wolfgang Solfrank.
-# Copyright (C) 1995, 1996 TooLs GmbH.
-# All rights reserved.
-#
-# 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.
-# 3. All advertising materials mentioning features or use of this software
-# must display the following acknowledgement:
-# This product includes software developed by TooLs GmbH.
-# 4. The name of TooLs GmbH may not be used to endorse or promote products
-# derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY TOOLS GMBH ``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 TOOLS GMBH 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 <sys/param.h>
-include <sys/time.h>
-include <sys/proc.h>
-
-include <uvm/uvm_extern.h>
-
-include <machine/pcb.h>
-include <machine/pmap.h>
-
-include <powerpc/cpu.h>
-
-define FRAMELEN FRAMELEN
-define FRAME_0 offsetof(struct trapframe, fixreg[0])
-define FRAME_1 offsetof(struct trapframe, fixreg[1])
-define FRAME_2 offsetof(struct trapframe, fixreg[2])
-define FRAME_3 offsetof(struct trapframe, fixreg[3])
-define FRAME_LR offsetof(struct trapframe, lr)
-define FRAME_CR offsetof(struct trapframe, cr)
-define FRAME_CTR offsetof(struct trapframe, ctr)
-define FRAME_XER offsetof(struct trapframe, xer)
-define FRAME_SRR0 offsetof(struct trapframe, srr0)
-define FRAME_SRR1 offsetof(struct trapframe, srr1)
-define FRAME_DAR offsetof(struct trapframe, dar)
-define FRAME_DSISR offsetof(struct trapframe, dsisr)
-define FRAME_EXC offsetof(struct trapframe, exc)
-
-define SFRAMELEN roundup(sizeof(struct switchframe), 16)
-
-define PCB_PMR offsetof(struct pcb, pcb_pmreal)
-define PCB_SP offsetof(struct pcb, pcb_sp)
-define PCB_SPL offsetof(struct pcb, pcb_spl)
-define PCB_FAULT offsetof(struct pcb, pcb_onfault)
-
-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])
-
-define P_FORW offsetof(struct proc, p_forw)
-define P_BACK offsetof(struct proc, p_back)
-define P_ADDR offsetof(struct proc, p_addr)
-define P_STAT offsetof(struct proc, p_stat)
-define P_CPU offsetof(struct proc, p_cpu)
-
-define SONPROC SONPROC
-
-define CI_SIZE sizeof(struct cpu_info)
-define CI_CURPROC offsetof(struct cpu_info, ci_curproc)
-define CI_CURPCB offsetof(struct cpu_info, ci_curpcb)
-define CI_CURPM offsetof(struct cpu_info, ci_curpm)
-define CI_IDLE_PCB offsetof(struct cpu_info, ci_idle_pcb)
-define CI_ASTPENDING offsetof(struct cpu_info, ci_astpending)
-define CI_WANT_RESCHED offsetof(struct cpu_info, ci_want_resched)
-define CI_CPL offsetof(struct cpu_info, ci_cpl)
-define CI_INTRDEPTH offsetof(struct cpu_info, ci_intrdepth)
-define CI_INTSTK offsetof(struct cpu_info, ci_intstk)
-define CI_SPILLSTK offsetof(struct cpu_info, ci_spillstk)
-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)
Home |
Main Index |
Thread Index |
Old Index