[src/trunk]: src/sys/compat/ultrix split ecoff specific code to separate file...

[jdolecek <jdolecek%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/2f7ea5a562b6
branches:  trunk
changeset: 500285:2f7ea5a562b6
user:      jdolecek <jdolecek%NetBSD.org@localhost>
date:      Sat Dec 09 12:19:28 2000 +0000

description:
split ecoff specific code to separate file ultrix_exec_ecoff.c

diffstat:

 sys/compat/ultrix/files.ultrix        |    3 +-
 sys/compat/ultrix/ultrix_exec_ecoff.c |  106 ++++++++++++++++++++++++++++++++++
 sys/compat/ultrix/ultrix_misc.c       |   30 +--------
 3 files changed, 113 insertions(+), 26 deletions(-)

diffs (189 lines):

diff -r 228d618299ed -r 2f7ea5a562b6 sys/compat/ultrix/files.ultrix
--- a/sys/compat/ultrix/files.ultrix    Sat Dec 09 11:21:52 2000 +0000
+++ b/sys/compat/ultrix/files.ultrix    Sat Dec 09 12:19:28 2000 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.ultrix,v 1.3 1996/01/07 13:38:49 jonathan Exp $
+#      $NetBSD: files.ultrix,v 1.4 2000/12/09 12:19:28 jdolecek Exp $
 #
 # Config file description for machine-independent Ultrix compat code.
 # Included by ports that need it.
@@ -6,6 +6,7 @@
 # ports should define any machine-specific files they need in their
 # own file lists.
 
+file   compat/ultrix/ultrix_exec_ecoff.c       compat_ultrix & exec_ecoff
 file   compat/ultrix/ultrix_pathname.c         compat_ultrix
 file   compat/ultrix/ultrix_ioctl.c            compat_ultrix
 file   compat/ultrix/ultrix_misc.c             compat_ultrix
diff -r 228d618299ed -r 2f7ea5a562b6 sys/compat/ultrix/ultrix_exec_ecoff.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/compat/ultrix/ultrix_exec_ecoff.c     Sat Dec 09 12:19:28 2000 +0000
@@ -0,0 +1,106 @@
+/*     $NetBSD: ultrix_exec_ecoff.c,v 1.1 2000/12/09 12:19:28 jdolecek Exp $   */
+
+/*
+ * Copyright (c) 1995, 1997 Jonathan Stone (hereinafter referred to as the author)
+ * 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 Jonathan Stone for
+ *      the NetBSD Project.
+ * 4. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ */
+
+/*
+ * Copyright (c) 1992, 1993
+ *     The Regents of the University of California.  All rights reserved.
+ *
+ * This software was developed by the Computer Systems Engineering group
+ * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
+ * contributed to Berkeley.
+ *
+ * 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, Lawrence Berkeley Laboratory.
+ *
+ * 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.
+ *
+ *
+ *     @(#)sun_misc.c  8.1 (Berkeley) 6/18/93
+ *
+ * from: Header: sun_misc.c,v 1.16 93/04/07 02:46:27 torek Exp 
+ */
+
+/*
+ * Ultrix compatibility module.
+ */
+
+#include <sys/param.h>
+#include <sys/exec.h>
+
+#include <sys/exec_ecoff.h>
+#include <compat/ultrix/ultrix_exec.h>
+
+/*
+ * cpu_exec_ecoff_probe():
+ *     cpu-dependent ECOFF format hook for execve().
+ *
+ * Do any machine-dependent diddling of the exec package when doing ECOFF.
+ *
+ */
+int
+ultrix_exec_ecoff_probe(p, epp)
+       struct proc *p;
+       struct exec_package *epp;
+{
+       /* XXX should add some check here */
+       return 0;
+}
diff -r 228d618299ed -r 2f7ea5a562b6 sys/compat/ultrix/ultrix_misc.c
--- a/sys/compat/ultrix/ultrix_misc.c   Sat Dec 09 11:21:52 2000 +0000
+++ b/sys/compat/ultrix/ultrix_misc.c   Sat Dec 09 12:19:28 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ultrix_misc.c,v 1.63 2000/12/01 19:26:57 jdolecek Exp $        */
+/*     $NetBSD: ultrix_misc.c,v 1.64 2000/12/09 12:19:28 jdolecek Exp $        */
 
 /*
  * Copyright (c) 1995, 1997 Jonathan Stone (hereinafter referred to as the author)
@@ -82,7 +82,6 @@
 #if defined(_KERNEL) && !defined(_LKM)
 #include "opt_nfsserver.h"
 #include "opt_sysv.h"
-#include "opt_execfmt.h"
 #endif
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
@@ -142,11 +141,6 @@
 
 #include <compat/ultrix/ultrix_flock.h>
 
-#ifdef EXEC_ECOFF
-#include <sys/exec_ecoff.h>
-#include <compat/ultrix/ultrix_exec.h>
-#endif
-
 static int ultrix_to_bsd_flock __P((struct ultrix_flock *, struct flock *));
 static void bsd_to_ultrix_flock __P((struct flock *, struct ultrix_flock *));
 
@@ -182,6 +176,10 @@
        ultrix_syscallnames,
        ultrix_sigcode,
        ultrix_esigcode,
+       NULL,
+       NULL,
+       NULL,
+       0,
 };
 
 #define GSI_PROG_ENV 1
@@ -914,21 +912,3 @@
 
        return (error);
 }
-
-#ifdef EXEC_ECOFF
-/*
- * cpu_exec_ecoff_probe():
- *     cpu-dependent ECOFF format hook for execve().
- *
- * Do any machine-dependent diddling of the exec package when doing ECOFF.
- *
- */
-int
-ultrix_exec_ecoff_probe(p, epp)
-       struct proc *p;
-       struct exec_package *epp;
-{
-       /* XXX should add some check here */
-       return 0;
-}
-#endif