Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/usermode Move target/${USERMODE_CPU} to target/${MA...
details: https://anonhg.NetBSD.org/src/rev/d4a8bc19f80c
branches: trunk
changeset: 772550:d4a8bc19f80c
user: reinoud <reinoud%NetBSD.org@localhost>
date: Sat Jan 07 20:44:41 2012 +0000
description:
Move target/${USERMODE_CPU} to target/${MACHINE_CPU} to more clearly
distinguish between CPU specific ones and machine specific ones.
diffstat:
sys/arch/usermode/conf/GENERIC.amd64 | 5 +-
sys/arch/usermode/conf/GENERIC.i386 | 5 +-
sys/arch/usermode/conf/Makefile.usermode | 13 +-
sys/arch/usermode/target/amd64/cpu_amd64.c | 351 ---------------------------
sys/arch/usermode/target/x86_64/cpu_x86_64.c | 351 +++++++++++++++++++++++++++
5 files changed, 359 insertions(+), 366 deletions(-)
diffs (truncated from 787 to 300 lines):
diff -r 0b5972c7557a -r d4a8bc19f80c sys/arch/usermode/conf/GENERIC.amd64
--- a/sys/arch/usermode/conf/GENERIC.amd64 Sat Jan 07 20:20:22 2012 +0000
+++ b/sys/arch/usermode/conf/GENERIC.amd64 Sat Jan 07 20:44:41 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC.amd64,v 1.1 2012/01/06 20:44:57 reinoud Exp $
+# $NetBSD: GENERIC.amd64,v 1.2 2012/01/07 20:44:41 reinoud Exp $
machine usermode
include "arch/usermode/conf/GENERIC.common"
@@ -10,10 +10,9 @@
options KVMSIZE= 0x10000000 # KVM space reserved in VM map, 256 Mb
options NKMEMPAGES_MAX=32768 # 128 Mb max
-makeoptions USERMODE_CPU="amd64"
makeoptions COPTS+="-m64"
makeoptions LD="ld -melf_amd64"
#options INCLUDE_CONFIG_FILE
-#ident "GENERIC32-$Revision: 1.1 $"
+#ident "GENERIC32-$Revision: 1.2 $"
diff -r 0b5972c7557a -r d4a8bc19f80c sys/arch/usermode/conf/GENERIC.i386
--- a/sys/arch/usermode/conf/GENERIC.i386 Sat Jan 07 20:20:22 2012 +0000
+++ b/sys/arch/usermode/conf/GENERIC.i386 Sat Jan 07 20:44:41 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC.i386,v 1.3 2012/01/06 20:44:57 reinoud Exp $
+# $NetBSD: GENERIC.i386,v 1.4 2012/01/07 20:44:41 reinoud Exp $
machine usermode
include "arch/usermode/conf/GENERIC.common"
@@ -10,10 +10,9 @@
options KVMSIZE= 0x10000000 # KVM space reserved in VM map, 256 Mb
options NKMEMPAGES_MAX=32768 # 128 Mb max
-makeoptions USERMODE_CPU="i386"
makeoptions COPTS+="-m32"
makeoptions LD="ld -melf_i386"
#options INCLUDE_CONFIG_FILE
-#ident "GENERIC32-$Revision: 1.3 $"
+#ident "GENERIC32-$Revision: 1.4 $"
diff -r 0b5972c7557a -r d4a8bc19f80c sys/arch/usermode/conf/Makefile.usermode
--- a/sys/arch/usermode/conf/Makefile.usermode Sat Jan 07 20:20:22 2012 +0000
+++ b/sys/arch/usermode/conf/Makefile.usermode Sat Jan 07 20:44:41 2012 +0000
@@ -1,11 +1,5 @@
-# $NetBSD: Makefile.usermode,v 1.30 2012/01/07 20:07:00 reinoud Exp $
+# $NetBSD: Makefile.usermode,v 1.31 2012/01/07 20:44:41 reinoud Exp $
-OPT_CPU_HOST= %CPU_HOST%
-.if !empty(OPT_CPU_HOST)
-MACHINE_ARCH= ${OPT_CPU_HOST}
-.else
-MACHINE_ARCH= usermode
-.endif
USETOOLS?= no
NEED_OWN_INSTALL_TARGET?= no
.include <bsd.own.mk>
@@ -15,6 +9,7 @@
##
USERMODE= $S/arch/usermode
GENASSYM_CONF= ${USERMODE}/usermode/genassym.cf
+MACHINE_ARCH!=uname -p
##
## (2) compile settings
@@ -53,8 +48,8 @@
MD_CFILES= ${USERMODE}/usermode/thunk.c
MD_SFILES=
-MD_OBJS+= cpu_${USERMODE_CPU}.o
-MD_CFILES+= ${USERMODE}/target/${USERMODE_CPU}/cpu_${USERMODE_CPU}.c
+MD_OBJS+= cpu_${MACHINE_ARCH}.o
+MD_CFILES+= ${USERMODE}/target/${MACHINE_ARCH}/cpu_${MACHINE_ARCH}.c
##
## (5) link settings
diff -r 0b5972c7557a -r d4a8bc19f80c sys/arch/usermode/target/amd64/cpu_amd64.c
--- a/sys/arch/usermode/target/amd64/cpu_amd64.c Sat Jan 07 20:20:22 2012 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,351 +0,0 @@
-/* $NetBSD: cpu_amd64.c,v 1.1 2012/01/07 20:07:00 reinoud Exp $ */
-
-/*-
- * Copyright (c) 2011 Reinoud Zandijk <reinoud%netbsd.org@localhost>
- * Copyright (c) 2007 Jared D. McNeill <jmcneill%invisible.ca@localhost>
- * All rights reserved.
- *
- * 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.
- *
- * 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.
- */
-
-/*
- * Note that this machdep.c uses the `dummy' mcontext_t defined for usermode.
- * This is basicly a blob of PAGE_SIZE big. We might want to switch over to
- * non-generic mcontext_t's one day, but will this break non-NetBSD hosts?
- */
-
-
-#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu_amd64.c,v 1.1 2012/01/07 20:07:00 reinoud Exp $");
-
-#include <sys/types.h>
-#include <sys/systm.h>
-#include <sys/param.h>
-#include <sys/time.h>
-#include <sys/exec.h>
-#include <sys/buf.h>
-#include <sys/boot_flag.h>
-#include <sys/ucontext.h>
-#include <sys/utsname.h>
-#include <machine/pcb.h>
-#include <machine/psl.h>
-
-#include <uvm/uvm_extern.h>
-#include <uvm/uvm_page.h>
-
-#include <dev/mm.h>
-#include <machine/machdep.h>
-#include <machine/thunk.h>
-
-
-#if 0
-static void dump_regs(register_t *reg);;
-
-static void
-dump_regs(register_t *reg)
-{
- int i;
-
- /* register dump before call */
- const char *name[] = {"RDI", "RSI", "RDX", "RCX", "R8", "R9", "R10",
- "R11", "R12", "R13", "R14", "R15", "RBP", "RAX",
- "GS", "FS", "ES", "DS", "TRAPNO", "ERR", "RIP", "CS",
- "RFLAGS", "RSP", "SS"};
-
- for (i =0; i < 26; i++)
- printf("reg[%02d] (%6s) = %"PRIx32"\n",
- i, name[i], (uint32_t) reg[i]);
-}
-#endif
-
-
-/* from sys/arch/amd64/include/frame.h : KEEP IN SYNC */
-
-/*
- * Signal frame
- */
-struct sigframe_siginfo {
- uint64_t sf_ra; /* return address for handler */
- siginfo_t sf_si; /* actual saved siginfo */
- ucontext_t sf_uc; /* actual saved ucontext */
-};
-
-
-/* should be the same as i386 */
-/*
- * mcontext extensions to handle signal delivery.
- */
-#define _UC_SETSTACK 0x00010000
-#define _UC_CLRSTACK 0x00020000
-#define _UC_VM 0x00040000
-#define _UC_TLSBASE 0x00080000
-
-
-void
-sendsig_siginfo(const ksiginfo_t *ksi, const sigset_t *mask)
-{
- struct lwp *l = curlwp;
- struct proc *p = l->l_proc;
- struct pcb *pcb = lwp_getpcb(l);
- struct sigacts *ps = p->p_sigacts;
- struct sigframe_siginfo *fp, frame;
- int sig = ksi->ksi_signo;
- sig_t catcher = SIGACTION(p, sig).sa_handler;
- ucontext_t *ucp = &pcb->pcb_userret_ucp;
- register_t *reg = (register_t *) &ucp->uc_mcontext;
- int onstack, error;
- char *sp;
-
- KASSERT(mutex_owned(p->p_lock));
-
-#if 0
- thunk_printf("%s: ", __func__);
- thunk_printf("flags %d, ", (int) ksi->ksi_flags);
- thunk_printf("to lwp %d, signo %d, code %d, errno %d\n",
- (int) ksi->ksi_lid,
- ksi->ksi_signo,
- ksi->ksi_code,
- ksi->ksi_errno);
-#endif
-
- /* do we need to jump onto the signal stack? */
- onstack = (l->l_sigstk.ss_flags & (SS_DISABLE | SS_ONSTACK)) == 0
- && (SIGACTION(p, sig).sa_flags & SA_ONSTACK) != 0;
-
- sp = ((char *) reg[24] - 128);/* why -128?*//* RSP */
- if (onstack)
- sp = (char *) l->l_sigstk.ss_sp + l->l_sigstk.ss_size;
-
- sp -= sizeof(struct sigframe_siginfo);
- /*
- * Round down the stackpointer to a multiple of 16 for
- * fxsave and the ABI
- */
- fp = (struct sigframe_siginfo *) (((unsigned long)sp & ~15) - 8);
-
- /* set up stack frame */
- frame.sf_ra = (uint64_t) ps->sa_sigdesc[sig].sd_tramp;
- frame.sf_si._info = ksi->ksi_info;
-
- /* copy our userret context into sf_uc */
- memcpy(&frame.sf_uc, ucp, sizeof(ucontext_t));
- frame.sf_uc.uc_sigmask = *mask;
- frame.sf_uc.uc_link = l->l_ctxlink;
- frame.sf_uc.uc_flags |= (l->l_sigstk.ss_flags & SS_ONSTACK)
- ? _UC_SETSTACK : _UC_CLRSTACK;
- memset(&frame.sf_uc.uc_stack, 0, sizeof(frame.sf_uc.uc_stack));
- sendsig_reset(l, sig);
-
- /* copyout our frame to the stackframe */
- mutex_exit(p->p_lock);
- error = copyout(&frame, fp, sizeof(frame));
- mutex_enter(p->p_lock);
-
- if (error != 0) {
- /*
- * Process has trashed its stack; give it an illegal
- * instruction to halt it in its tracks.
- */
- sigexit(l, SIGILL);
- /* NOTREACHED */
- }
-
- /* set catcher and the new stack pointer */
- reg[24] = (register_t) fp; /* RSP */
- reg[21] = (register_t) catcher; /* RIP */
-
- reg[ 0] = sig; /* RDI */
- reg[ 1] = (uint64_t) &fp->sf_si; /* RSI */
- reg[ 2] = (uint64_t) &fp->sf_uc; /* RDX */
- reg[11] = reg[ 2]; /* R15 = RDX */
-
- /* Remember that we're now on the signal stack. */
- if (onstack)
- l->l_sigstk.ss_flags |= SS_ONSTACK;
-}
-
-void
-setregs(struct lwp *l, struct exec_package *pack, vaddr_t stack)
-{
- struct pcb *pcb = lwp_getpcb(l);
- ucontext_t *ucp = &pcb->pcb_userret_ucp;
- register_t *reg;
- int i;
-
- reg = (register_t *) &ucp->uc_mcontext;
- for (i = 0; i < 15; i++)
- reg[i] = 0;
-
- reg[13] = l->l_proc->p_psstrp; /* RBX */
- reg[21] = pack->ep_entry; /* RIP */
- reg[24] = (register_t) stack; /* RSP */
-
- ucp->uc_stack.ss_sp = (void *) stack;
- ucp->uc_stack.ss_size = pack->ep_ssize;
-
- //dump_regs(reg);
-}
-
-void
-md_syscall_get_syscallnumber(ucontext_t *ucp, uint32_t *code)
-{
- register_t *reg = (register_t *) &ucp->uc_mcontext;
- *code = reg[14]; /* RAX */
-}
-
-int
-md_syscall_getargs(lwp_t *l, ucontext_t *ucp, int nargs, int argsize,
- register_t *args)
-{
- register_t *reg = (register_t *) &ucp->uc_mcontext;
Home |
Main Index |
Thread Index |
Old Index