Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/sh3/sh3 remove COMPAT_NOMID stuff
details: https://anonhg.NetBSD.org/src/rev/cbdd852910f9
branches: trunk
changeset: 481804:cbdd852910f9
user: msaitoh <msaitoh%NetBSD.org@localhost>
date: Sun Feb 06 13:13:20 2000 +0000
description:
remove COMPAT_NOMID stuff
diffstat:
sys/arch/sh3/sh3/sh3_machdep.c | 97 +-----------------------------------------
1 files changed, 1 insertions(+), 96 deletions(-)
diffs (115 lines):
diff -r f53894196ea6 -r cbdd852910f9 sys/arch/sh3/sh3/sh3_machdep.c
--- a/sys/arch/sh3/sh3/sh3_machdep.c Sun Feb 06 13:05:25 2000 +0000
+++ b/sys/arch/sh3/sh3/sh3_machdep.c Sun Feb 06 13:13:20 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: sh3_machdep.c,v 1.3 2000/01/19 20:05:47 thorpej Exp $ */
+/* $NetBSD: sh3_machdep.c,v 1.4 2000/02/06 13:13:20 msaitoh Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -105,10 +105,6 @@
extern int physmem;
-#ifdef COMPAT_NOMID
-static int exec_nomid __P((struct proc *, struct exec_package *));
-#endif
-
void
sh3_startup()
{
@@ -482,94 +478,3 @@
prev->q_next = next;
elem->q_prev = 0;
}
-
-#ifdef COMPAT_NOMID
-static int
-exec_nomid(p, epp)
- struct proc *p;
- struct exec_package *epp;
-{
- int error;
- u_long midmag, magic;
- u_short mid;
- struct exec *execp = epp->ep_hdr;
-
- /* check on validity of epp->ep_hdr performed by exec_out_makecmds */
-
- midmag = ntohl(execp->a_midmag);
- mid = (midmag >> 16) & 0xffff;
- magic = midmag & 0xffff;
-
- if (magic == 0) {
- magic = (execp->a_midmag & 0xffff);
- mid = MID_ZERO;
- }
-
- midmag = mid << 16 | magic;
-
- switch (midmag) {
- case (MID_ZERO << 16) | ZMAGIC:
- /*
- * 386BSD's ZMAGIC format:
- */
- error = exec_aout_prep_oldzmagic(p, epp);
- break;
-
- case (MID_ZERO << 16) | QMAGIC:
- /*
- * BSDI's QMAGIC format:
- * same as new ZMAGIC format, but with different magic number
- */
- error = exec_aout_prep_zmagic(p, epp);
- break;
-
- case (MID_ZERO << 16) | NMAGIC:
- /*
- * BSDI's NMAGIC format:
- * same as NMAGIC format, but with different magic number
- * and with text starting at 0.
- */
- error = exec_aout_prep_oldnmagic(p, epp);
- break;
-
- case (MID_ZERO << 16) | OMAGIC:
- /*
- * BSDI's OMAGIC format:
- * same as OMAGIC format, but with different magic number
- * and with text starting at 0.
- */
- error = exec_aout_prep_oldomagic(p, epp);
- break;
-
- default:
- error = ENOEXEC;
- }
-
- return error;
-}
-#endif
-
-/*
- * cpu_exec_aout_makecmds():
- * cpu-dependent a.out format hook for execve().
- *
- * Determine of the given exec package refers to something which we
- * understand and, if so, set up the vmcmds for it.
- *
- * On the i386, old (386bsd) ZMAGIC binaries and BSDI QMAGIC binaries
- * if COMPAT_NOMID is given as a kernel option.
- */
-int
-cpu_exec_aout_makecmds(p, epp)
- struct proc *p;
- struct exec_package *epp;
-{
- int error = ENOEXEC;
-
-#ifdef COMPAT_NOMID
- if ((error = exec_nomid(p, epp)) == 0)
- return error;
-#endif /* ! COMPAT_NOMID */
-
- return error;
-}
Home |
Main Index |
Thread Index |
Old Index