diff options
Diffstat (limited to 'sys/arch/i386/include/endian.h')
| -rw-r--r-- | sys/arch/i386/include/endian.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/arch/i386/include/endian.h b/sys/arch/i386/include/endian.h index 34a3ae7ba0e..817d6c6abb4 100644 --- a/sys/arch/i386/include/endian.h +++ b/sys/arch/i386/include/endian.h @@ -1,4 +1,4 @@ -/* $OpenBSD: endian.h,v 1.16 2011/03/11 15:17:08 pirofti Exp $ */ +/* $OpenBSD: endian.h,v 1.17 2011/03/12 04:03:04 guenther Exp $ */ /*- * Copyright (c) 1997 Niklas Hallqvist. All rights reserved. @@ -29,23 +29,23 @@ #ifdef __GNUC__ -#define __swap32md(x) ({ \ +#define __swap32md(x) __statement({ \ u_int32_t __swap32md_x = (x); \ \ - __asm ("bswap %1" : "+r" (__swap32md_x)); \ + __asm ("bswap %0" : "+r" (__swap32md_x)); \ __swap32md_x; \ }) -#define __swap64md(x) ({ \ +#define __swap64md(x) __statement({ \ u_int64_t __swap64md_x = (x); \ \ (u_int64_t)__swap32md(__swap64md_x >> 32) | \ (u_int64_t)__swap32md(__swap64md_x & 0xffffffff) << 32; \ }) -#define __swap16md(x) ({ \ +#define __swap16md(x) __statement({ \ u_int16_t __swap16md_x = (x); \ \ - __asm ("rorw $8, %w1" : "+r" (__swap16md_x)); \ + __asm ("rorw $8, %w0" : "+r" (__swap16md_x)); \ __swap16md_x; \ }) |