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

For 32bit execs, frob the stackframe to return via the old system call 

return path.
This commit is contained in:
fvdl 2002-06-04 11:14:21 +00:00
parent 90c2a2ddc1
commit 2c7bad720d
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/arch/x86_64/x86_64/netbsd32_machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: netbsd32_machdep.c,v 1.4 2002/06/03 18:23:17 fvdl Exp $ */
/* $NetBSD: netbsd32_machdep.c,v 1.5 2002/06/04 11:14:22 fvdl Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@ -62,11 +62,14 @@
int process_read_fpregs32(struct proc *, struct fpreg32 *);
int process_read_regs32(struct proc *, struct reg32 *);
extern void (osyscall_return) __P((void));
void
netbsd32_setregs(struct proc *p, struct exec_package *pack, u_long stack)
{
struct pcb *pcb = &p->p_addr->u_pcb;
struct trapframe *tf;
void **retaddr;
/* If we were using the FPU, forget about it. */
if (fpuproc == p)
@ -112,6 +115,10 @@ netbsd32_setregs(struct proc *p, struct exec_package *pack, u_long stack)
tf->tf_rflags = PSL_USERSET;
tf->tf_rsp = stack;
tf->tf_ss = LSEL(LUDATA32_SEL, SEL_UPL);
/* XXX frob return address to return via old iret method, not sysret */
retaddr = (void **)tf - 1;
*retaddr = (void *)osyscall_return;
}
void

4
sys/arch/x86_64/x86_64/vector.S
View File

@ -1,4 +1,4 @@
/* $NetBSD: vector.S,v 1.4 2002/06/03 18:23:17 fvdl Exp $ */
/* $NetBSD: vector.S,v 1.5 2002/06/04 11:14:21 fvdl Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -330,6 +330,7 @@ osyscall1:
#endif /* DIAGNOSTIC */
movq %rsp,P_MD_REGS(%rdx) # save pointer to frame
call *P_MD_SYSCALL(%rdx)
_C_LABEL(osyscall_return):
2: /* Check for ASTs on exit to user mode. */
cli
cmpb $0,_C_LABEL(astpending)(%rip)
@ -415,6 +416,7 @@ osyscall1:
*/
.globl _C_LABEL(isa_strayintr)
.globl _C_LABEL(osyscall_return)
/*
* Normal vectors.