From owner-svn-src-head@FreeBSD.ORG  Tue Dec 21 22:03:13 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 9F40F1065670;
	Tue, 21 Dec 2010 22:03:13 +0000 (UTC)
	(envelope-from marius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 73F798FC0A;
	Tue, 21 Dec 2010 22:03:13 +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 oBLM3DHd076784;
	Tue, 21 Dec 2010 22:03:13 GMT (envelope-from marius@svn.freebsd.org)
Received: (from marius@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oBLM3DUN076781;
	Tue, 21 Dec 2010 22:03:13 GMT (envelope-from marius@svn.freebsd.org)
Message-Id: <201012212203.oBLM3DUN076781@svn.freebsd.org>
From: Marius Strobl <marius@FreeBSD.org>
Date: Tue, 21 Dec 2010 22:03:13 +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: r216628 - in head/sys/sparc64: include sparc64
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: Tue, 21 Dec 2010 22:03:13 -0000

Author: marius
Date: Tue Dec 21 22:03:12 2010
New Revision: 216628
URL: http://svn.freebsd.org/changeset/base/216628

Log:
  Extend the hack of r182730 to trick GAS/GCC into compiling access to
  STICK/STICK_COMPARE independently of the selected instruction set by
  TICK_COMPARE so tick.c as of r214358 once again can be compiled with
  gcc -mcpu=v9 for reference purposes.

Modified:
  head/sys/sparc64/include/cpufunc.h
  head/sys/sparc64/sparc64/tick.c

Modified: head/sys/sparc64/include/cpufunc.h
==============================================================================
--- head/sys/sparc64/include/cpufunc.h	Tue Dec 21 22:01:26 2010	(r216627)
+++ head/sys/sparc64/include/cpufunc.h	Tue Dec 21 22:03:12 2010	(r216628)
@@ -174,11 +174,13 @@ int fasword32(u_long asi, void *addr, ui
 } while (0)
 
 /*
- * Trick GAS/GCC into compiling access to STICK/STICK_COMPARE independently
+ * Trick GAS/GCC into compiling access to TICK/(S)TICK_COMPARE independently
  * of the selected instruction set.
  */
+#define	rdtickcmpr()		rd(asr23)
 #define	rdstick()		rd(asr24)
 #define	rdstickcmpr()		rd(asr25)
+#define	wrtickcmpr(val, xor)	wr(asr23, (val), (xor))
 #define	wrstick(val, xor)	wr(asr24, (val), (xor))
 #define	wrstickcmpr(val, xor)	wr(asr25, (val), (xor))
 
@@ -191,7 +193,7 @@ int fasword32(u_long asi, void *addr, ui
  * aligned to a quadword boundary in order to ensure that I$ misses won't
  * split them up.
  */
-#define	wrtickcmpr(val, xor) ({						\
+#define	wrtickcmpr_bbwar(val, xor) ({					\
 	__asm __volatile(						\
 	"	ba,pt	%%xcc, 1f ;		"			\
 	"	 nop	 ;			"			\

Modified: head/sys/sparc64/sparc64/tick.c
==============================================================================
--- head/sys/sparc64/sparc64/tick.c	Tue Dec 21 22:01:26 2010	(r216627)
+++ head/sys/sparc64/sparc64/tick.c	Tue Dec 21 22:03:12 2010	(r216628)
@@ -132,14 +132,14 @@ static void
 tick_wr_cmpr(uint64_t tick_cmpr)
 {
 
-	wr(tick_cmpr, tick_cmpr, 0);
+	wrtickcmpr(tick_cmpr, 0);
 }
 
 static void
 tick_wr_cmpr_bbwar(uint64_t tick_cmpr)
 {
 
-	wrtickcmpr(tick_cmpr, 0);
+	wrtickcmpr_bbwar(tick_cmpr, 0);
 }
 
 static uint64_t