From owner-svn-src-head@FreeBSD.ORG  Sat Jul 31 19:11:38 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E82541065670;
	Sat, 31 Jul 2010 19:11:38 +0000 (UTC)
	(envelope-from jchandra@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D7B028FC1A;
	Sat, 31 Jul 2010 19:11:38 +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 o6VJBc7P068876;
	Sat, 31 Jul 2010 19:11:38 GMT
	(envelope-from jchandra@svn.freebsd.org)
Received: (from jchandra@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o6VJBchp068874;
	Sat, 31 Jul 2010 19:11:38 GMT
	(envelope-from jchandra@svn.freebsd.org)
Message-Id: <201007311911.o6VJBchp068874@svn.freebsd.org>
From: "Jayachandran C." <jchandra@FreeBSD.org>
Date: Sat, 31 Jul 2010 19:11:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r210698 - head/sys/mips/mips
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 31 Jul 2010 19:11:39 -0000

Author: jchandra
Date: Sat Jul 31 19:11:38 2010
New Revision: 210698
URL: http://svn.freebsd.org/changeset/base/210698

Log:
  Use fuword32() to fetch instructions, this will work on both 32 and 64 bit
  compilation.

Modified:
  head/sys/mips/mips/trap.c

Modified: head/sys/mips/mips/trap.c
==============================================================================
--- head/sys/mips/mips/trap.c	Sat Jul 31 17:58:44 2010	(r210697)
+++ head/sys/mips/mips/trap.c	Sat Jul 31 19:11:38 2010	(r210698)
@@ -820,7 +820,7 @@ dofault:
 				va += sizeof(int);
 
 			/* read break instruction */
-			instr = fuword((caddr_t)va);
+			instr = fuword32((caddr_t)va);
 #if 0
 			printf("trap: %s (%d) breakpoint %x at %x: (adr %x ins %x)\n",
 			    p->p_comm, p->p_pid, instr, trapframe->pc,
@@ -869,7 +869,7 @@ dofault:
 			if (DELAYBRANCH(trapframe->cause))
 				va += sizeof(int);
 			/* read break instruction */
-			instr = fuword((caddr_t)va);
+			instr = fuword32((caddr_t)va);
 
 			if (DELAYBRANCH(trapframe->cause)) {	/* Check BD bit */
 				locr0->pc = MipsEmulateBranch(locr0, trapframe->pc, 0,