 @@ -1,31 +1,31 @@
-/*	$NetBSD: compat_13_machdep.c,v 1.18 2009/12/14 00:46:05 matt Exp $	*/
+/*	$NetBSD: compat_13_machdep.c,v 1.19 2009/12/14 12:53:18 uebayasi Exp $	*/
 /*
  * Copyright 1996 The Board of Trustees of The Leland Stanford
  * Junior University. All Rights Reserved.
+ *
  * Permission to use, copy, modify, and distribute this
  * software and its documentation for any purpose and without
  * fee is hereby granted, provided that the above copyright
  * notice appear in all copies.  Stanford University
  * makes no representations about the suitability of this
  * software for any purpose.  It is provided "as is" without
  * express or implied warranty.
  */
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: compat_13_machdep.c,v 1.18 2009/12/14 00:46:05 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_13_machdep.c,v 1.19 2009/12/14 12:53:18 uebayasi Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/signalvar.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/mount.h>
 #include <sys/syscallargs.h>
 #include <compat/sys/signal.h>
 #include <compat/sys/signalvar.h>
 #include <mips/regnum.h>
 @@ -74,27 +74,28 @@ compat_13_sys_sigreturn(struct lwp *l, c
 	if ((uint32_t)ksc.sc_regs[_R_ZERO] != 0xacedbadeU)/* magic number */
 		return (EINVAL);
 	/* Resture the register context. */
 	f = l->l_md.md_regs;
 	f->f_regs[_R_PC] = ksc.sc_pc;
 	f->f_regs[_R_MULLO] = ksc.mullo;
 	f->f_regs[_R_MULHI] = ksc.mulhi;
 #if defined(__mips_o32)
 	memcpy(&f->f_regs[1], &scp->sc_regs[1],
 	    sizeof(scp->sc_regs) - sizeof(scp->sc_regs[0]));
 #else
-	for (size_t i = 1; i < __arraycount(scp->sc_regs); i++)
+	size_t i;
 	for (i = 1; i < __arraycount(scp->sc_regs); i++)
 		f->f_regs[i] = scp->sc_regs[i];
 #endif
 	if (scp->sc_fpused) {
 		struct pcb * const pcb = lwp_getpcb(l);
 		*(struct fpreg *)&pcb->pcb_fpregs = *(struct fpreg *)scp->sc_fpregs;
+	}
 	mutex_enter(p->p_lock);
 	/* Restore signal stack. */
 	if (ksc.sc_onstack & SS_ONSTACK)
 		l->l_sigstk.ss_flags |= SS_ONSTACK;
 	else

 @@ -1,14 +1,14 @@
-/*	$NetBSD: compat_16_machdep.c,v 1.15 2009/12/14 00:46:05 matt Exp $	*/
+/*	$NetBSD: compat_16_machdep.c,v 1.16 2009/12/14 12:53:18 uebayasi Exp $	*/
 /*-
  * Copyright (c) 1998, 2001 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
  * NASA Ames Research Center and by Chris Demetriou.
+ *
  * 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
 @@ -35,27 +35,27 @@
  * Junior University. All Rights Reserved.
+ *
  * Permission to use, copy, modify, and distribute this
  * software and its documentation for any purpose and without
  * fee is hereby granted, provided that the above copyright
  * notice appear in all copies.  Stanford University
  * makes no representations about the suitability of this
  * software for any purpose.  It is provided "as is" without
  * express or implied warranty.
  */
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: compat_16_machdep.c,v 1.15 2009/12/14 00:46:05 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_16_machdep.c,v 1.16 2009/12/14 12:53:18 uebayasi Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_cputype.h"
 #include "opt_compat_netbsd.h"
 #include "opt_compat_ultrix.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/signal.h>
 #include <sys/signalvar.h>
 @@ -115,27 +115,28 @@ sendsig_sigcontext(const ksiginfo_t *ksi
 #endif
 	/* Build stack frame for signal trampoline. */
 	ksc.sc_pc = f->f_regs[_R_PC];
 	ksc.mullo = f->f_regs[_R_MULLO];
 	ksc.mulhi = f->f_regs[_R_MULHI];
 	/* Save register context. */
 	ksc.sc_regs[_R_ZERO] = 0xACEDBADE;		/* magic number */
 #if defined(__mips_o32)
 	memcpy(&ksc.sc_regs[1], &f->f_regs[1],
 	    sizeof(ksc.sc_regs) - sizeof(ksc.sc_regs[0]));
 #else
-	for (size_t i = 1; i < 32; i++)
+	size_t i;
 	for (i = 1; i < 32; i++)
 		ksc.sc_regs[i] = f->f_regs[i];
 #endif
 	/* Save the FP state, if necessary, then copy it. */
 	pcb = lwp_getpcb(l);
 #ifndef SOFTFLOAT
 	ksc.sc_fpused = l->l_md.md_flags & MDP_FPUSED;
 	if (ksc.sc_fpused) {
 		/* if FPU has current state, save it first */
 		savefpregs(l);
+	}
 #endif
 	*(struct fpreg *)ksc.sc_fpregs = *(struct fpreg *)&pcb->pcb_fpregs;
 @@ -262,27 +263,28 @@ compat_16_sys___sigreturn14(struct lwp *
 	if ((u_int) ksc.sc_regs[_R_ZERO] != 0xacedbadeU)/* magic number */
 		return (EINVAL);
 	/* Restore the register context. */
 	f = l->l_md.md_regs;
 	f->f_regs[_R_PC] = ksc.sc_pc;
 	f->f_regs[_R_MULLO] = ksc.mullo;
 	f->f_regs[_R_MULHI] = ksc.mulhi;
 #if defined(__mips_o32)
 	memcpy(&f->f_regs[1], &scp->sc_regs[1],
 	    sizeof(scp->sc_regs) - sizeof(scp->sc_regs[0]));
 #else
-	for (size_t i = 1; i < __arraycount(f->f_regs); i++)
+	size_t i;
 	for (i = 1; i < __arraycount(f->f_regs); i++)
 		f->f_regs[i] = ksc.sc_regs[i];
 #endif
 #ifndef	SOFTFLOAT
 	if (scp->sc_fpused) {
 		/* Disable the FPU to fault in FP registers. */
 		f->f_regs[_R_SR] &= ~MIPS_SR_COP_1_BIT;
 		fpcurlwp = &lwp0;
+	}
 #endif
 	pcb = lwp_getpcb(l);
 	*(struct fpreg *)&pcb->pcb_fpregs = *(struct fpreg *)scp->sc_fpregs;
 	mutex_enter(p->p_lock);