[src/trunk]: src/sys/arch/i386 put compat-specific locore code to separate *_...

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/sys/arch/i386 put compat-specific locore code to separate *_...
From: jdolecek <jdolecek%NetBSD.org@localhost>
Date: Fri, 24 Jan 2020 08:13:57 +0000
details:   https://anonhg.NetBSD.org/src/rev/68b7b219c6b5
branches:  trunk
changeset: 499522:68b7b219c6b5
user:      jdolecek <jdolecek%NetBSD.org@localhost>
date:      Tue Nov 21 21:13:23 2000 +0000

description:
put compat-specific locore code to separate *_locore.s files

diffstat:

 sys/arch/i386/conf/files.i386       |    6 +-
 sys/arch/i386/i386/freebsd_locore.s |   99 +++++++++++++++++++
 sys/arch/i386/i386/ibcs2_locore.s   |   98 +++++++++++++++++++
 sys/arch/i386/i386/linux_locore.s   |  129 +++++++++++++++++++++++++
 sys/arch/i386/i386/locore.s         |  151 +-----------------------------
 sys/arch/i386/i386/svr4_locore.s    |  181 ++++++++++++++++++++++++++++++++++++
 6 files changed, 513 insertions(+), 151 deletions(-)

diffs (truncated from 741 to 300 lines):

diff -r 6a9c12db6bff -r 68b7b219c6b5 sys/arch/i386/conf/files.i386
--- a/sys/arch/i386/conf/files.i386     Tue Nov 21 16:34:52 2000 +0000
+++ b/sys/arch/i386/conf/files.i386     Tue Nov 21 21:13:23 2000 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.i386,v 1.171 2000/11/08 19:49:09 ad Exp $
+#      $NetBSD: files.i386,v 1.172 2000/11/21 21:13:24 jdolecek Exp $
 #
 # new style config file for i386 architecture
 #
@@ -306,18 +306,22 @@
 # SVR4 binary compatibility (COMPAT_SVR4)
 include "compat/svr4/files.svr4"
 file   arch/i386/i386/svr4_machdep.c           compat_svr4
+file   arch/i386/i386/svr4_locore.s            compat_svr4
 
 # iBCS-2 binary compatibility (COMPAT_IBCS2)
 include "compat/ibcs2/files.ibcs2"
 file   arch/i386/i386/ibcs2_machdep.c          compat_ibcs2
+file   arch/i386/i386/ibcs2_locore.s           compat_ibcs2
 
 # Linux binary compatibility (COMPAT_LINUX)
 include "compat/linux/files.linux"
 include "compat/linux/arch/i386/files.linux_i386"
+file   arch/i386/i386/linux_locore.s           compat_linux
 
 # FreeBSD binary compatibility (COMPAT_FREEBSD)
 include "compat/freebsd/files.freebsd"
 file   arch/i386/i386/freebsd_machdep.c        compat_freebsd
+file   arch/i386/i386/freebsd_locore.s         compat_freebsd
 
 # a.out binary compatibility (COMPAT_AOUT)
 include "compat/aout/files.aout"
diff -r 6a9c12db6bff -r 68b7b219c6b5 sys/arch/i386/i386/freebsd_locore.s
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/i386/i386/freebsd_locore.s       Tue Nov 21 21:13:23 2000 +0000
@@ -0,0 +1,99 @@
+/*     $NetBSD: freebsd_locore.s,v 1.1 2000/11/21 21:13:23 jdolecek Exp $      */
+
+/*-
+ * Copyright (c) 1998 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Charles M. Hannum.
+ *
+ * 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 NetBSD
+ *        Foundation, Inc. and its contributors.
+ * 4. Neither the name of The NetBSD Foundation 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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
+ */
+
+/*-
+ * Copyright (c) 1990 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * William Jolitz.
+ *
+ * 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.
+ *
+ *     @(#)locore.s    7.3 (Berkeley) 5/13/91
+ */
+
+#include "assym.h"
+
+#include <sys/errno.h>
+#include <sys/syscall.h>
+
+#include <compat/freebsd/freebsd_syscall.h>
+#include <machine/asm.h>
+
+/*
+ * Signal trampoline; copied to top of user stack.
+ */
+NENTRY(freebsd_sigcode)
+       call    FREEBSD_SIGF_HANDLER(%esp)
+       leal    FREEBSD_SIGF_SC(%esp),%eax # scp (the call may have clobbered
+                                       # the copy at SIGF_SCP(%esp))
+       pushl   %eax
+       pushl   %eax                    # junk to fake return address
+       movl    $FREEBSD_SYS_sigreturn,%eax
+       int     $0x80                   # enter kernel with args on stack
+       movl    $FREEBSD_SYS_exit,%eax
+       int     $0x80                   # exit if sigreturn fails
+       .globl  _C_LABEL(freebsd_esigcode)
+_C_LABEL(freebsd_esigcode):
diff -r 6a9c12db6bff -r 68b7b219c6b5 sys/arch/i386/i386/ibcs2_locore.s
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/i386/i386/ibcs2_locore.s Tue Nov 21 21:13:23 2000 +0000
@@ -0,0 +1,98 @@
+/*     $NetBSD: ibcs2_locore.s,v 1.1 2000/11/21 21:13:23 jdolecek Exp $        */
+
+/*-
+ * Copyright (c) 1998 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Charles M. Hannum.
+ *
+ * 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 NetBSD
+ *        Foundation, Inc. and its contributors.
+ * 4. Neither the name of The NetBSD Foundation 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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
+ */
+
+/*-
+ * Copyright (c) 1990 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * William Jolitz.
+ *
+ * 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.
+ *
+ *     @(#)locore.s    7.3 (Berkeley) 5/13/91
+ */
+
+#include "opt_vm86.h"
+#include "assym.h"
+
+#include <machine/asm.h>
+#include <compat/ibcs2/ibcs2_syscall.h>
+
+NENTRY(ibcs2_sigcode)
+       call    SIGF_HANDLER(%esp)
+       leal    SIGF_SC(%esp),%eax      # scp (the call may have clobbered the
+                                       # copy at SIGF_SCP(%esp))
+       movl    SC_FS(%eax),%ecx
+       movl    SC_GS(%eax),%edx
+       movl    %cx,%fs
+       movl    %dx,%gs
+       pushl   %eax
+       pushl   %eax                    # junk to fake return address
+       movl    $IBCS2_SYS_sigreturn,%eax
+       int     $0x80                   # enter kernel with args on stack
+       movl    $IBCS2_SYS_exit,%eax
+       int     $0x80                   # exit if sigreturn fails
+       .globl  _C_LABEL(ibcs2_esigcode)
+_C_LABEL(ibcs2_esigcode):
diff -r 6a9c12db6bff -r 68b7b219c6b5 sys/arch/i386/i386/linux_locore.s
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/i386/i386/linux_locore.s Tue Nov 21 21:13:23 2000 +0000
@@ -0,0 +1,129 @@
+/*     $NetBSD: linux_locore.s,v 1.1 2000/11/21 21:13:23 jdolecek Exp $        */
+
+/*-
+ * Copyright (c) 1998 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Charles M. Hannum.
+ *
+ * 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 NetBSD
+ *        Foundation, Inc. and its contributors.
+ * 4. Neither the name of The NetBSD Foundation 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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
+ */
+
+/*-
+ * Copyright (c) 1990 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * William Jolitz.
+ *
+ * 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
Prev by Date: [src/trunk]: src lsu -> ld, by popular request.
Next by Date: [src/trunk]: src/sys/arch/i386/conf comment out entries accidentaly committed...
Previous by Thread: [src/trunk]: src lsu -> ld, by popular request.
Next by Thread: [src/trunk]: src/sys/arch/i386/conf comment out entries accidentaly committed...
Indexes:
Home | Main Index | Thread Index | Old Index