Module Name: src
Committed By: matt
Date: Fri Aug 21 17:58:58 UTC 2009
Modified Files:
src/sys/compat/irix [matt-nb5-mips64]: irix_signal.c
src/sys/compat/linux/arch/mips [matt-nb5-mips64]: linux_machdep.c
Log Message:
Adapt to mips changes. Use PRIx*
To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.48.18.1 src/sys/compat/irix/irix_signal.c
cvs rdiff -u -r1.38 -r1.38.18.1 \
src/sys/compat/linux/arch/mips/linux_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/compat/irix/irix_signal.c
diff -u src/sys/compat/irix/irix_signal.c:1.48 src/sys/compat/irix/irix_signal.c:1.48.18.1
--- src/sys/compat/irix/irix_signal.c:1.48 Mon Apr 28 20:23:42 2008
+++ src/sys/compat/irix/irix_signal.c Fri Aug 21 17:58:58 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: irix_signal.c,v 1.48 2008/04/28 20:23:42 martin Exp $ */
+/* $NetBSD: irix_signal.c,v 1.48.18.1 2009/08/21 17:58:58 matt Exp $ */
/*-
* Copyright (c) 1994, 2001-2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: irix_signal.c,v 1.48 2008/04/28 20:23:42 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: irix_signal.c,v 1.48.18.1 2009/08/21 17:58:58 matt Exp $");
#include <sys/types.h>
#include <sys/signal.h>
@@ -245,20 +245,19 @@
struct lwp *l = curlwp;
struct proc *p = l->l_proc;
void *sp;
- struct frame *f;
+ struct frame *f = l->l_md.md_regs;
int onstack;
int error;
sig_t catcher = SIGACTION(p, ksi->ksi_signo).sa_handler;
struct irix_sigframe sf;
- f = (struct frame *)l->l_md.md_regs;
#ifdef DEBUG_IRIX
printf("irix_sendsig()\n");
printf("catcher = %p, sig = %d, code = 0x%x\n",
(void *)catcher, ksi->ksi_signo, ksi->ksi_trap);
- printf("irix_sendsig(): starting [PC=%p SP=%p SR=0x%08lx]\n",
- (void *)f->f_regs[_R_PC], (void *)f->f_regs[_R_SP],
- f->f_regs[_R_SR]);
+ printf("irix_sendsig(): starting [PC=0x%#"PRIxREGISTER
+ " SP=%#"PRIxREGISTER" SR=0x%08lx]\n",
+ f->f_regs[_R_PC], f->f_regs[_R_SP], f->f_regs[_R_SR]);
#endif /* DEBUG_IRIX */
/*
@@ -278,7 +277,7 @@
sp = (void *)((char *)l->l_sigstk.ss_sp
+ l->l_sigstk.ss_size);
else
- /* cast for _MIPS_BSD_API == _MIPS_BSD_API_LP32_64CLEAN case */
+ /* cast for O64 case */
sp = (void *)(u_int32_t)f->f_regs[_R_SP];
/*
Index: src/sys/compat/linux/arch/mips/linux_machdep.c
diff -u src/sys/compat/linux/arch/mips/linux_machdep.c:1.38 src/sys/compat/linux/arch/mips/linux_machdep.c:1.38.18.1
--- src/sys/compat/linux/arch/mips/linux_machdep.c:1.38 Mon Apr 28 20:23:43 2008
+++ src/sys/compat/linux/arch/mips/linux_machdep.c Fri Aug 21 17:58:58 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_machdep.c,v 1.38 2008/04/28 20:23:43 martin Exp $ */
+/* $NetBSD: linux_machdep.c,v 1.38.18.1 2009/08/21 17:58:58 matt Exp $ */
/*-
* Copyright (c) 1995, 2000, 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.38 2008/04/28 20:23:43 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.38.18.1 2009/08/21 17:58:58 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -145,11 +145,11 @@
*/
if (onstack)
fp = (struct linux_sigframe *)
- ((uint8_t *)l->l_sigstk.ss_sp
+ ((uintptr_t)l->l_sigstk.ss_sp
+ l->l_sigstk.ss_size);
else
- /* cast for _MIPS_BSD_API == _MIPS_BSD_API_LP32_64CLEAN case */
- fp = (struct linux_sigframe *)(u_int32_t)f->f_regs[_R_SP];
+ /* cast for O64 ABI case */
+ fp = (struct linux_sigframe *)(uintptr_t)f->f_regs[_R_SP];
/*
* Build stack frame for signal trampoline.
