Module Name: src
Committed By: matt
Date: Tue Feb 1 06:46:47 UTC 2011
Modified Files:
src/sys/arch/mips/mips: mips_emul.c
src/sys/arch/sbmips/sbmips: machdep.c
Log Message:
Cast to intptr_t before changing size of type.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/mips/mips/mips_emul.c
cvs rdiff -u -r1.47 -r1.48 src/sys/arch/sbmips/sbmips/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/mips/mips/mips_emul.c
diff -u src/sys/arch/mips/mips/mips_emul.c:1.20 src/sys/arch/mips/mips/mips_emul.c:1.21
--- src/sys/arch/mips/mips/mips_emul.c:1.20 Fri Jan 14 02:06:28 2011
+++ src/sys/arch/mips/mips/mips_emul.c Tue Feb 1 06:46:46 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mips_emul.c,v 1.20 2011/01/14 02:06:28 rmind Exp $ */
+/* $NetBSD: mips_emul.c,v 1.21 2011/02/01 06:46:46 matt 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.20 2011/01/14 02:06:28 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mips_emul.c,v 1.21 2011/02/01 06:46:46 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -425,7 +425,7 @@
switch (instfmt.RType.rd) {
case 29:
frame->f_regs[instfmt.RType.rt] =
- (mips_reg_t)curlwp->l_private;
+ (mips_reg_t)(intptr_t)curlwp->l_private;
goto out;
}
/* FALLTHROUGH */
Index: src/sys/arch/sbmips/sbmips/machdep.c
diff -u src/sys/arch/sbmips/sbmips/machdep.c:1.47 src/sys/arch/sbmips/sbmips/machdep.c:1.48
--- src/sys/arch/sbmips/sbmips/machdep.c:1.47 Mon Feb 8 19:02:31 2010
+++ src/sys/arch/sbmips/sbmips/machdep.c Tue Feb 1 06:46:47 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.47 2010/02/08 19:02:31 joerg Exp $ */
+/* $NetBSD: machdep.c,v 1.48 2011/02/01 06:46:47 matt Exp $ */
/*
* Copyright 2000, 2001
@@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.47 2010/02/08 19:02:31 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.48 2011/02/01 06:46:47 matt Exp $");
#include "opt_ddb.h"
#include "opt_execfmt.h"
@@ -192,8 +192,8 @@
kernend = (void *)mips_round_page(end);
#if NKSYMS || defined(DDB) || defined(MODULAR)
if (magic == BOOTINFO_MAGIC) {
- ksym_start = (void *)bootinfo.ssym;
- ksym_end = (void *)bootinfo.esym;
+ ksym_start = (void *)(intptr_t)bootinfo.ssym;
+ ksym_end = (void *)(intptr_t)bootinfo.esym;
kernend = (void *)mips_round_page((vaddr_t)ksym_end);
}
#endif
