svn commit: r262986 - in head/sys/arm: arm include

[Ian Lepore]

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								\