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

In cpu_fork() set tf_npc as well in case a signal is taken in child_return() 

which will cause the values of tf_pc and tf_npc set here in cpu_fork()
to be restored and used to return to user space from sigreturn() eventually
(before that the tf_pc and tf_npc set in sendsig() will be used in
proc_trampoline()).

Also, the fork system call never uses the SYSCALL_G2RFLAG shortcut, so drop
the code handling that.
This commit is contained in:
pk 2001-12-30 18:52:54 +00:00
parent c6d7884ffd
commit 5237c5fb99
1 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
sys/arch/sparc/sparc/vm_machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: vm_machdep.c,v 1.61 2001/12/30 16:41:29 pk Exp $ */ /* $NetBSD: vm_machdep.c,v 1.62 2001/12/30 18:52:54 pk Exp $ */
/* /*
* Copyright (c) 1996 * Copyright (c) 1996
@ -263,20 +263,16 @@ cpu_fork(p1, p2, stack, stacksize, func, arg)
if (stack != NULL) if (stack != NULL)
tf2->tf_out[6] = (u_int)stack + stacksize; tf2->tf_out[6] = (u_int)stack + stacksize;
/* Duplicate efforts of syscall(), but slightly differently */ /*
if (tf2->tf_global[1] & SYSCALL_G2RFLAG) { * The fork system call always uses the old system call
/* jmp %g2 (or %g7, deprecated) on success */ * convention; clear carry and skip trap instruction as
tf2->tf_pc = tf2->tf_global[2]; * in syscall().
} else { * note: proc_trampoline() sets a fresh psr when returning
/* * to user mode.
* old system call convention: clear C on success */
* note: proc_trampoline() sets a fresh psr when /*tf2->tf_psr &= ~PSR_C; -* success */
* returning to user mode. tf2->tf_pc = tf2->tf_npc;
*/ tf2->tf_npc = tf2->tf_pc + 4;
/*tf2->tf_psr &= ~PSR_C; -* success */
tf2->tf_pc = tf2->tf_npc;
}
/* proc_trampoline() will do npc = pc + 4 */
/* Set return values in child mode */ /* Set return values in child mode */
tf2->tf_out[0] = 0; tf2->tf_out[0] = 0;
@ -291,7 +287,6 @@ cpu_fork(p1, p2, stack, stacksize, func, arg)
npcb->pcb_sp = (int)rp; npcb->pcb_sp = (int)rp;
npcb->pcb_psr &= ~PSR_CWP; /* Run in window #0 */ npcb->pcb_psr &= ~PSR_CWP; /* Run in window #0 */
npcb->pcb_wim = 1; /* Fence at window #1 */ npcb->pcb_wim = 1; /* Fence at window #1 */
} }
/* /*