[src/trunk]: src/sys/arch/i386/i386 Whoops. Previous change was not correct.

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

details:   https://anonhg.NetBSD.org/src/rev/a1083b8f6828
branches:  trunk
changeset: 500494:a1083b8f6828
user:      mycroft <mycroft%NetBSD.org@localhost>
date:      Tue Dec 12 20:30:12 2000 +0000

description:
Whoops.  Previous change was not correct.

diffstat:

 sys/arch/i386/i386/ibcs2_syscall.c |  6 +++---
 sys/arch/i386/i386/linux_syscall.c |  8 +++++---
 sys/arch/i386/i386/svr4_syscall.c  |  8 +++++---
 sys/arch/i386/i386/syscall.c       |  8 +++++---
 4 files changed, 18 insertions(+), 12 deletions(-)

diffs (160 lines):

diff -r d1c6a97289c1 -r a1083b8f6828 sys/arch/i386/i386/ibcs2_syscall.c
--- a/sys/arch/i386/i386/ibcs2_syscall.c        Tue Dec 12 20:27:42 2000 +0000
+++ b/sys/arch/i386/i386/ibcs2_syscall.c        Tue Dec 12 20:30:12 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ibcs2_syscall.c,v 1.12 2000/12/12 20:22:49 mycroft Exp $       */
+/*     $NetBSD: ibcs2_syscall.c,v 1.13 2000/12/12 20:30:12 mycroft Exp $       */
 
 /*-
  * Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -107,7 +107,6 @@
        code = frame.tf_eax;
        if (IBCS2_HIGH_SYSCALL(code))
                code = IBCS2_CVT_HIGH_SYSCALL(code);
-       code &= (IBCS2_SYS_NSYSENT - 1);
        callp = ibcs2_sysent;
        params = (caddr_t)frame.tf_esp + sizeof(int);
 
@@ -123,6 +122,7 @@
                break;
        }
 
+       code &= (IBCS2_SYS_NSYSENT - 1);
        callp += code;
        argsize = callp->sy_argsize;
        if (argsize) {
@@ -191,7 +191,6 @@
        code = frame.tf_eax;
        if (IBCS2_HIGH_SYSCALL(code))
                code = IBCS2_CVT_HIGH_SYSCALL(code);
-       code &= (IBCS2_SYS_NSYSENT - 1);
        callp = ibcs2_sysent;
        params = (caddr_t)frame.tf_esp + sizeof(int);
 
@@ -207,6 +206,7 @@
                break;
        }
 
+       code &= (IBCS2_SYS_NSYSENT - 1);
        callp += code;
        argsize = callp->sy_argsize;
        if (argsize) {
diff -r d1c6a97289c1 -r a1083b8f6828 sys/arch/i386/i386/linux_syscall.c
--- a/sys/arch/i386/i386/linux_syscall.c        Tue Dec 12 20:27:42 2000 +0000
+++ b/sys/arch/i386/i386/linux_syscall.c        Tue Dec 12 20:30:12 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: linux_syscall.c,v 1.12 2000/12/12 20:22:49 mycroft Exp $       */
+/*     $NetBSD: linux_syscall.c,v 1.13 2000/12/12 20:30:12 mycroft Exp $       */
 
 /*-
  * Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -103,9 +103,10 @@
        uvmexp.syscalls++;
        p = curproc;
 
-       code = frame.tf_eax & (LINUX_SYS_NSYSENT - 1);
+       code = frame.tf_eax;
        callp = linux_sysent;
 
+       code &= (LINUX_SYS_NSYSENT - 1);
        callp += code;
        argsize = callp->sy_argsize;
        if (argsize) {
@@ -184,9 +185,10 @@
        uvmexp.syscalls++;
        p = curproc;
 
-       code = frame.tf_eax & (LINUX_SYS_NSYSENT - 1);
+       code = frame.tf_eax;
        callp = linux_sysent;
 
+       code &= (LINUX_SYS_NSYSENT - 1);
        callp += code;
        argsize = callp->sy_argsize;
        if (argsize) {
diff -r d1c6a97289c1 -r a1083b8f6828 sys/arch/i386/i386/svr4_syscall.c
--- a/sys/arch/i386/i386/svr4_syscall.c Tue Dec 12 20:27:42 2000 +0000
+++ b/sys/arch/i386/i386/svr4_syscall.c Tue Dec 12 20:30:12 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: svr4_syscall.c,v 1.11 2000/12/12 20:22:50 mycroft Exp $        */
+/*     $NetBSD: svr4_syscall.c,v 1.12 2000/12/12 20:30:13 mycroft Exp $        */
 
 /*-
  * Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -103,7 +103,7 @@
        uvmexp.syscalls++;
        p = curproc;
 
-       code = frame.tf_eax & (SVR4_SYS_NSYSENT - 1);
+       code = frame.tf_eax;
        callp = svr4_sysent;
        params = (caddr_t)frame.tf_esp + sizeof(int);
 
@@ -119,6 +119,7 @@
                break;
        }
 
+       code &= (SVR4_SYS_NSYSENT - 1);
        callp += code;
        argsize = callp->sy_argsize;
        if (argsize) {
@@ -184,7 +185,7 @@
        uvmexp.syscalls++;
        p = curproc;
 
-       code = frame.tf_eax & (SVR4_SYS_NSYSENT - 1);
+       code = frame.tf_eax;
        callp = svr4_sysent;
        params = (caddr_t)frame.tf_esp + sizeof(int);
 
@@ -200,6 +201,7 @@
                break;
        }
 
+       code &= (SVR4_SYS_NSYSENT - 1);
        callp += code;
        argsize = callp->sy_argsize;
        if (argsize) {
diff -r d1c6a97289c1 -r a1083b8f6828 sys/arch/i386/i386/syscall.c
--- a/sys/arch/i386/i386/syscall.c      Tue Dec 12 20:27:42 2000 +0000
+++ b/sys/arch/i386/i386/syscall.c      Tue Dec 12 20:30:12 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: syscall.c,v 1.6 2000/12/12 20:22:50 mycroft Exp $      */
+/*     $NetBSD: syscall.c,v 1.7 2000/12/12 20:30:13 mycroft Exp $      */
 
 /*-
  * Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -100,7 +100,7 @@
        uvmexp.syscalls++;
        p = curproc;
 
-       code = frame.tf_eax & (SYS_NSYSENT - 1);
+       code = frame.tf_eax;
        callp = p->p_emul->e_sysent;
        params = (caddr_t)frame.tf_esp + sizeof(int);
 
@@ -124,6 +124,7 @@
                break;
        }
 
+       code &= (SYS_NSYSENT - 1);
        callp += code;
        argsize = callp->sy_argsize;
        if (argsize) {
@@ -183,7 +184,7 @@
        uvmexp.syscalls++;
        p = curproc;
 
-       code = frame.tf_eax & (SYS_NSYSENT - 1);
+       code = frame.tf_eax;
        callp = p->p_emul->e_sysent;
        params = (caddr_t)frame.tf_esp + sizeof(int);
 
@@ -207,6 +208,7 @@
                break;
        }
 
+       code &= (SYS_NSYSENT - 1);
        callp += code;
        argsize = callp->sy_argsize;
        if (argsize) {