From owner-svn-src-head@freebsd.org  Tue Jun 14 06:21:52 2016
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id EDCDDAF2BF7;
 Tue, 14 Jun 2016 06:21:52 +0000 (UTC)
 (envelope-from adrian@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id BE1EE2F8B;
 Tue, 14 Jun 2016 06:21:52 +0000 (UTC)
 (envelope-from adrian@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u5E6LpMS091268;
 Tue, 14 Jun 2016 06:21:51 GMT (envelope-from adrian@FreeBSD.org)
Received: (from adrian@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u5E6Lptr091267;
 Tue, 14 Jun 2016 06:21:51 GMT (envelope-from adrian@FreeBSD.org)
Message-Id: <201606140621.u5E6Lptr091267@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: adrian set sender to
 adrian@FreeBSD.org using -f
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Tue, 14 Jun 2016 06:21:51 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r301878 - head/sys/mips/mips
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/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: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 14 Jun 2016 06:21:53 -0000

Author: adrian
Date: Tue Jun 14 06:21:51 2016
New Revision: 301878
URL: https://svnweb.freebsd.org/changeset/base/301878

Log:
  [mips] Tidy up setting/clearing the hardfloat flag.
  
  Submitted by:	kan
  Approved by:	re (delphij)

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

Modified: head/sys/mips/mips/swtch.S
==============================================================================
--- head/sys/mips/mips/swtch.S	Tue Jun 14 03:57:00 2016	(r301877)
+++ head/sys/mips/mips/swtch.S	Tue Jun 14 06:21:51 2016	(r301878)
@@ -400,8 +400,9 @@ END(cpu_switch)
  *
  *----------------------------------------------------------------------------
  */
-.set hardfloat
 LEAF(MipsSwitchFPState)
+	.set push
+	.set hardfloat
 	mfc0	t1, MIPS_COP_0_STATUS	# Save old SR
 	li	t0, MIPS_SR_COP_1_BIT	# enable the coprocessor
 	mtc0	t0, MIPS_COP_0_STATUS
@@ -503,6 +504,7 @@ LEAF(MipsSwitchFPState)
 	ITLBNOPFIX
 	j	ra
 	nop
+	.set pop
 END(MipsSwitchFPState)
 
 /*----------------------------------------------------------------------------
@@ -523,6 +525,8 @@ END(MipsSwitchFPState)
  *----------------------------------------------------------------------------
  */
 LEAF(MipsSaveCurFPState)
+	.set push
+	.set hardfloat
 	PTR_L	a0, TD_PCB(a0)			# get pointer to pcb for thread
 	mfc0	t1, MIPS_COP_0_STATUS		# Disable interrupts and
 	li	t0, MIPS_SR_COP_1_BIT		#  enable the coprocessor
@@ -581,6 +585,7 @@ LEAF(MipsSaveCurFPState)
 	ITLBNOPFIX
 	j	ra
 	nop
+	.set pop
 END(MipsSaveCurFPState)
 
 /*