Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use a modified buildcontext function for Linux signals. It doesn't set

Browse Source 
the unused segment registers, it just uses the already used values.
This commit is contained in:
fvdl 2005-05-22 14:52:12 +00:00
parent 1bd2839e9a
commit beae305307
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
sys/compat/linux/arch/amd64/linux_machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: linux_machdep.c,v 1.4 2005/05/20 12:48:27 fvdl Exp $ */ /* $NetBSD: linux_machdep.c,v 1.5 2005/05/22 14:52:12 fvdl Exp $ */
/*- /*-
* Copyright (c) 2005 Emmanuel Dreyfus, all rights reserved. * Copyright (c) 2005 Emmanuel Dreyfus, all rights reserved.
@ -33,7 +33,7 @@
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.4 2005/05/20 12:48:27 fvdl Exp $"); __KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.5 2005/05/22 14:52:12 fvdl Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/types.h> #include <sys/types.h>
@ -61,6 +61,8 @@ __KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.4 2005/05/20 12:48:27 fvdl Exp $
#include <compat/linux/linux_syscall.h> #include <compat/linux/linux_syscall.h>
#include <compat/linux/linux_syscallargs.h> #include <compat/linux/linux_syscallargs.h>
static void linux_buildcontext(struct lwp *, void *, void *);
void void
linux_setregs(l, epp, stack) linux_setregs(l, epp, stack)
struct lwp *l; struct lwp *l;
@ -280,7 +282,7 @@ linux_sendsig(ksi, mask)
* when the signal handler is called. The +24 below is a dirty * when the signal handler is called. The +24 below is a dirty
* workaround, and the real problem should be fixed. * workaround, and the real problem should be fixed.
*/ */
buildcontext(l, catcher, sp + 24); linux_buildcontext(l, catcher, sp + 24);
tf->tf_rdi = sigframe.info.lsi_signo; tf->tf_rdi = sigframe.info.lsi_signo;
tf->tf_rax = 0; tf->tf_rax = 0;
tf->tf_rsi = (long)&sfp->info; tf->tf_rsi = (long)&sfp->info;
@ -582,3 +584,16 @@ linux_usertrap(struct lwp *l, vaddr_t trapaddr, void *arg)
return 1; return 1;
} }
static void
linux_buildcontext(struct lwp *l, void *catcher, void *f)
{
struct trapframe *tf = l->l_md.md_regs;
tf->tf_ds = GSEL(GUDATA_SEL, SEL_UPL);
tf->tf_rip = (u_int64_t)catcher;
tf->tf_cs = GSEL(GUCODE_SEL, SEL_UPL);
tf->tf_rflags &= ~(PSL_T|PSL_VM|PSL_AC);
tf->tf_rsp = (u_int64_t)f;
tf->tf_ss = GSEL(GUDATA_SEL, SEL_UPL);
}