svn commit: r276202 - head/sys/arm/include

Ian Lepore ian at FreeBSD.org
Thu Dec 25 16:36:03 UTC 2014


Author: ian
Date: Thu Dec 25 16:36:02 2014
New Revision: 276202
URL: https://svnweb.freebsd.org/changeset/base/276202

Log:
  Stylish changes... put tabs where they need to be in macros, move lines
  around so that related things are more grouped together, rewrite comments.
  
  No functional changes, this is all so that the functional changes in the
  next commit will stand out.

Modified:
  head/sys/arm/include/asm.h

Modified: head/sys/arm/include/asm.h
==============================================================================
--- head/sys/arm/include/asm.h	Thu Dec 25 15:17:57 2014	(r276201)
+++ head/sys/arm/include/asm.h	Thu Dec 25 16:36:02 2014	(r276202)
@@ -58,6 +58,22 @@
 #endif
 
 /*
+ * gas/arm uses @ as a single comment character and thus cannot be used here.
+ * It recognises the # instead of an @ symbol in .type directives.
+ */
+#define	_ASM_TYPE_FUNCTION	#function
+#define	_ASM_TYPE_OBJECT	#object
+
+/* XXX Is this still the right prologue for profiling? */
+#ifdef GPROF
+#define	_PROF_PROLOGUE	\
+	mov ip, lr;	\
+	bl __mcount
+#else
+#define	_PROF_PROLOGUE
+#endif
+
+/*
  * EENTRY()/EEND() mark "extra" entry/exit points from a function.
  * The unwind info cannot handle the concept of a nested function, or a function
  * with multiple .fnstart directives, but some of our assembler code is written
@@ -69,25 +85,9 @@
 #define	_EENTRY(x) 	.globl x; .type x,_ASM_TYPE_FUNCTION; x:
 #define	_EEND(x)	/* nothing */
 
-/*
- * gas/arm uses @ as a single comment character and thus cannot be used here
- * Instead it recognised the # instead of an @ symbols in .type directives
- * We define a couple of macros so that assembly code will not be dependent
- * on one or the other.
- */
-#define _ASM_TYPE_FUNCTION	#function
-#define _ASM_TYPE_OBJECT	#object
-#define GLOBAL(X) .globl x
-#define	_ENTRY(x) \
-	.text; _ALIGN_TEXT; _EENTRY(x) _FNSTART
-#define	_END(x)	.size x, . - x; _FNEND
-
-#ifdef GPROF
-#  define _PROF_PROLOGUE	\
-	mov ip, lr; bl __mcount
-#else
-# define _PROF_PROLOGUE
-#endif
+#define	GLOBAL(X)	.globl x
+#define	_ENTRY(x)	.text; _ALIGN_TEXT; _EENTRY(x) _FNSTART
+#define	_END(x)		.size x, . - x; _FNEND
 
 #define	ENTRY(y)	_ENTRY(_C_LABEL(y)); _PROF_PROLOGUE
 #define	EENTRY(y)	_EENTRY(_C_LABEL(y));


More information about the svn-src-all mailing list