Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/sun3 convert to use genassym.cf & genassym.sh, as o...
details: https://anonhg.NetBSD.org/src/rev/08af0ddcd540
branches: trunk
changeset: 500186:08af0ddcd540
user: jdolecek <jdolecek%NetBSD.org@localhost>
date: Thu Dec 07 17:51:06 2000 +0000
description:
convert to use genassym.cf & genassym.sh, as other ports do
diffstat:
sys/arch/sun3/conf/Makefile.sun3 | 22 +--
sys/arch/sun3/sun3/genassym.c | 234 ---------------------------------------
sys/arch/sun3/sun3/genassym.cf | 171 ++++++++++++++++++++++++++++
sys/arch/sun3/sun3x/genassym.c | 228 --------------------------------------
sys/arch/sun3/sun3x/genassym.cf | 165 +++++++++++++++++++++++++++
5 files changed, 345 insertions(+), 475 deletions(-)
diffs (truncated from 857 to 300 lines):
diff -r 61278f0d4874 -r 08af0ddcd540 sys/arch/sun3/conf/Makefile.sun3
--- a/sys/arch/sun3/conf/Makefile.sun3 Thu Dec 07 17:44:03 2000 +0000
+++ b/sys/arch/sun3/conf/Makefile.sun3 Thu Dec 07 17:51:06 2000 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.sun3,v 1.82 2000/05/09 00:56:28 hubertf Exp $
+# $NetBSD: Makefile.sun3,v 1.83 2000/12/07 17:51:06 jdolecek Exp $
# Makefile for NetBSD
#
@@ -147,17 +147,10 @@
# LOAD-
-# Use awk to cross-build assym.h from the genassym.s file.
-assym.h: genassym.o $S/kern/genassym.awk
- awk -f $S/kern/genassym.awk < genassym.s > assym.h.tmp
- mv -f assym.h.tmp $@
-
-# The above rule lists genassym.o as a prerequisite so that the
-# generated .depend rule is effective, even though we actually
-# use genassym.s instead. This always creates both.
-genassym.o: ${SUN3}/${MACHTYPE}/genassym.c
- ${CC} ${CPPFLAGS} -S $<
- ${CC} -c $*.s
+assym.h: $S/kern/genassym.sh ${SUN3}/${MACHTYPE}/genassym.cf
+ sh $S/kern/genassym.sh ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} \
+ < ${SUN3}/${MACHTYPE}/genassym.cf > assym.h.tmp && \
+ mv -f assym.h.tmp assym.h
param.c: $S/conf/param.c
rm -f param.c
@@ -207,7 +200,10 @@
depend: .depend
.depend: ${SRCS} assym.h param.c
${MKDEP} ${CPPFLAGS} param.c ioconf.c ${CFILES}
- ${MKDEP} -a ${CPPFLAGS} ${SUN3}/${MACHTYPE}/genassym.c
+ sh $S/kern/genassym.sh ${MKDEP} -f assym.dep ${CFLAGS} \
+ ${CPPFLAGS} < ${SUN3}/${MACHTYPE}/genassym.cf
+ @sed -e 's/.*\.o:.*\.c/assym.h:/' < assym.dep >> .depend
+ @rm -f assym.dep
dependall: depend all
diff -r 61278f0d4874 -r 08af0ddcd540 sys/arch/sun3/sun3/genassym.c
--- a/sys/arch/sun3/sun3/genassym.c Thu Dec 07 17:44:03 2000 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,234 +0,0 @@
-/* $NetBSD: genassym.c,v 1.52 2000/06/29 07:19:06 mrg Exp $ */
-
-/*
- * Copyright (c) 1994, 1995 Gordon W. Ross
- * Copyright (c) 1993 Adam Glass
- * Copyright (c) 1982, 1990, 1993
- * The Regents of the University of California. 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
- *
- * from: @(#)genassym.c 8.3 (Berkeley) 1/4/94
- */
-
-/*
- * This program is designed so that it can be both:
- * (1) Run on the native machine to generate assym.h
- * (2) Converted to assembly that genassym.awk will
- * translate into the same assym.h as (1) does.
- * The second method is done as follows:
- * m68k-xxx-gcc [options] -S .../genassym.c
- * awk -f genassym.awk < genassym.s > assym.h
- *
- * Using actual C code here (instead of genassym.cf)
- * has the advantage that "make depend" automatically
- * tracks dependencies of this C code on the (many)
- * header files used here. Also, the awk script used
- * to convert the assembly output to assym.h is much
- * smaller and simpler than sys/kern/genassym.sh.
- *
- * Both this method and the genassym.cf method have the
- * disadvantage that they depend on gcc-specific features.
- * This method depends on the format of assembly output for
- * data, and the genassym.cf method depends on features of
- * the gcc asm() statement (inline assembly).
- */
-
-#include "opt_compat_svr4.h"
-
-#include <sys/param.h>
-#include <sys/cdefs.h>
-#include <sys/errno.h>
-#include <sys/proc.h>
-#include <sys/syscall.h>
-
-#include <uvm/uvm_extern.h>
-
-#ifdef COMPAT_SVR4
-#include <compat/svr4/svr4_syscall.h>
-#include <compat/svr4/svr4_ucontext.h>
-#endif
-
-#include <machine/cpu.h>
-#include <machine/dvma.h>
-#include <machine/mon.h>
-#include <machine/pcb.h>
-#include <machine/pmap.h>
-#include <machine/psl.h>
-#include <machine/pte.h>
-#include <machine/vmparam.h>
-
-#include <sun3/sun3/buserr.h>
-#include <sun3/sun3/cache.h>
-#include <sun3/sun3/control.h>
-#include <sun3/sun3/fc.h>
-
-#include <sun3/sun3/enable.h>
-
-/* Note: Avoid /usr/include for cross compilation! */
-extern void printf __P((const char *fmt, ...));
-extern void exit __P((int));
-
-#define def(name, value) { name, value }
-
-#ifdef __STDC__
-#define def1(name) def(#name, name)
-#else
-#define def1(name) def("name", name)
-#endif
-
-#define offsetof(type, member) ((size_t)(&((type *)0)->member))
-
-/*
- * Note: genassym.awk cares about the form of this structure,
- * as well as the names and placement of the "asdefs" array
- * and the "nassefs" variable below. Clever, but fragile.
- */
-struct nv {
- char n[28];
- int v;
-};
-
-struct nv assyms[] = {
-
- /* XXX: for copy.s */
- def("M68020", 1),
-
- /* bus error stuff */
- def1(BUSERR_REG),
- def1(BUSERR_MMU),
-
- /* 68k isms */
- def1(PSL_LOWIPL),
- def1(PSL_HIGHIPL),
- def1(PSL_USER),
- def1(PSL_S),
- def("PSL_TS", PSL_T | PSL_S),
- def1(FC_CONTROL),
- def1(FC_SUPERD),
- def1(FC_USERD),
- def1(IC_CLEAR),
-
- /* sun3 control space isms */
- def1(CONTEXT_REG),
- def1(CONTEXT_NUM),
- def1(SYSTEM_ENAB),
- def1(ENA_FPP),
- def1(SEGMAP_BASE),
-
- /* sun3 memory map */
- def1(USRSTACK),
- def1(SUN3_MONSTART),
- def1(SUN3_PROM_BASE),
- def1(SUN3_MONEND),
-
- /* kernel-isms */
- def1(KERNBASE),
- def1(USPACE),
- def1(NBPG),
- def1(NBSG),
-
- /* system calls */
- def1(SYS_exit),
- def1(SYS___sigreturn14),
- def1(SYS_compat_13_sigreturn13),
-
- /* errno-isms */
- def1(EFAULT),
- def1(ENAMETOOLONG),
-
- /* trap types: locore.s includes trap.h */
-
- /*
- * unix structure-isms
- */
-
- /* proc fields and values */
- def("P_FORW", offsetof(struct proc, p_forw)),
- def("P_BACK", offsetof(struct proc, p_back)),
- def("P_VMSPACE", offsetof(struct proc, p_vmspace)),
- def("P_ADDR", offsetof(struct proc, p_addr)),
- def("P_PRIORITY", offsetof(struct proc, p_priority)),
- def("P_STAT", offsetof(struct proc, p_stat)),
- def("P_WCHAN", offsetof(struct proc, p_wchan)),
- def("P_FLAG", offsetof(struct proc, p_flag)),
- def("P_MDFLAG", offsetof(struct proc, p_md.md_flags)),
- def("P_MDREGS", offsetof(struct proc, p_md.md_regs)),
- def1(SRUN),
- def1(SONPROC),
-
- /* XXX: HP-UX trace bit? */
-
- /* VM/pmap structure fields */
- def("VM_PMAP", offsetof(struct vmspace, vm_map.pmap)),
- def("PM_CTXNUM", offsetof(struct pmap, pm_ctxnum)),
-
- /* pcb offsets */
- def("PCB_FLAGS", offsetof(struct pcb, pcb_flags)),
- def("PCB_PS", offsetof(struct pcb, pcb_ps)),
- def("PCB_USP", offsetof(struct pcb, pcb_usp)),
- def("PCB_REGS", offsetof(struct pcb, pcb_regs[0])),
- def("PCB_ONFAULT", offsetof(struct pcb, pcb_onfault)),
- def("PCB_FPCTX", offsetof(struct pcb, pcb_fpregs)),
- def("SIZEOF_PCB", sizeof(struct pcb)),
-
- /* exception frame offset/sizes */
- def("FR_SP", offsetof(struct trapframe, tf_regs[15])),
- def("FR_ADJ", offsetof(struct trapframe, tf_stackadj)),
- def("FR_HW", offsetof(struct trapframe, tf_sr)),
- def("FR_SIZE", sizeof(struct trapframe)),
-
- /* FP frame offsets */
- def("FPF_REGS", offsetof(struct fpframe, fpf_regs[0])),
- def("FPF_FPCR", offsetof(struct fpframe, fpf_fpcr)),
-
- /* SVR4 binary compatibility */
-#ifdef COMPAT_SVR4
- def("SVR4_SIGF_HANDLER", offsetof(struct svr4_sigframe, sf_handler)),
- def("SVR4_SIGF_UC", offsetof(struct svr4_sigframe, sf_uc)),
- def1(SVR4_SYS_context),
- def1(SVR4_SYS_exit),
- def1(SVR4_SETCONTEXT),
-#endif
-};
-int nassyms = sizeof(assyms)/sizeof(assyms[0]);
-
-main()
-{
- char *name;
- int i, val;
-
- for (i = 0; i < nassyms; i++) {
- name = assyms[i].n;
- val = assyms[i].v;
- printf("#define\t%s\t%d\n", name, val);
- }
-
- exit(0);
-}
diff -r 61278f0d4874 -r 08af0ddcd540 sys/arch/sun3/sun3/genassym.cf
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/sun3/sun3/genassym.cf Thu Dec 07 17:51:06 2000 +0000
@@ -0,0 +1,171 @@
+# $NetBSD: genassym.cf,v 1.1 2000/12/07 17:51:06 jdolecek Exp $
+
+#
+# Copyright (c) 1994, 1995 Gordon W. Ross
+# Copyright (c) 1993 Adam Glass
+# Copyright (c) 1982, 1990, 1993
+# The Regents of the University of California. 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
Home |
Main Index |
Thread Index |
Old Index