summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/arch/i386/include/profile.h8
-rw-r--r--sys/arch/m68k/include/profile.h14
-rw-r--r--sys/arch/mvme88k/include/profile.h10
-rw-r--r--sys/arch/pc532/include/profile.h8
-rw-r--r--sys/arch/pica/include/profile.h4
-rw-r--r--sys/arch/pmax/include/profile.h2
-rw-r--r--sys/arch/sparc/include/profile.h28
-rw-r--r--sys/arch/vax/include/profile.h2
8 files changed, 38 insertions, 38 deletions
diff --git a/sys/arch/i386/include/profile.h b/sys/arch/i386/include/profile.h
index 163ff3afc17..f7035d6ae99 100644
--- a/sys/arch/i386/include/profile.h
+++ b/sys/arch/i386/include/profile.h
@@ -35,10 +35,10 @@
* @(#)profile.h 8.1 (Berkeley) 6/11/93
*/
-#define _MCOUNT_DECL static inline void _mcount
+#define _MCOUNT_DECL static __inline void _mcount
#define MCOUNT \
-extern void mcount() asm("mcount"); \
+extern void mcount() __asm("mcount"); \
void \
mcount() \
{ \
@@ -49,11 +49,11 @@ mcount() \
* \
* selfpc = pc pushed by mcount call \
*/ \
- asm("movl 4(%%ebp),%0" : "=r" (selfpc)); \
+ __asm("movl 4(%%ebp),%0" : "=r" (selfpc)); \
/* \
* frompcindex = pc pushed by call into self. \
*/ \
- asm("movl (%%ebp),%0;movl 4(%0),%0" : "=r" (frompcindex)); \
+ __asm("movl (%%ebp),%0;movl 4(%0),%0" : "=r" (frompcindex)); \
_mcount(frompcindex, selfpc); \
}
diff --git a/sys/arch/m68k/include/profile.h b/sys/arch/m68k/include/profile.h
index 137da3739dc..773f3a57f24 100644
--- a/sys/arch/m68k/include/profile.h
+++ b/sys/arch/m68k/include/profile.h
@@ -35,13 +35,13 @@
* @(#)profile.h 8.1 (Berkeley) 6/10/93
*/
-#define _MCOUNT_DECL static inline void _mcount
+#define _MCOUNT_DECL static __inline void _mcount
#define MCOUNT \
-extern void mcount() asm("mcount"); void mcount() { \
+extern void mcount() __asm("mcount"); void mcount() { \
int selfpc, frompcindex; \
- asm("movl a6@(4),%0" : "=r" (selfpc)); \
- asm("movl a6@(0)@(4),%0" : "=r" (frompcindex)); \
+ __asm("movl a6@(4),%0" : "=r" (selfpc)); \
+ __asm("movl a6@(0)@(4),%0" : "=r" (frompcindex)); \
_mcount(frompcindex, selfpc); \
}
@@ -53,9 +53,9 @@ extern void mcount() asm("mcount"); void mcount() { \
* recursively.
*/
#define MCOUNT_ENTER \
- asm("movw sr,%0" : "=g" (s)); \
- asm("movw #0x2700,sr")
+ __asm("movw sr,%0" : "=g" (s)); \
+ __asm("movw #0x2700,sr")
#define MCOUNT_EXIT \
- asm("movw %0,sr" : : "g" (s))
+ __asm("movw %0,sr" : : "g" (s))
#endif /* _KERNEL */
diff --git a/sys/arch/mvme88k/include/profile.h b/sys/arch/mvme88k/include/profile.h
index 429d42d3c6b..c6203ab7424 100644
--- a/sys/arch/mvme88k/include/profile.h
+++ b/sys/arch/mvme88k/include/profile.h
@@ -31,13 +31,13 @@
* SUCH DAMAGE.
*
* from: @(#)profile.h 8.1 (Berkeley) 6/11/93
- * $Id: profile.h,v 1.1 1995/10/18 10:54:24 deraadt Exp $
+ * $Id: profile.h,v 1.2 1996/03/24 16:52:34 tholo Exp $
*/
#define _MCOUNT_DECL static inline void _mcount
#define MCOUNT \
-extern void mcount() asm("mcount"); \
+extern void mcount() __asm("mcount"); \
void \
mcount() \
{ \
@@ -48,7 +48,7 @@ mcount() \
* \
* selfret = ret pushed by mcount call \
*/ \
- asm volatile("ld %0,r31,36" : "=r" (selfret)); \
+ __asm volatile("ld %0,r31,36" : "=r" (selfret)); \
/* \
* callerret = ret pushed by call into self. \
*/ \
@@ -56,8 +56,8 @@ mcount() \
* This may not be right. It all depends on where the \
* caller stores the return address. XXX \
*/ \
- asm volatile("addu r10,r31,48"); \
- asm volatile("ld %0,r10,36" : "=r" (callerret)); \
+ __asm volatile("addu r10,r31,48"); \
+ __asm volatile("ld %0,r10,36" : "=r" (callerret)); \
_mcount(callerret, selfret); \
}
diff --git a/sys/arch/pc532/include/profile.h b/sys/arch/pc532/include/profile.h
index 5f8490ad786..046cadee104 100644
--- a/sys/arch/pc532/include/profile.h
+++ b/sys/arch/pc532/include/profile.h
@@ -38,10 +38,10 @@
/* pc532 version, 5/15/94.
*/
-#define _MCOUNT_DECL static inline void _mcount
+#define _MCOUNT_DECL static __inline void _mcount
#define MCOUNT \
-extern void mcount() asm("mcount"); \
+extern void mcount() __asm("mcount"); \
void \
mcount() \
{ \
@@ -52,11 +52,11 @@ mcount() \
* \
* selfpc = pc pushed by mcount call \
*/ \
- asm("movd 4(fp),%0" : "=r" (selfpc)); \
+ __asm("movd 4(fp),%0" : "=r" (selfpc)); \
/* \
* frompcindex = pc pushed by call into self. \
*/ \
- asm("movd 4(0(fp)),%0" : "=r" (frompcindex)); \
+ __asm("movd 4(0(fp)),%0" : "=r" (frompcindex)); \
_mcount(frompcindex, selfpc); \
}
diff --git a/sys/arch/pica/include/profile.h b/sys/arch/pica/include/profile.h
index 3fd038adf90..f518ceb5827 100644
--- a/sys/arch/pica/include/profile.h
+++ b/sys/arch/pica/include/profile.h
@@ -34,13 +34,13 @@
* SUCH DAMAGE.
*
* from: @(#)profile.h 8.1 (Berkeley) 6/10/93
- * $Id: profile.h,v 1.1 1995/10/18 10:39:13 deraadt Exp $
+ * $Id: profile.h,v 1.2 1996/03/24 16:52:37 tholo Exp $
*/
#define _MCOUNT_DECL static void __mcount
#define MCOUNT \
- asm(".globl _mcount;" \
+ __asm(".globl _mcount;" \
"_mcount:;" \
".set noreorder;" \
".set noat;" \
diff --git a/sys/arch/pmax/include/profile.h b/sys/arch/pmax/include/profile.h
index dc30bfdcf01..661183549e8 100644
--- a/sys/arch/pmax/include/profile.h
+++ b/sys/arch/pmax/include/profile.h
@@ -41,7 +41,7 @@
#define _MCOUNT_DECL static void __mcount
#define MCOUNT \
- asm(".globl _mcount;" \
+ __asm(".globl _mcount;" \
"_mcount:;" \
".set noreorder;" \
".set noat;" \
diff --git a/sys/arch/sparc/include/profile.h b/sys/arch/sparc/include/profile.h
index 2e6ea9a2c07..c34287882bb 100644
--- a/sys/arch/sparc/include/profile.h
+++ b/sys/arch/sparc/include/profile.h
@@ -47,22 +47,22 @@
#ifdef PIC
/* Inline expansion of PICCY_SET() (see <machine/asm.h>). */
#define MCOUNT \
- asm(".global mcount");\
- asm("mcount:");\
- asm("add %o7, 8, %o1");\
- asm("1: call 2f; nop; 2:");\
- asm("add %o7,__mcount-1b, %o2");\
- asm("ld [%o2], %o2");\
- asm("jmpl %o2, %g0");\
- asm("add %i7, 8, %o0");
+ __asm(".global mcount");\
+ __asm("mcount:");\
+ __asm("add %o7, 8, %o1");\
+ __asm("1: call 2f; nop; 2:");\
+ __asm("add %o7,__mcount-1b, %o2");\
+ __asm("ld [%o2], %o2");\
+ __asm("jmpl %o2, %g0");\
+ __asm("add %i7, 8, %o0");
#else
#define MCOUNT \
- asm(".global mcount");\
- asm("mcount:");\
- asm("add %i7, 8, %o0");\
- asm("sethi %hi(__mcount), %o2");\
- asm("jmpl %o2 + %lo(__mcount), %g0");\
- asm("add %o7, 8, %o1");
+ __asm(".global mcount");\
+ __asm("mcount:");\
+ __asm("add %i7, 8, %o0");\
+ __asm("sethi %hi(__mcount), %o2");\
+ __asm("jmpl %o2 + %lo(__mcount), %g0");\
+ __asm("add %o7, 8, %o1");
#endif
#define _MCOUNT_DECL static void _mcount
diff --git a/sys/arch/vax/include/profile.h b/sys/arch/vax/include/profile.h
index dc5e0983eaa..8640c003119 100644
--- a/sys/arch/vax/include/profile.h
+++ b/sys/arch/vax/include/profile.h
@@ -46,7 +46,7 @@
* to __mcount, so that our return address won't get popped from stack.
*/
#define MCOUNT \
-asm(".text; .globl mcount; mcount: pushl 16(fp); calls $1,__mcount; rsb");
+__asm(".text; .globl mcount; mcount: pushl 16(fp); calls $1,__mcount; rsb");
#ifdef _KERNEL
/*