Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/mvme68k/mvme68k Use "EMUL_HAS_SYS___syscall" instea...



details:   https://anonhg.NetBSD.org/src/rev/c3e68c539917
branches:  trunk
changeset: 499936:c3e68c539917
user:      scw <scw%NetBSD.org@localhost>
date:      Sat Dec 02 13:45:14 2000 +0000

description:
Use "EMUL_HAS_SYS___syscall" instead of checking p->p_emul.
Removes dependency on COMPAT_AOUT_M68K.

diffstat:

 sys/arch/mvme68k/mvme68k/trap.c |  12 ++----------
 1 files changed, 2 insertions(+), 10 deletions(-)

diffs (33 lines):

diff -r 16893973989a -r c3e68c539917 sys/arch/mvme68k/mvme68k/trap.c
--- a/sys/arch/mvme68k/mvme68k/trap.c   Sat Dec 02 08:35:45 2000 +0000
+++ b/sys/arch/mvme68k/mvme68k/trap.c   Sat Dec 02 13:45:14 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: trap.c,v 1.49 2000/11/30 23:47:45 scw Exp $    */
+/*     $NetBSD: trap.c,v 1.50 2000/12/02 13:45:14 scw Exp $    */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -93,10 +93,6 @@
 extern struct emul emul_linux;
 #endif
 
-#ifdef COMPAT_AOUT_M68K
-extern struct emul emul_netbsd_aoutm68k;
-#endif
-
 int    writeback __P((struct frame *fp, int docachepush));
 void   trap __P((int type, u_int code, u_int v, struct frame frame));
 void   syscall __P((register_t code, struct frame frame));
@@ -1074,11 +1070,7 @@
                 * Like syscall, but code is a quad, so as to maintain
                 * quad alignment for the rest of the arguments.
                 */
-               if (callp == sysent     /* Native */
-#ifdef COMPAT_AOUT_M68K
-                   || (p->p_emul == &emul_netbsd_aoutm68k)     /* m68k a.out */
-#endif
-                   ) {
+               if (p->p_emul->e_flags & EMUL_HAS_SYS___syscall) {
                        code = fuword(params + _QUAD_LOWWORD * sizeof(int));
                        params += sizeof(quad_t);
                }



Home | Main Index | Thread Index | Old Index