From owner-svn-src-all@FreeBSD.ORG  Thu Feb  4 05:25:59 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 805E31065670;
	Thu,  4 Feb 2010 05:25:59 +0000 (UTC)
	(envelope-from neel@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 70AEB8FC08;
	Thu,  4 Feb 2010 05:25:59 +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 o145PxiV020635;
	Thu, 4 Feb 2010 05:25:59 GMT (envelope-from neel@svn.freebsd.org)
Received: (from neel@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o145PxOe020633;
	Thu, 4 Feb 2010 05:25:59 GMT (envelope-from neel@svn.freebsd.org)
Message-Id: <201002040525.o145PxOe020633@svn.freebsd.org>
From: Neel Natu <neel@FreeBSD.org>
Date: Thu, 4 Feb 2010 05:25:59 +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: r203474 - head/sys/mips/mips
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 04 Feb 2010 05:25:59 -0000

Author: neel
Date: Thu Feb  4 05:25:59 2010
New Revision: 203474
URL: http://svn.freebsd.org/changeset/base/203474

Log:
  Clean up all places in exception.S that fiddle with 'pcpup' directly. We now
  use the GET_CPU_PCPU() macro exclusively.
  
  This isolates the users of pcpu data from its implementation details.
  
  Reviewed by: imp

Modified:
  head/sys/mips/mips/exception.S

Modified: head/sys/mips/mips/exception.S
==============================================================================
--- head/sys/mips/mips/exception.S	Thu Feb  4 05:07:20 2010	(r203473)
+++ head/sys/mips/mips/exception.S	Thu Feb  4 05:25:59 2010	(r203474)
@@ -146,19 +146,10 @@ VECTOR_END(MipsTLBMiss)
  *----------------------------------------------------------------------------
  */
 MipsDoTLBMiss:
-#xxx mips64 unsafe?
-#ifndef SMP
-	lui	k1, %hi(_C_LABEL(pcpup))
-#endif
 						#k0 already has BadVA
 	bltz	k0, 1f				#02: k0<0 -> 1f (kernel fault)
 	srl	k0, k0, SEGSHIFT - 2		#03: k0=seg offset (almost)
-#xxx mips64 unsafe?
-#ifdef SMP
 	GET_CPU_PCPU(k1)
-#else
-	lw	k1, %lo(_C_LABEL(pcpup))(k1)
-#endif
 	lw	k1, PC_SEGBASE(k1)
 	beqz	k1, 2f			      #05: make sure segbase is not null
 	andi	k0, k0, 0x7fc			#06: k0=seg offset (mask 0x3)
@@ -821,12 +812,7 @@ NLEAF(MipsKernTLBInvalidException)
 	sltu	k1, k0, k1
 	beqz	k1, 1f
 	nop
-#ifdef SMP
 	GET_CPU_PCPU(k1)
-#else
-	lui	k1, %hi(_C_LABEL(pcpup))
-	lw	k1, %lo(_C_LABEL(pcpup))(k1)
-#endif
 	lw	k1, PC_SEGBASE(k1)		 # works for single cpu????
 	beqz	k1, _C_LABEL(MipsKernGenException)   # seg tab is null
 	nop
@@ -917,13 +903,7 @@ NLEAF(MipsUserTLBInvalidException)
 	sltu	k1, k0, k1
 	beqz	k1, _C_LABEL(MipsUserGenException)
 	nop
-#xxx mips64 unsafe?
-#ifdef SMP
 	GET_CPU_PCPU(k1)
-#else
-	lui	k1, %hi(_C_LABEL(pcpup))
-	lw	k1, %lo(_C_LABEL(pcpup))(k1)
-#endif
 	lw	k1, PC_SEGBASE(k1)		 # works for single cpu????
 	beqz	k1, _C_LABEL(MipsUserGenException)  # seg tab is null
 	nop