summaryrefslogtreecommitdiff
path: root/sys/arch/mvme68k
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch/mvme68k')
-rw-r--r--sys/arch/mvme68k/conf/GENERIC4
-rw-r--r--sys/arch/mvme68k/conf/MVME1474
-rw-r--r--sys/arch/mvme68k/conf/MVME1624
-rw-r--r--sys/arch/mvme68k/conf/MVME1674
-rw-r--r--sys/arch/mvme68k/conf/MVME1775
-rw-r--r--sys/arch/mvme68k/mvme68k/machdep.c30
-rw-r--r--sys/arch/mvme68k/mvme68k/trap.c63
7 files changed, 7 insertions, 107 deletions
diff --git a/sys/arch/mvme68k/conf/GENERIC b/sys/arch/mvme68k/conf/GENERIC
index 7edadf1cd98..7d1cc702355 100644
--- a/sys/arch/mvme68k/conf/GENERIC
+++ b/sys/arch/mvme68k/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.33 2010/06/29 20:30:33 guenther Exp $
+# $OpenBSD: GENERIC,v 1.34 2010/07/02 19:57:14 tedu Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -27,8 +27,6 @@ option MVME167 # includes 166 (requires M68040, FPSP)
option MVME172 # (requires M68060, 060SP, FPSP)
option MVME177 # includes 176 (requires M68060, 060SP, FPSP)
-option COMPAT_SUNOS
-option COMPAT_M68K4K
config bsd swap generic
diff --git a/sys/arch/mvme68k/conf/MVME147 b/sys/arch/mvme68k/conf/MVME147
index 1652288e748..96ae96188cc 100644
--- a/sys/arch/mvme68k/conf/MVME147
+++ b/sys/arch/mvme68k/conf/MVME147
@@ -1,4 +1,4 @@
-# $OpenBSD: MVME147,v 1.23 2010/06/29 20:30:33 guenther Exp $
+# $OpenBSD: MVME147,v 1.24 2010/07/02 19:57:14 tedu Exp $
machine mvme68k m68k
@@ -8,8 +8,6 @@ option M68030 # support for 030
option MVME147 # (requires M68030)
-option COMPAT_SUNOS
-option COMPAT_M68K4K
maxusers 16
diff --git a/sys/arch/mvme68k/conf/MVME162 b/sys/arch/mvme68k/conf/MVME162
index 9bfd149cdb9..eb17009e5b1 100644
--- a/sys/arch/mvme68k/conf/MVME162
+++ b/sys/arch/mvme68k/conf/MVME162
@@ -1,4 +1,4 @@
-# $OpenBSD: MVME162,v 1.26 2010/06/29 20:30:33 guenther Exp $
+# $OpenBSD: MVME162,v 1.27 2010/07/02 19:57:14 tedu Exp $
machine mvme68k m68k
@@ -9,8 +9,6 @@ option FPSP # MC68040 floating point support
option MVME162 # (requires M68040, FPSP)
-option COMPAT_SUNOS
-option COMPAT_M68K4K
maxusers 32
diff --git a/sys/arch/mvme68k/conf/MVME167 b/sys/arch/mvme68k/conf/MVME167
index aeb7f9ead41..78c0f30796a 100644
--- a/sys/arch/mvme68k/conf/MVME167
+++ b/sys/arch/mvme68k/conf/MVME167
@@ -1,4 +1,4 @@
-# $OpenBSD: MVME167,v 1.26 2010/06/29 20:30:33 guenther Exp $
+# $OpenBSD: MVME167,v 1.27 2010/07/02 19:57:14 tedu Exp $
machine mvme68k m68k
@@ -9,8 +9,6 @@ option FPSP # MC68040 floating point support
option MVME167 # includes 166 (requires M68040, FPSP)
-option COMPAT_SUNOS
-option COMPAT_M68K4K
maxusers 32
diff --git a/sys/arch/mvme68k/conf/MVME177 b/sys/arch/mvme68k/conf/MVME177
index 536578aaac0..8f335d86ba5 100644
--- a/sys/arch/mvme68k/conf/MVME177
+++ b/sys/arch/mvme68k/conf/MVME177
@@ -1,4 +1,4 @@
-# $OpenBSD: MVME177,v 1.15 2010/06/29 20:30:33 guenther Exp $
+# $OpenBSD: MVME177,v 1.16 2010/07/02 19:57:14 tedu Exp $
machine mvme68k m68k
@@ -9,9 +9,6 @@ option M060SP # ...and MC68060 support package
option MVME177 # (requires M68060, 060SP, FPSP)
-option COMPAT_SUNOS
-option COMPAT_M68K4K
-
maxusers 32
config bsd swap generic
diff --git a/sys/arch/mvme68k/mvme68k/machdep.c b/sys/arch/mvme68k/mvme68k/machdep.c
index 7467be7d2c7..802efa82ef1 100644
--- a/sys/arch/mvme68k/mvme68k/machdep.c
+++ b/sys/arch/mvme68k/mvme68k/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.122 2010/06/27 12:41:23 miod Exp $ */
+/* $OpenBSD: machdep.c,v 1.123 2010/07/02 19:57:14 tedu Exp $ */
/*
* Copyright (c) 1995 Theo de Raadt
@@ -150,10 +150,6 @@ struct uvm_constraint_range *uvm_md_constraints[] = { NULL };
*/
int safepri = PSL_LOWIPL;
-#ifdef COMPAT_SUNOS
-extern struct emul emul_sunos;
-#endif
-
void dumpsys(void);
void initvectors(void);
void mvme68k_init(void);
@@ -832,30 +828,6 @@ nmihand(frame)
#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.
- */
-int
-cpu_exec_aout_makecmds(p, epp)
- struct proc *p;
- struct exec_package *epp;
-{
- int error = ENOEXEC;
-
-#ifdef COMPAT_SUNOS
- {
- extern int sunos_exec_aout_makecmds(struct proc *, struct exec_package *);
- if ((error = sunos_exec_aout_makecmds(p, epp)) == 0)
- return (0);
- }
-#endif
- return (error);
-}
-
u_char myea[6] = { 0x08, 0x00, 0x3e, 0xff, 0xff, 0xff};
void
diff --git a/sys/arch/mvme68k/mvme68k/trap.c b/sys/arch/mvme68k/mvme68k/trap.c
index 1dc734f4804..7801d574e3b 100644
--- a/sys/arch/mvme68k/mvme68k/trap.c
+++ b/sys/arch/mvme68k/mvme68k/trap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: trap.c,v 1.69 2010/06/29 20:30:32 guenther Exp $ */
+/* $OpenBSD: trap.c,v 1.70 2010/07/02 19:57:14 tedu Exp $ */
/*
* Copyright (c) 1995 Theo de Raadt
@@ -82,11 +82,6 @@
#include <machine/reg.h>
#include <machine/trap.h>
-#ifdef COMPAT_SUNOS
-#include <compat/sunos/sunos_syscall.h>
-extern struct emul emul_sunos;
-#endif
-
#include "systrace.h"
#include <dev/systrace.h>
@@ -230,9 +225,6 @@ trap(type, code, v, frame)
register int i;
u_int ucode;
int typ = 0;
-#ifdef COMPAT_SUNOS
- extern struct emul emul_sunos;
-#endif
register union sigval sv;
uvmexp.traps++;
@@ -389,19 +381,6 @@ copyfault:
return;
case T_TRACE|T_USER: /* user trace trap */
-#ifdef COMPAT_SUNOS
- /*
- * SunOS uses Trap #2 for a "CPU cache flush"
- * Just flush the on-chip caches and return.
- */
- if (p->p_emul == &emul_sunos) {
- ICIA();
- DCIU();
- return;
- }
-#endif
- /* FALLTHROUGH */
-
case T_TRACE:
case T_TRAP15|T_USER: /* SUN user trace trap */
frame.f_sr &= ~PSL_T;
@@ -902,9 +881,6 @@ syscall(code, frame)
int error, opc, nsys;
size_t argsize;
register_t args[8], rval[2];
-#ifdef COMPAT_SUNOS
- extern struct emul emul_sunos;
-#endif
uvmexp.syscalls++;
if (!USERMODE(frame.f_sr))
@@ -916,38 +892,6 @@ syscall(code, frame)
nsys = p->p_emul->e_nsysent;
callp = p->p_emul->e_sysent;
-#ifdef COMPAT_SUNOS
- if (p->p_emul == &emul_sunos) {
- /*
- * SunOS passes the syscall-number on the stack, whereas
- * BSD passes it in D0. So, we have to get the real "code"
- * from the stack, and clean up the stack, as SunOS glue
- * code assumes the kernel pops the syscall argument the
- * glue pushed on the stack. Sigh...
- */
- if (copyin((caddr_t)frame.f_regs[SP], &code,
- sizeof(register_t)) != 0)
- code = -1;
-
- /*
- * XXX
- * Don't do this for sunos_sigreturn, as there's no stored pc
- * on the stack to skip, the argument follows the syscall
- * number without a gap.
- */
- if (code != SUNOS_SYS_sigreturn) {
- frame.f_regs[SP] += sizeof (int);
- /*
- * remember that we adjusted the SP,
- * might have to undo this if the system call
- * returns ERESTART.
- */
- p->p_md.md_flags |= MDP_STACKADJ;
- } else
- p->p_md.md_flags &= ~MDP_STACKADJ;
- }
-#endif
-
params = (caddr_t)frame.f_regs[SP] + sizeof(int);
switch (code) {
@@ -1035,11 +979,6 @@ bad:
#ifdef SYSCALL_DEBUG
scdebug_ret(p, code, error, rval);
#endif
-#ifdef COMPAT_SUNOS
- /* need new p-value for this */
- if (error == ERESTART && (p->p_md.md_flags & MDP_STACKADJ))
- frame.f_regs[SP] -= sizeof (int);
-#endif
userret(p);
#ifdef KTRACE
if (KTRPOINT(p, KTR_SYSRET))
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-27 12:06:29 +0000