summaryrefslogtreecommitdiff
path: root/sys/arch/mvme88k
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch/mvme88k')
-rw-r--r--sys/arch/mvme88k/include/asm_macro.h28
-rw-r--r--sys/arch/mvme88k/include/cpu_number.h2
-rw-r--r--sys/arch/mvme88k/include/profile.h12
-rw-r--r--sys/arch/mvme88k/include/prom.h6
4 files changed, 24 insertions, 24 deletions
diff --git a/sys/arch/mvme88k/include/asm_macro.h b/sys/arch/mvme88k/include/asm_macro.h
index 522db6e0e85..c437fb7a0cf 100644
--- a/sys/arch/mvme88k/include/asm_macro.h
+++ b/sys/arch/mvme88k/include/asm_macro.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: asm_macro.h,v 1.7 2001/01/14 20:25:23 smurph Exp $ */
+/* $OpenBSD: asm_macro.h,v 1.8 2001/01/15 19:50:38 deraadt Exp $ */
/*
* Mach Operating System
* Copyright (c) 1993-1991 Carnegie Mellon University
@@ -57,13 +57,13 @@ typedef unsigned long m88k_psr_type;
* .
* .
*/
-static inline m88k_psr_type disable_interrupts_return_psr(void)
+static __inline__ m88k_psr_type disable_interrupts_return_psr(void)
{
m88k_psr_type temp, oldpsr;
- asm volatile ("ldcr %0, cr1" : "=r" (oldpsr));
- asm volatile ("set %1, %0, 1<1>" : "=r" (oldpsr), "=r" (temp));
- asm volatile ("stcr %0, cr1" : "=r" (temp));
- asm volatile ("tcnd ne0, r0, 0");
+ __asm__ __volatile__ ("ldcr %0, cr1" : "=r" (oldpsr));
+ __asm__ __volatile__ ("set %1, %0, 1<1>" : "=r" (oldpsr), "=r" (temp));
+ __asm__ __volatile__ ("stcr %0, cr1" : "=r" (temp));
+ __asm__ __volatile__ ("tcnd ne0, r0, 0");
return oldpsr;
}
#define disable_interrupt() (void)disable_interrupts_return_psr()
@@ -71,20 +71,20 @@ static inline m88k_psr_type disable_interrupts_return_psr(void)
/*
* Sets the PSR. See comments above.
*/
-static inline void set_psr(m88k_psr_type psr)
+static __inline__ void set_psr(m88k_psr_type psr)
{
- asm volatile ("stcr %0, cr1" :: "r" (psr));
+ __asm__ __volatile__ ("stcr %0, cr1" :: "r" (psr));
}
/*
* Enables interrupts.
*/
-static inline m88k_psr_type enable_interrupts_return_psr(void)
+static __inline__ m88k_psr_type enable_interrupts_return_psr(void)
{
m88k_psr_type temp, oldpsr; /* need a temporary register */
- asm volatile ("ldcr %0, cr1" : "=r" (oldpsr));
- asm volatile ("clr %1, %0, 1<1>" : "=r" (oldpsr), "=r" (temp));
- asm volatile ("stcr %0, cr1" : "=r" (temp));
+ __asm__ __volatile__ ("ldcr %0, cr1" : "=r" (oldpsr));
+ __asm__ __volatile__ ("clr %1, %0, 1<1>" : "=r" (oldpsr), "=r" (temp));
+ __asm__ __volatile__ ("stcr %0, cr1" : "=r" (temp));
return oldpsr;
}
#define enable_interrupt() (void)enable_interrupts_return_psr()
@@ -95,9 +95,9 @@ static inline m88k_psr_type enable_interrupts_return_psr(void)
/*
* flushes the data pipeline.
*/
-static inline void flush_pipeline()
+static __inline__ void flush_pipeline()
{
- asm volatile ("tcnd ne0, r0, 0");
+ __asm__ __volatile__ ("tcnd ne0, r0, 0");
}
#define db_flush_pipeline flush_pipeline
diff --git a/sys/arch/mvme88k/include/cpu_number.h b/sys/arch/mvme88k/include/cpu_number.h
index b72b79ca210..f6319e19143 100644
--- a/sys/arch/mvme88k/include/cpu_number.h
+++ b/sys/arch/mvme88k/include/cpu_number.h
@@ -39,7 +39,7 @@ static __inline__ unsigned cpu_number(void)
register unsigned cpu;
extern int cputyp;
if (cputyp != CPU_188 || number_cpus == 1) return 0;
- asm("ldcr %0, cr18" : "=r" (cpu));
+ __asm__ ("ldcr %0, cr18" : "=r" (cpu));
return (cpu & 3);
}
#endif /* ASSEMBLER */
diff --git a/sys/arch/mvme88k/include/profile.h b/sys/arch/mvme88k/include/profile.h
index afc807b45cd..94a500c08fc 100644
--- a/sys/arch/mvme88k/include/profile.h
+++ b/sys/arch/mvme88k/include/profile.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: profile.h,v 1.8 2001/01/14 20:25:24 smurph Exp $ */
+/* $OpenBSD: profile.h,v 1.9 2001/01/15 19:50:38 deraadt Exp $ */
/*
* Copyright (c) 1996 Nivas Madhur
* Copyright (c) 1992, 1993
@@ -33,14 +33,14 @@
* SUCH DAMAGE.
*
* from: @(#)profile.h 8.1 (Berkeley) 6/11/93
- * $Id: profile.h,v 1.8 2001/01/14 20:25:24 smurph Exp $
+ * $Id: profile.h,v 1.9 2001/01/15 19:50:38 deraadt Exp $
*/
#ifndef __MACHINE_PROFILE_H__
#define __MACHINE_PROFILE_H__
#define _MCOUNT_DECL static inline void _mcount
#define MCOUNT \
-extern void mcount() asm("mcount"); \
+extern void mcount() __asm__ ("mcount"); \
void \
mcount() \
{ \
@@ -52,7 +52,7 @@ mcount() \
* \
* selfret = ret pushed by mcount call \
*/ \
- asm volatile("or %0,r1,0" : "=r" (selfret)); \
+ __asm__ __volatile__ ("or %0,r1,0" : "=r" (selfret)); \
/* \
* callerret = ret pushed by call into self. \
*/ \
@@ -60,8 +60,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/mvme88k/include/prom.h b/sys/arch/mvme88k/include/prom.h
index c8a8a13eac8..2fd9b7a3ec0 100644
--- a/sys/arch/mvme88k/include/prom.h
+++ b/sys/arch/mvme88k/include/prom.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: prom.h,v 1.5 2001/01/14 20:25:24 smurph Exp $ */
+/* $OpenBSD: prom.h,v 1.6 2001/01/15 19:50:38 deraadt Exp $ */
/*
* Copyright (c) 1998 Steve Murphree, Jr.
* Copyright (c) 1996 Nivas Madhur
@@ -160,8 +160,8 @@ struct mvmeprom_args {
#endif
#define MVMEPROM_CALL(x) \
- asm volatile ( __CONCAT("or r9,r0,",__STRING(x)) ); \
- asm volatile ("tb0 0,r0,496");
+ __asm__ __volatile__ ( __CONCAT("or r9,r0,",__STRING(x)) ); \
+ __asm__ __volatile__ ("tb0 0,r0,496");
#define MVMEPROM_REG_DEVLUN "r2"
#define MVMEPROM_REG_CTRLLUN "r3"
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-13 12:48:43 +0000