From owner-svn-src-projects@FreeBSD.ORG Sun Oct 18 14:55:55 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id B6AA7106568F;
Sun, 18 Oct 2009 14:55:55 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id A75DF8FC0A;
Sun, 18 Oct 2009 14:55:55 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n9IEttBA071840;
Sun, 18 Oct 2009 14:55:55 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id n9IEttKi071838;
Sun, 18 Oct 2009 14:55:55 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <200910181455.n9IEttKi071838@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Sun, 18 Oct 2009 14:55:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r198205 - projects/mips/sys/mips/mips
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 18 Oct 2009 14:55:55 -0000
Author: imp
Date: Sun Oct 18 14:55:55 2009
New Revision: 198205
URL: http://svn.freebsd.org/changeset/base/198205
Log:
Use correct signature for MipsEmulateBranch. The other one doesn't
work for 64-bit compiles.
Modified:
projects/mips/sys/mips/mips/trap.c
Modified: projects/mips/sys/mips/mips/trap.c
==============================================================================
--- projects/mips/sys/mips/mips/trap.c Sun Oct 18 13:51:49 2009 (r198204)
+++ projects/mips/sys/mips/mips/trap.c Sun Oct 18 14:55:55 2009 (r198205)
@@ -1057,7 +1057,7 @@ trapDump(char *msg)
/*
* Return the resulting PC as if the branch was executed.
*/
-u_int
+uintptr_t
MipsEmulateBranch(struct trapframe *framePtr, uintptr_t instPC, int fpcCSR,
uintptr_t instptr)
{