From owner-svn-src-head@FreeBSD.ORG  Mon Mar 10 22:38:09 2014
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:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id F2241983;
 Mon, 10 Mar 2014 22:38:08 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id DF7E0A52;
 Mon, 10 Mar 2014 22:38:08 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2AMc8NQ006539;
 Mon, 10 Mar 2014 22:38:08 GMT (envelope-from ian@svn.freebsd.org)
Received: (from ian@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2AMc8jo006536;
 Mon, 10 Mar 2014 22:38:08 GMT (envelope-from ian@svn.freebsd.org)
Message-Id: <201403102238.s2AMc8jo006536@svn.freebsd.org>
From: Ian Lepore <ian@FreeBSD.org>
Date: Mon, 10 Mar 2014 22:38:08 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r262986 - in head/sys/arm: arm include
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.17
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/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: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 10 Mar 2014 22:38:09 -0000

Author: ian
Date: Mon Mar 10 22:38:07 2014
New Revision: 262986
URL: http://svnweb.freebsd.org/changeset/base/262986

Log:
  Change the way the asm GET_CURTHREAD_PTR() macro is defined so that code
  using it doesn't have to have an "AST_LOCALS" macro somewhere in the file.

Modified:
  head/sys/arm/arm/exception.S
  head/sys/arm/arm/swtch.S
  head/sys/arm/include/asmacros.h

Modified: head/sys/arm/arm/exception.S
==============================================================================
--- head/sys/arm/arm/exception.S	Mon Mar 10 21:58:38 2014	(r262985)
+++ head/sys/arm/arm/exception.S	Mon Mar 10 22:38:07 2014	(r262986)
@@ -56,8 +56,6 @@ __FBSDID("$FreeBSD$");
 	.text	
 	.align	0
 
-AST_LOCALS
-
 /*
  * reset_entry:
  *

Modified: head/sys/arm/arm/swtch.S
==============================================================================
--- head/sys/arm/arm/swtch.S	Mon Mar 10 21:58:38 2014	(r262985)
+++ head/sys/arm/arm/swtch.S	Mon Mar 10 22:38:07 2014	(r262986)
@@ -501,6 +501,5 @@ ENTRY(fork_trampoline)
 
 	movs	pc, lr			/* Exit */
 
-AST_LOCALS
 END(fork_trampoline)
 

Modified: head/sys/arm/include/asmacros.h
==============================================================================
--- head/sys/arm/include/asmacros.h	Mon Mar 10 21:58:38 2014	(r262985)
+++ head/sys/arm/include/asmacros.h	Mon Mar 10 22:38:07 2014	(r262986)
@@ -243,13 +243,10 @@ name:
 #define GET_CURTHREAD_PTR(tmp) \
     	mrc	p15, 0, tmp, c13, c0, 4
 #else
-#define	AST_LOCALS							;\
-.Lcurthread:								;\
-	.word	_C_LABEL(__pcpu) + PC_CURTHREAD
-
-#define GET_CURTHREAD_PTR(tmp) \
-	ldr	tmp, .Lcurthread;     \
-	ldr	tmp, [tmp]
+#define	AST_LOCALS
+#define GET_CURTHREAD_PTR(tmp)	\
+	ldr	tmp, =_C_LABEL(__pcpu);\
+	ldr	tmp, [tmp, #PC_CURTHREAD]
 #endif
 
 #define	DO_AST								\