Module Name: src
Committed By: uebayasi
Date: Thu Aug 20 04:36:05 UTC 2009
Modified Files:
src/sys/arch/mips/mips [matt-nb5-mips64]: mips_emul.c mips_machdep.c
trap.c
Log Message:
Cast register_t to intptr_t before casting to (void *) because
sizeof(register_t) == 64 and sizeof(void *) == 32 in N32 ABI.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.14.78.1 src/sys/arch/mips/mips/mips_emul.c
cvs rdiff -u -r1.205.4.1.2.1 -r1.205.4.1.2.1.2.1 \
src/sys/arch/mips/mips/mips_machdep.c
cvs rdiff -u -r1.217 -r1.217.12.1 src/sys/arch/mips/mips/trap.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/mips/mips/mips_emul.c
diff -u src/sys/arch/mips/mips/mips_emul.c:1.14 src/sys/arch/mips/mips/mips_emul.c:1.14.78.1
--- src/sys/arch/mips/mips/mips_emul.c:1.14 Sat Aug 26 20:15:28 2006
+++ src/sys/arch/mips/mips/mips_emul.c Thu Aug 20 04:36:05 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: mips_emul.c,v 1.14 2006/08/26 20:15:28 matt Exp $ */
+/* $NetBSD: mips_emul.c,v 1.14.78.1 2009/08/20 04:36:05 uebayasi Exp $ */
/*
* Copyright (c) 1999 Shuichiro URATA. All rights reserved.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mips_emul.c,v 1.14 2006/08/26 20:15:28 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mips_emul.c,v 1.14.78.1 2009/08/20 04:36:05 uebayasi Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -410,7 +410,7 @@
ksi.ksi_signo = SIGSEGV;
ksi.ksi_trap = cause;
ksi.ksi_code = SEGV_MAPERR;
- ksi.ksi_addr = (void *)frame->f_regs[_R_PC];
+ ksi.ksi_addr = (void *)(intptr_t)frame->f_regs[_R_PC];
(*curproc->p_emul->e_trapsignal)(curlwp, &ksi);
break;
}
Index: src/sys/arch/mips/mips/mips_machdep.c
diff -u src/sys/arch/mips/mips/mips_machdep.c:1.205.4.1.2.1 src/sys/arch/mips/mips/mips_machdep.c:1.205.4.1.2.1.2.1
--- src/sys/arch/mips/mips/mips_machdep.c:1.205.4.1.2.1 Tue Jun 9 17:48:20 2009
+++ src/sys/arch/mips/mips/mips_machdep.c Thu Aug 20 04:36:05 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: mips_machdep.c,v 1.205.4.1.2.1 2009/06/09 17:48:20 snj Exp $ */
+/* $NetBSD: mips_machdep.c,v 1.205.4.1.2.1.2.1 2009/08/20 04:36:05 uebayasi Exp $ */
/*
* Copyright 2002 Wasabi Systems, Inc.
@@ -112,7 +112,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: mips_machdep.c,v 1.205.4.1.2.1 2009/06/09 17:48:20 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mips_machdep.c,v 1.205.4.1.2.1.2.1 2009/08/20 04:36:05 uebayasi Exp $");
#include "opt_cputype.h"
@@ -1750,8 +1750,8 @@
gr[_REG_EPC] = f->f_regs[_R_PC];
gr[_REG_SR] = f->f_regs[_R_SR];
- if ((ras_pc = (__greg_t)ras_lookup(l->l_proc,
- (void *) gr[_REG_EPC])) != -1)
+ if ((ras_pc = (__greg_t)(intptr_t)ras_lookup(l->l_proc,
+ (void *)(intptr_t)gr[_REG_EPC])) != -1)
gr[_REG_EPC] = ras_pc;
*flags |= _UC_CPU;
Index: src/sys/arch/mips/mips/trap.c
diff -u src/sys/arch/mips/mips/trap.c:1.217 src/sys/arch/mips/mips/trap.c:1.217.12.1
--- src/sys/arch/mips/mips/trap.c:1.217 Wed Oct 15 06:51:18 2008
+++ src/sys/arch/mips/mips/trap.c Thu Aug 20 04:36:05 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.217 2008/10/15 06:51:18 wrstuden Exp $ */
+/* $NetBSD: trap.c,v 1.217.12.1 2009/08/20 04:36:05 uebayasi Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -78,7 +78,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.217 2008/10/15 06:51:18 wrstuden Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.217.12.1 2009/08/20 04:36:05 uebayasi Exp $");
#include "opt_cputype.h" /* which mips CPU levels do we support? */
#include "opt_ddb.h"
@@ -563,7 +563,7 @@
ksi.ksi_trap = type & ~T_USER;
ksi.ksi_signo = SIGFPE;
fp = (struct frame *)l->l_md.md_regs;
- ksi.ksi_addr = (void *)fp->f_regs[_R_PC];
+ ksi.ksi_addr = (void *)(intptr_t)fp->f_regs[_R_PC];
ksi.ksi_code = FPE_FLTOVF; /* XXX */
break; /* SIGNAL */
}
