From owner-svn-src-stable-7@FreeBSD.ORG Wed Jan 5 12:05:31 2011 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E463A106564A; Wed, 5 Jan 2011 12:05:31 +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 B31118FC15; Wed, 5 Jan 2011 12:05:31 +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 p05C5VBK077309; Wed, 5 Jan 2011 12:05:31 GMT (envelope-from marius@svn.freebsd.org) Received: (from marius@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p05C5VUq077306; Wed, 5 Jan 2011 12:05:31 GMT (envelope-from marius@svn.freebsd.org) Message-Id: <201101051205.p05C5VUq077306@svn.freebsd.org> From: Marius Strobl Date: Wed, 5 Jan 2011 12:05:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r216997 - in stable/7/sys/sparc64: include sparc64 X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Jan 2011 12:05:32 -0000 Author: marius Date: Wed Jan 5 12:05:31 2011 New Revision: 216997 URL: http://svn.freebsd.org/changeset/base/216997 Log: MFC: r216628 Extend the hack of r182730 (MFC'ed to stable/7 in r190033) to trick GAS/GCC into compiling access to STICK/STICK_COMPARE independently of the selected instruction set by TICK_COMPARE so tick.c once again can be compiled with gcc -mcpu=v9 for reference purposes. Modified: stable/7/sys/sparc64/include/cpufunc.h stable/7/sys/sparc64/sparc64/tick.c Directory Properties: stable/7/sys/ (props changed) stable/7/sys/cddl/contrib/opensolaris/ (props changed) stable/7/sys/contrib/dev/acpica/ (props changed) stable/7/sys/contrib/pf/ (props changed) Modified: stable/7/sys/sparc64/include/cpufunc.h ============================================================================== --- stable/7/sys/sparc64/include/cpufunc.h Wed Jan 5 12:05:27 2011 (r216996) +++ stable/7/sys/sparc64/include/cpufunc.h Wed Jan 5 12:05:31 2011 (r216997) @@ -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: stable/7/sys/sparc64/sparc64/tick.c ============================================================================== --- stable/7/sys/sparc64/sparc64/tick.c Wed Jan 5 12:05:27 2011 (r216996) +++ stable/7/sys/sparc64/sparc64/tick.c Wed Jan 5 12:05:31 2011 (r216997) @@ -222,7 +222,7 @@ tick_hardclock(struct trapframe *tf) adj = PCPU_GET(tickadj); s = intr_disable(); tick = rd(tick); - wr(tick_cmpr, tick + tick_increment - adj, 0); + wrtickcmpr(tick + tick_increment - adj, 0); intr_restore(s); tick_hardclock_common(tf, tick, adj); critical_exit(); @@ -238,7 +238,7 @@ tick_hardclock_bbwar(struct trapframe *t adj = PCPU_GET(tickadj); s = intr_disable(); tick = rd(tick); - wrtickcmpr(tick + tick_increment - adj, 0); + wrtickcmpr_bbwar(tick + tick_increment - adj, 0); intr_restore(s); tick_hardclock_common(tf, tick, adj); critical_exit();