? q.c
? q.s
Index: endian.h
===================================================================
RCS file: /home/ncvs/src/sys/i386/include/endian.h,v
retrieving revision 1.36
diff -u -r1.36 endian.h
--- endian.h	2003/08/03 07:50:19	1.36
+++ endian.h	2003/08/15 00:59:09
@@ -69,30 +69,75 @@
 
 #ifdef __GNUC__
 
-#define __word_swap_int(x) \
+#define __word_swap_int_var(x) \
 __extension__ ({ register __uint32_t __X = (x); \
    __asm ("rorl $16, %0" : "+r" (__X)); \
    __X; })
 
+#ifdef __OPTIMIZE__
+
+#define	__word_swap_int_const(x) \
+	((((x) & 0xffff0000) >> 16) | \
+	 (((x) & 0x0000ffff) << 16))
+#define	__word_swap_int(x) (__builtin_constant_p(x) ? \
+	__word_swap_int_const(x) : __word_swap_int_var(x))
+
+#else	/* __OPTIMIZE__ */
+
+#define	__word_swap_int(x) __word_swap_int_var(x)
+
+#endif	/* __OPTIMIZE__ */
+
 #if defined(_KERNEL) && (defined(I486_CPU) || defined(I586_CPU) || defined(I686_CPU)) && !defined(I386_CPU)
 
-#define __byte_swap_int(x) \
+#define __byte_swap_int_var(x) \
 __extension__ ({ register __uint32_t __X = (x); \
    __asm ("bswap %0" : "+r" (__X)); \
    __X; })
 #else
 
-#define __byte_swap_int(x) \
+#define __byte_swap_int_var(x) \
 __extension__ ({ register __uint32_t __X = (x); \
    __asm ("xchgb %h0, %b0\n\trorl $16, %0\n\txchgb %h0, %b0" \
        : "+q" (__X)); \
    __X; })
 #endif
+
+#ifdef __OPTIMIZE__
+
+#define	__byte_swap_int_const(x) \
+	((((x) & 0xff000000) >> 24) | \
+	 (((x) & 0x00ff0000) >>  8) | \
+	 (((x) & 0x0000ff00) <<  8) | \
+	 (((x) & 0x000000ff) << 24))
+#define	__byte_swap_int(x) (__builtin_constant_p(x) ? \
+	__byte_swap_int_const(x) : __byte_swap_int_var(x))
+
+#else	/* __OPTIMIZE__ */
 
-#define __byte_swap_word(x) \
+#define	__byte_swap_int(x) __byte_swap_int_var(x)
+
+#endif	/* __OPTIMIZE__ */
+
+#define __byte_swap_word_var(x) \
 __extension__ ({ register __uint16_t __X = (x); \
    __asm ("xchgb %h0, %b0" : "+q" (__X)); \
    __X; })
+
+#ifdef __OPTIMIZE__
+
+#define	__byte_swap_word_constant(x) \
+	((((x) & 0xff00) >> 8) | \
+	 (((x) & 0x00ff) << 8))
+
+#define	__byte_swap_word(x) (__builtin_constant_p(x) ? \
+	__byte_swap_word_const(x) : __byte_swap_word_var(x))
+
+#else	/* __OPTIMIZE__ */
+
+#define	__byte_swap_word(x) __byte_swap_word_var(x)
+
+#endif	/* __OPTIMIZE__ */
 
 static __inline __uint64_t
 __bswap64(__uint64_t _x)