diff options
Diffstat (limited to 'sys/arch/sparc64')
| -rw-r--r-- | sys/arch/sparc64/include/endian.h | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/sys/arch/sparc64/include/endian.h b/sys/arch/sparc64/include/endian.h index 14d0ff09251..b2bb346d4ed 100644 --- a/sys/arch/sparc64/include/endian.h +++ b/sys/arch/sparc64/include/endian.h @@ -1,4 +1,4 @@ -/* $OpenBSD: endian.h,v 1.5 2014/03/25 03:53:35 dlg Exp $ */ +/* $OpenBSD: endian.h,v 1.6 2014/07/12 16:25:09 guenther Exp $ */ #ifndef _MACHINE_ENDIAN_H_ #define _MACHINE_ENDIAN_H_ @@ -7,7 +7,7 @@ #ifdef _KERNEL -#define ASI_P_L 0x88 +#define __ASI_P_L 0x88 /* == ASI_PRIMARY_LITTLE */ static inline __uint16_t __mswap16(volatile __uint16_t *m) @@ -16,7 +16,7 @@ __mswap16(volatile __uint16_t *m) __asm("lduha [%1] %2, %0 ! %3" : "=r" (v) - : "r" (m), "n" (ASI_P_L), "m" (*m)); + : "r" (m), "n" (__ASI_P_L), "m" (*m)); return (v); } @@ -28,7 +28,7 @@ __mswap32(volatile __uint32_t *m) __asm("lduwa [%1] %2, %0 ! %3" : "=r" (v) - : "r" (m), "n" (ASI_P_L), "m" (*m)); + : "r" (m), "n" (__ASI_P_L), "m" (*m)); return (v); } @@ -40,7 +40,7 @@ __mswap64(volatile __uint64_t *m) __asm("ldxa [%1] %2, %0 ! %3" : "=r" (v) - : "r" (m), "n" (ASI_P_L), "m" (*m)); + : "r" (m), "n" (__ASI_P_L), "m" (*m)); return (v); } @@ -50,7 +50,7 @@ __swapm16(volatile __uint16_t *m, __uint16_t v) { __asm("stha %1, [%2] %3 ! %0" : "=m" (*m) - : "r" (v), "r" (m), "n" (ASI_P_L)); + : "r" (v), "r" (m), "n" (__ASI_P_L)); } static inline void @@ -58,7 +58,7 @@ __swapm32(volatile __uint32_t *m, __uint32_t v) { __asm("stwa %1, [%2] %3 ! %0" : "=m" (*m) - : "r" (v), "r" (m), "n" (ASI_P_L)); + : "r" (v), "r" (m), "n" (__ASI_P_L)); } static inline void @@ -66,17 +66,19 @@ __swapm64(volatile __uint64_t *m, __uint64_t v) { __asm("stxa %1, [%2] %3 ! %0" : "=m" (*m) - : "r" (v), "r" (m), "n" (ASI_P_L)); + : "r" (v), "r" (m), "n" (__ASI_P_L)); } -#undef ASI_P_L +#undef __ASI_P_L -#define MD_SWAPIO +#define __HAVE_MD_SWAPIO #endif /* _KERNEL */ -#include <sys/endian.h> - #define __STRICT_ALIGNMENT +#ifndef __FROM_SYS__ENDIAN +#include <sys/endian.h> +#endif + #endif /* _MACHINE_ENDIAN_H_ */ |