Date: Mon, 6 Jul 2009 07:48:31 +0000 (UTC) From: Warner Losh <imp@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r195398 - projects/mips/sys/mips/mips Message-ID: <200907060748.n667mVvQ072365@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: imp Date: Mon Jul 6 07:48:31 2009 New Revision: 195398 URL: http://svn.freebsd.org/changeset/base/195398 Log: Better types for 64-bit compatibility. Use %p and cast to void * and prefer uintptr_t to other int-type casts. Modified: projects/mips/sys/mips/mips/pm_machdep.c Modified: projects/mips/sys/mips/mips/pm_machdep.c ============================================================================== --- projects/mips/sys/mips/mips/pm_machdep.c Mon Jul 6 07:47:39 2009 (r195397) +++ projects/mips/sys/mips/mips/pm_machdep.c Mon Jul 6 07:48:31 2009 (r195398) @@ -230,13 +230,13 @@ sigreturn(struct thread *td, struct sigr /* #ifdef DEBUG */ if (ucp->uc_mcontext.mc_regs[ZERO] != UCONTEXT_MAGIC) { printf("sigreturn: pid %d, ucp %p\n", p->p_pid, ucp); - printf(" old sp %x ra %x pc %x\n", - regs->sp, regs->ra, regs->pc); - printf(" new sp %x ra %x pc %x z %x\n", - ucp->uc_mcontext.mc_regs[SP], - ucp->uc_mcontext.mc_regs[RA], - ucp->uc_mcontext.mc_regs[PC], - ucp->uc_mcontext.mc_regs[ZERO]); + printf(" old sp %p ra %p pc %p\n", + (void *)regs->sp, (void *)regs->ra, (void *)regs->pc); + printf(" new sp %p ra %p pc %p z %p\n", + (void *)ucp->uc_mcontext.mc_regs[SP], + (void *)ucp->uc_mcontext.mc_regs[RA], + (void *)ucp->uc_mcontext.mc_regs[PC], + (void *)ucp->uc_mcontext.mc_regs[ZERO]); return EINVAL; } /* #endif */ @@ -327,7 +327,7 @@ ptrace_single_step(struct thread *td) /* compute next address after current location */ if(curinstr != 0) { va = MipsEmulateBranch(locr0, locr0->pc, locr0->fsr, - (u_int)&curinstr); + (uintptr_t)&curinstr); } else { va = locr0->pc + 4; }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200907060748.n667mVvQ072365>