CVS commit: [netbsd-5] src/sys/arch/powerpc/powerpc

2011-02-16 Thread Manuel Bouyer 
Module Name:src
Committed By:   bouyer
Date:   Wed Feb 16 21:16:14 UTC 2011

Modified Files:
src/sys/arch/powerpc/powerpc [netbsd-5]: sig_machdep.c

Log Message:
Pull up following revision(s) (requested by jmmv in ticket #1551):
sys/arch/powerpc/powerpc/sig_machdep.c: revision 1.39 via patch
PR port-macppc/43619
Save handler before calling sendsig_reset before it will reset to SIG_DFL
is SA_RESETHAND is set.


To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.32.12.1 src/sys/arch/powerpc/powerpc/sig_machdep.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/powerpc/powerpc/sig_machdep.c
diff -u src/sys/arch/powerpc/powerpc/sig_machdep.c:1.32 src/sys/arch/powerpc/powerpc/sig_machdep.c:1.32.12.1
--- src/sys/arch/powerpc/powerpc/sig_machdep.c:1.32	Thu Apr 24 18:39:21 2008
+++ src/sys/arch/powerpc/powerpc/sig_machdep.c	Wed Feb 16 21:16:13 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: sig_machdep.c,v 1.32 2008/04/24 18:39:21 ad Exp $	*/
+/*	$NetBSD: sig_machdep.c,v 1.32.12.1 2011/02/16 21:16:13 bouyer Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: sig_machdep.c,v 1.32 2008/04/24 18:39:21 ad Exp $);
+__KERNEL_RCSID(0, $NetBSD: sig_machdep.c,v 1.32.12.1 2011/02/16 21:16:13 bouyer Exp $);
 
 #include opt_compat_netbsd.h
 #include opt_ppcarch.h
@@ -58,9 +58,11 @@
 	struct lwp * const l = curlwp;
 	struct proc * const p = l-l_proc;
 	struct trapframe * const tf = trapframe(l);
-	struct sigaltstack *ss = l-l_sigstk;
-	const struct sigact_sigdesc *sd =
+	struct sigaltstack * const ss = l-l_sigstk;
+	const struct sigact_sigdesc * const sd =
 	p-p_sigacts-sa_sigdesc[ksi-ksi_signo];
+	/* save handler before sendsig_reset trashes it! */
+	const void * const handler = sd-sd_sigact.sa_handler;
 	ucontext_t uc;
 	vaddr_t sp, sip, ucp;
 	int onstack, error;
@@ -130,7 +132,7 @@
 		/* Preserve ucp across call to signal function */
 		tf-fixreg[30] = (register_t)ucp;
 		tf-lr = (register_t)sd-sd_tramp;
-		tf-srr0   = (register_t)sd-sd_sigact.sa_handler;
+		tf-srr0   = (register_t)handler;
 		break;
 
 	default:

CVS commit: [netbsd-5] src/sys/arch/powerpc/powerpc

2009-06-09 Thread Soren Jacobsen 
Module Name:src
Committed By:   snj
Date:   Tue Jun  9 17:52:58 UTC 2009

Modified Files:
src/sys/arch/powerpc/powerpc [netbsd-5]: locore_subr.S vm_machdep.c

Log Message:
Pull up following revision(s) (requested by martin in ticket #801):
sys/arch/powerpc/powerpc/locore_subr.S: revision 1.38
sys/arch/powerpc/powerpc/vm_machdep.c: revision 1.77
Do not use the same trampoline for cpu_setfunc and cpu_lwp_fork, the
latter does a lot more work.


To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.37.14.1 src/sys/arch/powerpc/powerpc/locore_subr.S
cvs rdiff -u -r1.74 -r1.74.4.1 src/sys/arch/powerpc/powerpc/vm_machdep.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/powerpc/powerpc/locore_subr.S
diff -u src/sys/arch/powerpc/powerpc/locore_subr.S:1.37 src/sys/arch/powerpc/powerpc/locore_subr.S:1.37.14.1
--- src/sys/arch/powerpc/powerpc/locore_subr.S:1.37	Thu Apr 10 23:29:01 2008
+++ src/sys/arch/powerpc/powerpc/locore_subr.S	Tue Jun  9 17:52:58 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore_subr.S,v 1.37 2008/04/10 23:29:01 matt Exp $	*/
+/*	$NetBSD: locore_subr.S,v 1.37.14.1 2009/06/09 17:52:58 snj Exp $	*/
 
 /*
  * Copyright (c) 2001 Wasabi Systems, Inc.
@@ -288,6 +288,9 @@
 	 */
 	bl	_C_LABEL(lwp_startup)
 
+	.globl	_C_LABEL(setfunc_trampoline)
+_C_LABEL(setfunc_trampoline):
+
 	mtlr	%r31
 	mr	%r3,%r30
 	blrl/* jump indirect to r31 */

Index: src/sys/arch/powerpc/powerpc/vm_machdep.c
diff -u src/sys/arch/powerpc/powerpc/vm_machdep.c:1.74 src/sys/arch/powerpc/powerpc/vm_machdep.c:1.74.4.1
--- src/sys/arch/powerpc/powerpc/vm_machdep.c:1.74	Sat Oct 25 09:10:07 2008
+++ src/sys/arch/powerpc/powerpc/vm_machdep.c	Tue Jun  9 17:52:58 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: vm_machdep.c,v 1.74 2008/10/25 09:10:07 mrg Exp $	*/
+/*	$NetBSD: vm_machdep.c,v 1.74.4.1 2009/06/09 17:52:58 snj Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: vm_machdep.c,v 1.74 2008/10/25 09:10:07 mrg Exp $);
+__KERNEL_RCSID(0, $NetBSD: vm_machdep.c,v 1.74.4.1 2009/06/09 17:52:58 snj Exp $);
 
 #include opt_altivec.h
 #include opt_multiprocessor.h
@@ -351,7 +351,7 @@
 void
 cpu_setfunc(struct lwp *l, void (*func)(void *), void *arg)
 {
-	extern void fork_trampoline(void);
+	extern void setfunc_trampoline(void);
 	struct pcb *pcb = l-l_addr-u_pcb;
 	struct trapframe *tf;
 	struct callframe *cf;
@@ -359,7 +359,7 @@
 
 	tf = trapframe(l);
 	cf = (struct callframe *) ((uintptr_t)tf  ~(CALLFRAMELEN-1));
-	cf-lr = (register_t)cpu_lwp_bootstrap;
+	cf-lr = (register_t)setfunc_trampoline;
 	cf--;
 	cf-sp = (register_t) (cf+1);
 	cf-r31 = (register_t) func;