diff options
Diffstat (limited to 'sys/arch/mvme88k/include/asm_macro.h')
| -rw-r--r-- | sys/arch/mvme88k/include/asm_macro.h | 28 |
1 files changed, 14 insertions, 14 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 |