Author: mjg
Date: Wed Dec 19 21:57:58 2018
New Revision: 342243
URL: https://svnweb.freebsd.org/changeset/base/342243

Log:
  Remove iBCS2, part2: general kernel
  
  Reviewed by:  kib (previous version)
  Sponsored by: The FreeBSD Foundation

Modified:
  head/sys/amd64/amd64/elf_machdep.c
  head/sys/amd64/amd64/trap.c
  head/sys/amd64/conf/NOTES
  head/sys/amd64/ia32/ia32_syscall.c
  head/sys/amd64/linux/linux_sysvec.c
  head/sys/amd64/linux32/linux32_sysvec.c
  head/sys/arm/arm/elf_machdep.c
  head/sys/arm/arm/syscall.c
  head/sys/arm/arm/vm_machdep.c
  head/sys/arm64/arm64/elf_machdep.c
  head/sys/arm64/arm64/trap.c
  head/sys/arm64/linux/linux_sysvec.c
  head/sys/compat/ia32/ia32_sysvec.c
  head/sys/conf/files.i386
  head/sys/conf/options.amd64
  head/sys/conf/options.i386
  head/sys/i386/Makefile
  head/sys/i386/conf/NOTES
  head/sys/i386/i386/elf_machdep.c
  head/sys/i386/i386/trap.c
  head/sys/i386/linux/linux_sysvec.c
  head/sys/kern/imgact_aout.c
  head/sys/kern/init_main.c
  head/sys/kern/makesyscalls.sh
  head/sys/mips/mips/elf_machdep.c
  head/sys/mips/mips/freebsd32_machdep.c
  head/sys/mips/mips/trap.c
  head/sys/powerpc/powerpc/elf32_machdep.c
  head/sys/powerpc/powerpc/elf64_machdep.c
  head/sys/powerpc/powerpc/exec_machdep.c
  head/sys/powerpc/powerpc/trap.c
  head/sys/riscv/riscv/elf_machdep.c
  head/sys/riscv/riscv/trap.c
  head/sys/sparc64/sparc64/elf_machdep.c
  head/sys/sparc64/sparc64/trap.c
  head/sys/sys/sysent.h

Modified: head/sys/amd64/amd64/elf_machdep.c
==============================================================================
--- head/sys/amd64/amd64/elf_machdep.c  Wed Dec 19 21:56:54 2018        
(r342242)
+++ head/sys/amd64/amd64/elf_machdep.c  Wed Dec 19 21:57:58 2018        
(r342243)
@@ -52,7 +52,6 @@ __FBSDID("$FreeBSD$");
 struct sysentvec elf64_freebsd_sysvec = {
        .sv_size        = SYS_MAXSYSCALL,
        .sv_table       = sysent,
-       .sv_mask        = 0,
        .sv_errsize     = 0,
        .sv_errtbl      = NULL,
        .sv_transtrap   = NULL,

Modified: head/sys/amd64/amd64/trap.c
==============================================================================
--- head/sys/amd64/amd64/trap.c Wed Dec 19 21:56:54 2018        (r342242)
+++ head/sys/amd64/amd64/trap.c Wed Dec 19 21:57:58 2018        (r342243)
@@ -991,8 +991,6 @@ cpu_fetch_syscall_args_fallback(struct thread *td, str
                reg++;
                regcnt--;
        }
-       if (p->p_sysent->sv_mask)
-               sa->code &= p->p_sysent->sv_mask;
 
        if (sa->code >= p->p_sysent->sv_size)
                sa->callp = &p->p_sysent->sv_table[0];
@@ -1039,9 +1037,6 @@ cpu_fetch_syscall_args(struct thread *td)
        sa->callp = &p->p_sysent->sv_table[sa->code];
        sa->narg = sa->callp->sy_narg;
        KASSERT(sa->narg <= nitems(sa->args), ("Too many syscall arguments!"));
-
-       if (p->p_sysent->sv_mask)
-               sa->code &= p->p_sysent->sv_mask;
 
        if (__predict_false(sa->narg > NARGREGS))
                return (cpu_fetch_syscall_args_fallback(td, sa));

Modified: head/sys/amd64/conf/NOTES
==============================================================================
--- head/sys/amd64/conf/NOTES   Wed Dec 19 21:56:54 2018        (r342242)
+++ head/sys/amd64/conf/NOTES   Wed Dec 19 21:57:58 2018        (r342243)
@@ -612,9 +612,6 @@ options     EFIRT
 # Enable 32-bit runtime support for FreeBSD/i386 binaries.
 options        COMPAT_FREEBSD32
 
-# Enable iBCS2 runtime support for SCO and ISC binaries
-#XXX#options   IBCS2
-
 # Emulate spx device for client side of SVR3 local X interface
 #XXX#options   SPX_HACK
 

Modified: head/sys/amd64/ia32/ia32_syscall.c
==============================================================================
--- head/sys/amd64/ia32/ia32_syscall.c  Wed Dec 19 21:56:54 2018        
(r342242)
+++ head/sys/amd64/ia32/ia32_syscall.c  Wed Dec 19 21:57:58 2018        
(r342243)
@@ -177,8 +177,6 @@ ia32_fetch_syscall_args(struct thread *td)
                sa->code = tmp;
                params += sizeof(quad_t);
        }
-       if (p->p_sysent->sv_mask)
-               sa->code &= p->p_sysent->sv_mask;
        if (sa->code >= p->p_sysent->sv_size)
                sa->callp = &p->p_sysent->sv_table[0];
        else

Modified: head/sys/amd64/linux/linux_sysvec.c
==============================================================================
--- head/sys/amd64/linux/linux_sysvec.c Wed Dec 19 21:56:54 2018        
(r342242)
+++ head/sys/amd64/linux/linux_sysvec.c Wed Dec 19 21:57:58 2018        
(r342243)
@@ -711,7 +711,6 @@ linux_vsyscall(struct thread *td)
 struct sysentvec elf_linux_sysvec = {
        .sv_size        = LINUX_SYS_MAXSYSCALL,
        .sv_table       = linux_sysent,
-       .sv_mask        = 0,
        .sv_errsize     = ELAST + 1,
        .sv_errtbl      = linux_errtbl,
        .sv_transtrap   = linux_translate_traps,

Modified: head/sys/amd64/linux32/linux32_sysvec.c
==============================================================================
--- head/sys/amd64/linux32/linux32_sysvec.c     Wed Dec 19 21:56:54 2018        
(r342242)
+++ head/sys/amd64/linux32/linux32_sysvec.c     Wed Dec 19 21:57:58 2018        
(r342243)
@@ -909,7 +909,6 @@ linux32_fixlimit(struct rlimit *rl, int which)
 struct sysentvec elf_linux_sysvec = {
        .sv_size        = LINUX32_SYS_MAXSYSCALL,
        .sv_table       = linux32_sysent,
-       .sv_mask        = 0,
        .sv_errsize     = ELAST + 1,
        .sv_errtbl      = linux_errtbl,
        .sv_transtrap   = linux_translate_traps,

Modified: head/sys/arm/arm/elf_machdep.c
==============================================================================
--- head/sys/arm/arm/elf_machdep.c      Wed Dec 19 21:56:54 2018        
(r342242)
+++ head/sys/arm/arm/elf_machdep.c      Wed Dec 19 21:57:58 2018        
(r342243)
@@ -59,7 +59,6 @@ u_long elf_hwcap2;
 struct sysentvec elf32_freebsd_sysvec = {
        .sv_size        = SYS_MAXSYSCALL,
        .sv_table       = sysent,
-       .sv_mask        = 0,
        .sv_errsize     = 0,
        .sv_errtbl      = NULL,
        .sv_transtrap   = NULL,

Modified: head/sys/arm/arm/syscall.c
==============================================================================
--- head/sys/arm/arm/syscall.c  Wed Dec 19 21:56:54 2018        (r342242)
+++ head/sys/arm/arm/syscall.c  Wed Dec 19 21:57:58 2018        (r342243)
@@ -118,8 +118,6 @@ cpu_fetch_syscall_args(struct thread *td)
                ap += 2;
        }
        p = td->td_proc;
-       if (p->p_sysent->sv_mask)
-               sa->code &= p->p_sysent->sv_mask;
        if (sa->code >= p->p_sysent->sv_size)
                sa->callp = &p->p_sysent->sv_table[0];
        else

Modified: head/sys/arm/arm/vm_machdep.c
==============================================================================
--- head/sys/arm/arm/vm_machdep.c       Wed Dec 19 21:56:54 2018        
(r342242)
+++ head/sys/arm/arm/vm_machdep.c       Wed Dec 19 21:57:58 2018        
(r342243)
@@ -190,8 +190,6 @@ cpu_set_syscall_retval(struct thread *td, int error)
        if (call == SYS___syscall) {
                register_t *ap = &frame->tf_r0;
                register_t code = ap[_QUAD_LOWWORD];
-               if (td->td_proc->p_sysent->sv_mask)
-                       code &= td->td_proc->p_sysent->sv_mask;
                fixup = (code != SYS_lseek);
        }
 #endif

Modified: head/sys/arm64/arm64/elf_machdep.c
==============================================================================
--- head/sys/arm64/arm64/elf_machdep.c  Wed Dec 19 21:56:54 2018        
(r342242)
+++ head/sys/arm64/arm64/elf_machdep.c  Wed Dec 19 21:57:58 2018        
(r342243)
@@ -58,7 +58,6 @@ __FBSDID("$FreeBSD$");
 static struct sysentvec elf64_freebsd_sysvec = {
        .sv_size        = SYS_MAXSYSCALL,
        .sv_table       = sysent,
-       .sv_mask        = 0,
        .sv_errsize     = 0,
        .sv_errtbl      = NULL,
        .sv_transtrap   = NULL,

Modified: head/sys/arm64/arm64/trap.c
==============================================================================
--- head/sys/arm64/arm64/trap.c Wed Dec 19 21:56:54 2018        (r342242)
+++ head/sys/arm64/arm64/trap.c Wed Dec 19 21:57:58 2018        (r342243)
@@ -115,8 +115,6 @@ cpu_fetch_syscall_args(struct thread *td)
                nap--;
        }
 
-       if (p->p_sysent->sv_mask)
-               sa->code &= p->p_sysent->sv_mask;
        if (sa->code >= p->p_sysent->sv_size)
                sa->callp = &p->p_sysent->sv_table[0];
        else

Modified: head/sys/arm64/linux/linux_sysvec.c
==============================================================================
--- head/sys/arm64/linux/linux_sysvec.c Wed Dec 19 21:56:54 2018        
(r342242)
+++ head/sys/arm64/linux/linux_sysvec.c Wed Dec 19 21:57:58 2018        
(r342243)
@@ -124,8 +124,6 @@ linux_fetch_syscall_args(struct thread *td)
 
        sa->code = td->td_frame->tf_x[8];
        /* LINUXTODO: generic syscall? */
-       if (p->p_sysent->sv_mask)
-               sa->code &= p->p_sysent->sv_mask;
        if (sa->code >= p->p_sysent->sv_size)
                sa->callp = &p->p_sysent->sv_table[0];
        else
@@ -364,7 +362,6 @@ linux_vsyscall(struct thread *td)
 struct sysentvec elf_linux_sysvec = {
        .sv_size        = LINUX_SYS_MAXSYSCALL,
        .sv_table       = linux_sysent,
-       .sv_mask        = 0,
        .sv_errsize     = ELAST + 1,
        .sv_errtbl      = linux_errtbl,
        .sv_transtrap   = linux_translate_traps,

Modified: head/sys/compat/ia32/ia32_sysvec.c
==============================================================================
--- head/sys/compat/ia32/ia32_sysvec.c  Wed Dec 19 21:56:54 2018        
(r342242)
+++ head/sys/compat/ia32/ia32_sysvec.c  Wed Dec 19 21:57:58 2018        
(r342243)
@@ -98,7 +98,6 @@ SYSCTL_ULONG(_compat_ia32, OID_AUTO, maxvmem, CTLFLAG_
 struct sysentvec ia32_freebsd_sysvec = {
        .sv_size        = FREEBSD32_SYS_MAXSYSCALL,
        .sv_table       = freebsd32_sysent,
-       .sv_mask        = 0,
        .sv_errsize     = 0,
        .sv_errtbl      = NULL,
        .sv_transtrap   = NULL,

Modified: head/sys/conf/files.i386
==============================================================================
--- head/sys/conf/files.i386    Wed Dec 19 21:56:54 2018        (r342242)
+++ head/sys/conf/files.i386    Wed Dec 19 21:57:58 2018        (r342243)
@@ -508,25 +508,6 @@ i386/i386/trap.c           standard
 i386/i386/uio_machdep.c                standard
 i386/i386/vm86.c               standard
 i386/i386/vm_machdep.c         standard
-i386/ibcs2/ibcs2_errno.c       optional ibcs2
-i386/ibcs2/ibcs2_fcntl.c       optional ibcs2
-i386/ibcs2/ibcs2_ioctl.c       optional ibcs2
-i386/ibcs2/ibcs2_ipc.c         optional ibcs2
-i386/ibcs2/ibcs2_isc.c         optional ibcs2
-i386/ibcs2/ibcs2_isc_sysent.c  optional ibcs2
-i386/ibcs2/ibcs2_misc.c                optional ibcs2
-i386/ibcs2/ibcs2_msg.c         optional ibcs2
-i386/ibcs2/ibcs2_other.c       optional ibcs2
-i386/ibcs2/ibcs2_signal.c      optional ibcs2
-i386/ibcs2/ibcs2_socksys.c     optional ibcs2
-i386/ibcs2/ibcs2_stat.c                optional ibcs2
-i386/ibcs2/ibcs2_sysent.c      optional ibcs2
-i386/ibcs2/ibcs2_sysi86.c      optional ibcs2
-i386/ibcs2/ibcs2_sysvec.c      optional ibcs2
-i386/ibcs2/ibcs2_util.c                optional ibcs2
-i386/ibcs2/ibcs2_xenix.c       optional ibcs2
-i386/ibcs2/ibcs2_xenix_sysent.c        optional ibcs2
-i386/ibcs2/imgact_coff.c       optional ibcs2
 i386/linux/imgact_linux.c      optional compat_linux
 i386/linux/linux_copyout.c     optional compat_linux
 i386/linux/linux_dummy.c       optional compat_linux

Modified: head/sys/conf/options.amd64
==============================================================================
--- head/sys/conf/options.amd64 Wed Dec 19 21:56:54 2018        (r342242)
+++ head/sys/conf/options.amd64 Wed Dec 19 21:57:58 2018        (r342243)
@@ -16,7 +16,6 @@ PV_STATS              opt_pmap.h
 # (see src/sys/conf/options), except for broken debugging options.
 COMPAT_AOUT            opt_dontuse.h
 COMPAT_FREEBSD32       opt_global.h
-#IBCS2                 opt_dontuse.h
 #COMPAT_LINUX          opt_dontuse.h
 COMPAT_LINUX32         opt_compat.h
 LINPROCFS              opt_dontuse.h

Modified: head/sys/conf/options.i386
==============================================================================
--- head/sys/conf/options.i386  Wed Dec 19 21:56:54 2018        (r342242)
+++ head/sys/conf/options.i386  Wed Dec 19 21:57:58 2018        (r342243)
@@ -22,7 +22,6 @@ PV_STATS              opt_pmap.h
 # they are handled like options for static filesystems
 # (see src/sys/conf/options), except for broken debugging options.
 COMPAT_AOUT            opt_dontuse.h
-IBCS2                  opt_dontuse.h
 COMPAT_LINUX           opt_dontuse.h
 LINPROCFS              opt_dontuse.h
 LINSYSFS               opt_dontuse.h

Modified: head/sys/i386/Makefile
==============================================================================
--- head/sys/i386/Makefile      Wed Dec 19 21:56:54 2018        (r342242)
+++ head/sys/i386/Makefile      Wed Dec 19 21:57:58 2018        (r342243)
@@ -14,7 +14,7 @@ all:
        @echo "make links or tags only"
 
 # Directories in which to place i386 tags links
-DI386= apm i386 ibcs2 include isa linux
+DI386= apm i386 include isa linux
 
 links::
        -for i in ${COMMDIR1}; do \
@@ -25,9 +25,9 @@ links::
            (cd $$i && { rm -f tags; ln -s ../tags tags; }) done
 
 SI386= ${SYS}/i386/acpica/*.[ch] ${SYS}/i386/bios/*.[ch] \
-       ${SYS}/i386/i386/*.[ch] ${SYS}/i386/ibcs2/*.[ch] \
-       ${SYS}/i386/include/*.[ch] ${SYS}/i386/isa/*.[ch] \
-       ${SYS}/i386/linux/*.[ch] ${SYS}/i386/pci/*.[ch]
+       ${SYS}/i386/i386/*.[ch] ${SYS}/i386/include/*.[ch] \
+       ${SYS}/i386/isa/*.[ch] ${SYS}/i386/linux/*.[ch] \
+       ${SYS}/i386/pci/*.[ch]
 AI386= ${SYS}/i386/i386/*.s
 
 tags::

Modified: head/sys/i386/conf/NOTES
==============================================================================
--- head/sys/i386/conf/NOTES    Wed Dec 19 21:56:54 2018        (r342242)
+++ head/sys/i386/conf/NOTES    Wed Dec 19 21:57:58 2018        (r342243)
@@ -885,9 +885,6 @@ options     NKPT=31
 #####################################################################
 # ABI Emulation
 
-# Enable iBCS2 runtime support for SCO and ISC binaries
-#options       IBCS2
-
 # Emulate spx device for client side of SVR3 local X interface
 options        SPX_HACK
 

Modified: head/sys/i386/i386/elf_machdep.c
==============================================================================
--- head/sys/i386/i386/elf_machdep.c    Wed Dec 19 21:56:54 2018        
(r342242)
+++ head/sys/i386/i386/elf_machdep.c    Wed Dec 19 21:57:58 2018        
(r342243)
@@ -54,7 +54,6 @@ __FBSDID("$FreeBSD$");
 struct sysentvec elf32_freebsd_sysvec = {
        .sv_size        = SYS_MAXSYSCALL,
        .sv_table       = sysent,
-       .sv_mask        = 0,
        .sv_errsize     = 0,
        .sv_errtbl      = NULL,
        .sv_transtrap   = NULL,

Modified: head/sys/i386/i386/trap.c
==============================================================================
--- head/sys/i386/i386/trap.c   Wed Dec 19 21:56:54 2018        (r342242)
+++ head/sys/i386/i386/trap.c   Wed Dec 19 21:57:58 2018        (r342243)
@@ -1095,8 +1095,6 @@ cpu_fetch_syscall_args(struct thread *td)
                params += sizeof(quad_t);
        }
 
-       if (p->p_sysent->sv_mask)
-               sa->code &= p->p_sysent->sv_mask;
        if (sa->code >= p->p_sysent->sv_size)
                sa->callp = &p->p_sysent->sv_table[0];
        else

Modified: head/sys/i386/linux/linux_sysvec.c
==============================================================================
--- head/sys/i386/linux/linux_sysvec.c  Wed Dec 19 21:56:54 2018        
(r342242)
+++ head/sys/i386/linux/linux_sysvec.c  Wed Dec 19 21:57:58 2018        
(r342243)
@@ -850,7 +850,6 @@ linux_get_machine(const char **dst)
 struct sysentvec linux_sysvec = {
        .sv_size        = LINUX_SYS_MAXSYSCALL,
        .sv_table       = linux_sysent,
-       .sv_mask        = 0,
        .sv_errsize     = ELAST + 1,
        .sv_errtbl      = linux_errtbl,
        .sv_transtrap   = linux_translate_traps,
@@ -887,7 +886,6 @@ INIT_SYSENTVEC(aout_sysvec, &linux_sysvec);
 struct sysentvec elf_linux_sysvec = {
        .sv_size        = LINUX_SYS_MAXSYSCALL,
        .sv_table       = linux_sysent,
-       .sv_mask        = 0,
        .sv_errsize     = ELAST + 1,
        .sv_errtbl      = linux_errtbl,
        .sv_transtrap   = linux_translate_traps,

Modified: head/sys/kern/imgact_aout.c
==============================================================================
--- head/sys/kern/imgact_aout.c Wed Dec 19 21:56:54 2018        (r342242)
+++ head/sys/kern/imgact_aout.c Wed Dec 19 21:57:58 2018        (r342243)
@@ -76,7 +76,6 @@ static int    aout_fixup(register_t **stack_base, struct 
 struct sysentvec aout_sysvec = {
        .sv_size        = SYS_MAXSYSCALL,
        .sv_table       = sysent,
-       .sv_mask        = 0,
        .sv_errsize     = 0,
        .sv_errtbl      = NULL,
        .sv_transtrap   = NULL,
@@ -119,7 +118,6 @@ extern u_long ia32_maxssiz;
 struct sysentvec aout_sysvec = {
        .sv_size        = FREEBSD32_SYS_MAXSYSCALL,
        .sv_table       = freebsd32_sysent,
-       .sv_mask        = 0,
        .sv_errsize     = 0,
        .sv_errtbl      = NULL,
        .sv_transtrap   = NULL,

Modified: head/sys/kern/init_main.c
==============================================================================
--- head/sys/kern/init_main.c   Wed Dec 19 21:56:54 2018        (r342242)
+++ head/sys/kern/init_main.c   Wed Dec 19 21:57:58 2018        (r342243)
@@ -401,7 +401,6 @@ null_set_syscall_retval(struct thread *td __unused, in
 struct sysentvec null_sysvec = {
        .sv_size        = 0,
        .sv_table       = NULL,
-       .sv_mask        = 0,
        .sv_errsize     = 0,
        .sv_errtbl      = NULL,
        .sv_transtrap   = NULL,

Modified: head/sys/kern/makesyscalls.sh
==============================================================================
--- head/sys/kern/makesyscalls.sh       Wed Dec 19 21:56:54 2018        
(r342242)
+++ head/sys/kern/makesyscalls.sh       Wed Dec 19 21:57:58 2018        
(r342243)
@@ -526,8 +526,8 @@ sed -e '
                if (!flag("NOPROTO") && !flag("NODEF")) {
                        if (funcname == "nosys" || funcname == "lkmnosys" ||
                            funcname == "sysarch" || funcname ~ /^freebsd/ || 
-                           funcname ~ /^linux/ || funcname ~ /^ibcs2/ ||
-                           funcname ~ /^xenix/ || funcname ~ /^cloudabi/) {
+                           funcname ~ /^linux/ || funcname ~ /^xenix/ ||
+                           funcname ~ /^cloudabi/) {
                                printf("%s\t%s(struct thread *, struct %s *)",
                                    rettype, funcname, argalias) > sysdcl
                        } else {
@@ -546,8 +546,8 @@ sed -e '
                } else {
                        if (funcname == "nosys" || funcname == "sysarch" || 
                            funcname == "lkmnosys" || funcname ~ /^freebsd/ ||
-                           funcname ~ /^linux/ || funcname ~ /^ibcs2/ ||
-                           funcname ~ /^xenix/ || funcname ~ /^cloudabi/) {
+                           funcname ~ /^linux/ || funcname ~ /^xenix/ ||
+                           funcname ~ /^cloudabi/) {
                                printf("%s, %s, NULL, 0, 0, %s, %s },", 
funcname, auditev, flags, thr_flag) > sysent
                                column = column + length(funcname) + 
length(auditev) + length(flags) + 3 
                        } else {

Modified: head/sys/mips/mips/elf_machdep.c
==============================================================================
--- head/sys/mips/mips/elf_machdep.c    Wed Dec 19 21:56:54 2018        
(r342242)
+++ head/sys/mips/mips/elf_machdep.c    Wed Dec 19 21:57:58 2018        
(r342243)
@@ -55,7 +55,6 @@ __FBSDID("$FreeBSD$");
 struct sysentvec elf64_freebsd_sysvec = {
        .sv_size        = SYS_MAXSYSCALL,
        .sv_table       = sysent,
-       .sv_mask        = 0,
        .sv_errsize     = 0,
        .sv_errtbl      = NULL,
        .sv_transtrap   = NULL,
@@ -111,7 +110,6 @@ elf64_dump_thread(struct thread *td __unused, void *ds
 struct sysentvec elf32_freebsd_sysvec = {
        .sv_size        = SYS_MAXSYSCALL,
        .sv_table       = sysent,
-       .sv_mask        = 0,
        .sv_errsize     = 0,
        .sv_errtbl      = NULL,
        .sv_transtrap   = NULL,

Modified: head/sys/mips/mips/freebsd32_machdep.c
==============================================================================
--- head/sys/mips/mips/freebsd32_machdep.c      Wed Dec 19 21:56:54 2018        
(r342242)
+++ head/sys/mips/mips/freebsd32_machdep.c      Wed Dec 19 21:57:58 2018        
(r342243)
@@ -77,7 +77,6 @@ extern const char *freebsd32_syscallnames[];
 struct sysentvec elf32_freebsd_sysvec = {
        .sv_size        = SYS_MAXSYSCALL,
        .sv_table       = freebsd32_sysent,
-       .sv_mask        = 0,
        .sv_errsize     = 0,
        .sv_errtbl      = NULL,
        .sv_transtrap   = NULL,

Modified: head/sys/mips/mips/trap.c
==============================================================================
--- head/sys/mips/mips/trap.c   Wed Dec 19 21:56:54 2018        (r342242)
+++ head/sys/mips/mips/trap.c   Wed Dec 19 21:57:58 2018        (r342243)
@@ -442,8 +442,6 @@ cpu_fetch_syscall_args(struct thread *td)
         * XXX
         * Shouldn't this go before switching on the code?
         */
-       if (se->sv_mask)
-               sa->code &= se->sv_mask;
 
        if (sa->code >= se->sv_size)
                sa->callp = &se->sv_table[0];

Modified: head/sys/powerpc/powerpc/elf32_machdep.c
==============================================================================
--- head/sys/powerpc/powerpc/elf32_machdep.c    Wed Dec 19 21:56:54 2018        
(r342242)
+++ head/sys/powerpc/powerpc/elf32_machdep.c    Wed Dec 19 21:57:58 2018        
(r342243)
@@ -83,7 +83,6 @@ struct sysentvec elf32_freebsd_sysvec = {
 #else
        .sv_table       = sysent,
 #endif
-       .sv_mask        = 0,
        .sv_errsize     = 0,
        .sv_errtbl      = NULL,
        .sv_transtrap   = NULL,

Modified: head/sys/powerpc/powerpc/elf64_machdep.c
==============================================================================
--- head/sys/powerpc/powerpc/elf64_machdep.c    Wed Dec 19 21:56:54 2018        
(r342242)
+++ head/sys/powerpc/powerpc/elf64_machdep.c    Wed Dec 19 21:57:58 2018        
(r342243)
@@ -58,7 +58,6 @@ static void exec_setregs_funcdesc(struct thread *td, s
 struct sysentvec elf64_freebsd_sysvec_v1 = {
        .sv_size        = SYS_MAXSYSCALL,
        .sv_table       = sysent,
-       .sv_mask        = 0,
        .sv_errsize     = 0,
        .sv_errtbl      = NULL,
        .sv_transtrap   = NULL,
@@ -97,7 +96,6 @@ INIT_SYSENTVEC(elf64_sysvec_v1, &elf64_freebsd_sysvec_
 struct sysentvec elf64_freebsd_sysvec_v2 = {
        .sv_size        = SYS_MAXSYSCALL,
        .sv_table       = sysent,
-       .sv_mask        = 0,
        .sv_errsize     = 0,
        .sv_errtbl      = NULL,
        .sv_transtrap   = NULL,

Modified: head/sys/powerpc/powerpc/exec_machdep.c
==============================================================================
--- head/sys/powerpc/powerpc/exec_machdep.c     Wed Dec 19 21:56:54 2018        
(r342242)
+++ head/sys/powerpc/powerpc/exec_machdep.c     Wed Dec 19 21:57:58 2018        
(r342243)
@@ -867,8 +867,6 @@ cpu_set_syscall_retval(struct thread *td, int error)
        if (tf->fixreg[0] == SYS___syscall &&
            (SV_PROC_FLAG(p, SV_ILP32))) {
                int code = tf->fixreg[FIRSTARG + 1];
-               if (p->p_sysent->sv_mask)
-                       code &= p->p_sysent->sv_mask;
                fixup = (
 #if defined(COMPAT_FREEBSD6) && defined(SYS_freebsd6_lseek)
                    code != SYS_freebsd6_lseek &&

Modified: head/sys/powerpc/powerpc/trap.c
==============================================================================
--- head/sys/powerpc/powerpc/trap.c     Wed Dec 19 21:56:54 2018        
(r342242)
+++ head/sys/powerpc/powerpc/trap.c     Wed Dec 19 21:57:58 2018        
(r342243)
@@ -622,8 +622,6 @@ cpu_fetch_syscall_args(struct thread *td)
                }
        }
 
-       if (p->p_sysent->sv_mask)
-               sa->code &= p->p_sysent->sv_mask;
        if (sa->code >= p->p_sysent->sv_size)
                sa->callp = &p->p_sysent->sv_table[0];
        else

Modified: head/sys/riscv/riscv/elf_machdep.c
==============================================================================
--- head/sys/riscv/riscv/elf_machdep.c  Wed Dec 19 21:56:54 2018        
(r342242)
+++ head/sys/riscv/riscv/elf_machdep.c  Wed Dec 19 21:57:58 2018        
(r342243)
@@ -61,7 +61,6 @@ __FBSDID("$FreeBSD$");
 struct sysentvec elf64_freebsd_sysvec = {
        .sv_size        = SYS_MAXSYSCALL,
        .sv_table       = sysent,
-       .sv_mask        = 0,
        .sv_errsize     = 0,
        .sv_errtbl      = NULL,
        .sv_transtrap   = NULL,

Modified: head/sys/riscv/riscv/trap.c
==============================================================================
--- head/sys/riscv/riscv/trap.c Wed Dec 19 21:56:54 2018        (r342242)
+++ head/sys/riscv/riscv/trap.c Wed Dec 19 21:57:58 2018        (r342243)
@@ -111,8 +111,6 @@ cpu_fetch_syscall_args(struct thread *td)
                nap--;
        }
 
-       if (p->p_sysent->sv_mask)
-               sa->code &= p->p_sysent->sv_mask;
        if (sa->code >= p->p_sysent->sv_size)
                sa->callp = &p->p_sysent->sv_table[0];
        else

Modified: head/sys/sparc64/sparc64/elf_machdep.c
==============================================================================
--- head/sys/sparc64/sparc64/elf_machdep.c      Wed Dec 19 21:56:54 2018        
(r342242)
+++ head/sys/sparc64/sparc64/elf_machdep.c      Wed Dec 19 21:57:58 2018        
(r342243)
@@ -59,7 +59,6 @@ __FBSDID("$FreeBSD$");
 static struct sysentvec elf64_freebsd_sysvec = {
        .sv_size        = SYS_MAXSYSCALL,
        .sv_table       = sysent,
-       .sv_mask        = 0,
        .sv_errsize     = 0,
        .sv_errtbl      = NULL,
        .sv_transtrap   = NULL,

Modified: head/sys/sparc64/sparc64/trap.c
==============================================================================
--- head/sys/sparc64/sparc64/trap.c     Wed Dec 19 21:56:54 2018        
(r342242)
+++ head/sys/sparc64/sparc64/trap.c     Wed Dec 19 21:57:58 2018        
(r342243)
@@ -558,8 +558,6 @@ cpu_fetch_syscall_args(struct thread *td)
                regcnt--;
        }
 
-       if (p->p_sysent->sv_mask)
-               sa->code &= p->p_sysent->sv_mask;
        if (sa->code >= p->p_sysent->sv_size)
                sa->callp = &p->p_sysent->sv_table[0];
        else

Modified: head/sys/sys/sysent.h
==============================================================================
--- head/sys/sys/sysent.h       Wed Dec 19 21:56:54 2018        (r342242)
+++ head/sys/sys/sysent.h       Wed Dec 19 21:57:58 2018        (r342243)
@@ -95,7 +95,6 @@ struct vnode;
 struct sysentvec {
        int             sv_size;        /* number of entries */
        struct sysent   *sv_table;      /* pointer to sysent */
-       u_int           sv_mask;        /* optional mask to index */
        int             sv_errsize;     /* size of errno translation table */
        const int       *sv_errtbl;     /* errno translation table */
        int             (*sv_transtrap)(int, int);
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to