From owner-p4-projects@FreeBSD.ORG  Thu Mar  1 08:35:40 2012
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 686601065673; Thu,  1 Mar 2012 08:35:40 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 23B221065670
	for <perforce@freebsd.org>; Thu,  1 Mar 2012 08:35:40 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id 0C4DE8FC08
	for <perforce@freebsd.org>; Thu,  1 Mar 2012 08:35:40 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id q218Zdfv012252
	for <perforce@freebsd.org>; Thu, 1 Mar 2012 08:35:39 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q218ZdDV012249
	for perforce@freebsd.org; Thu, 1 Mar 2012 08:35:39 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Thu, 1 Mar 2012 08:35:39 GMT
Message-Id: <201203010835.q218ZdDV012249@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 207154 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 01 Mar 2012 08:35:40 -0000

http://p4web.freebsd.org/@@207154?ac=10

Change 207154 by rwatson@rwatson_svr_ctsrd_mipsbuild on 2012/03/01 08:35:07

	Adapt the FreeBSD/MIPS exception handler trampoline to work with a
	kernel running out of xkphys.  Previously, this code assumed that
	MipsDoTLBMiss, the kernel's actual exception handler, was within
	range for 'j', which jumps to a 26-bit immediate.  Instead, jump
	via a register to allow greater address differences (e.g.,
	0xffffffff80000080 to 0x98000000001efc80).
	
	Discussed with:		Juli Mallett

Affected files ...

.. //depot/projects/ctsrd/beribsd/src/sys/mips/mips/exception.S#4 edit

Differences ...

==== //depot/projects/ctsrd/beribsd/src/sys/mips/mips/exception.S#4 (text+ko) ====

@@ -90,7 +90,8 @@
 VECTOR(MipsTLBMiss, unknown)
 	.set push
 	.set noat
-	j	MipsDoTLBMiss
+	dla	k0, MipsDoTLBMiss
+	jr	k0
 	MFC0	k0, MIPS_COP_0_BAD_VADDR	# get the fault address
 	.set pop
 VECTOR_END(MipsTLBMiss)