diff options
Diffstat (limited to 'sys/arch/m68k/include/endian.h')
| -rw-r--r-- | sys/arch/m68k/include/endian.h | 165 |
1 files changed, 30 insertions, 135 deletions
diff --git a/sys/arch/m68k/include/endian.h b/sys/arch/m68k/include/endian.h index b9514134c68..c1963970b53 100644 --- a/sys/arch/m68k/include/endian.h +++ b/sys/arch/m68k/include/endian.h @@ -1,9 +1,7 @@ -/* $OpenBSD: endian.h,v 1.8 1997/06/25 12:52:09 grr Exp $ */ -/* $NetBSD: endian.h,v 1.10 1996/10/13 02:59:55 christos Exp $ */ +/* $OpenBSD: endian.h,v 1.9 1997/11/09 23:05:09 niklas Exp $ */ -/* - * Copyright (c) 1987, 1991 Regents of the University of California. - * All rights reserved. +/*- + * Copyright (c) 1997 Niklas Hallqvist. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -15,148 +13,45 @@ * documentation and/or other materials provided with the distribution. * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. + * This product includes software developed by Niklas Hallqvist. + * 4. The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#)endian.h 7.7 (Berkeley) 4/3/91 + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #ifndef _M68K_ENDIAN_H_ #define _M68K_ENDIAN_H_ -/* - * Define the order of 32-bit words in 64-bit words. - */ -#define _QUAD_HIGHWORD 0 -#define _QUAD_LOWWORD 1 - -#ifndef _POSIX_SOURCE -/* - * Definitions for byte order, according to byte significance from low - * address to high. - */ -#define LITTLE_ENDIAN 1234 /* LSB first: i386, vax */ -#define BIG_ENDIAN 4321 /* MSB first: 68000, ibm, net */ -#define PDP_ENDIAN 3412 /* LSB first in word, MSW first in int32_t */ - -#define BYTE_ORDER BIG_ENDIAN - -#include <sys/cdefs.h> - -typedef u_int32_t in_addr_t; -typedef u_int16_t in_port_t; - -__BEGIN_DECLS -#if 0 -/* - * prototypes supplied for documentation purposes solely - */ -u_int32_t htobe32 __P((u_int32_t)); -u_int16_t htobe16 __P((u_int16_t)); -u_int32_t betoh32 __P((u_int32_t)); -u_int16_t betoh16 __P((u_int16_t)); - -u_int32_t htole32 __P((u_int32_t)); -u_int16_t htole16 __P((u_int16_t)); -u_int32_t letoh32 __P((u_int32_t)); -u_int16_t letoh16 __P((u_int16_t)); - -u_int32_t htonl __P((u_int32_t)); -u_int16_t htons __P((u_int16_t)); -u_int32_t ntohl __P((u_int32_t)); -u_int16_t ntohs __P((u_int16_t)); -#endif -__END_DECLS - #ifdef __GNUC__ -#define __byte_swap_int32_variable(x) \ -({ register u_int32_t __x = (x); \ - __asm ("rorw #8, %0; swap %0; rorw #8, %0" \ - : "=r" (__x) \ - : "0" (__x)); \ - __x; }) - -#define __byte_swap_int16_variable(x) \ -({ register u_int16_t __x = (x); \ - __asm ("rorw #8, %0" \ - : "=r" (__x) \ - : "0" (__x)); \ - __x; }) - -#ifdef __OPTIMIZE__ +#define __swap32md(x) ({ \ + register u_int32_t __x = (x); \ + __asm ("rorw #8, %0; swap %0; rorw #8, %0" : "=r" (__x) : "0" (__x)); \ + __x; \ +}) -#define __byte_swap_int32_constant(x) \ - ((((x) & 0xff000000) >> 24) | \ - (((x) & 0x00ff0000) >> 8) | \ - (((x) & 0x0000ff00) << 8) | \ - (((x) & 0x000000ff) << 24)) -#define __byte_swap_int16_constant(x) \ - ((((x) & 0xff00) >> 8) | \ - (((x) & 0x00ff) << 8)) -#define __byte_swap_int32(x) \ - (__builtin_constant_p((x)) ? \ - __byte_swap_int32_constant(x) : __byte_swap_int32_variable(x)) -#define __byte_swap_int16(x) \ - (__builtin_constant_p((x)) ? \ - __byte_swap_int16_constant(x) : __byte_swap_int16_variable(x)) +#define __swap16md(x) ({ \ + register u_int16_t __x = (x); \ + __asm ("rorw #8, %0" : "=r" (__x) : "0" (__x)); \ + __x; \ +}) -#else /* __OPTIMIZE__ */ +/* Tell sys/endian.h we have MD variants of the swap macros. */ +#define MD_SWAP -#define __byte_swap_int32(x) __byte_swap_int32_variable(x) -#define __byte_swap_int16(x) __byte_swap_int16_variable(x) - -#endif /* __OPTIMIZE__ */ #endif /* __GNUC__ */ -/* - * Macros for big/little endian to host and vice versa. - */ -#define betoh32(x) (x) -#define betoh16(x) (x) -#define htobe32(x) (x) -#define htobe16(x) (x) - -#define letoh32(x) __byte_swap_int32(x) -#define letoh16(x) __byte_swap_int16(x) -#define htole32(x) __byte_swap_int32(x) -#define htole16(x) __byte_swap_int16(x) - -/* - * Macros for network/external number representation conversion. - * - * The way this works is that HTONS(x) modifies x and *can't* be used as - * and rvalue i.e. foo=HTONS(bar) is wrong. Likewise x=htons(x) should - * never be used where HTONS(x) will serve i.e. foo=htons(foo) is wrong. - * Failing to observe these rule will result in code that appears to work - * and probably does work, but generates gcc warnings on architectures - * where the macros are used to optimize away an unneeded conversion. - */ -#define ntohl(x) betoh32(x) -#define ntohs(x) betoh16(x) -#define htonl(x) htobe32(x) -#define htons(x) htobe16(x) - -#define NTOHL(x) (void)(x) -#define NTOHS(x) (void)(x) -#define HTONL(x) (void)(x) -#define HTONS(x) (void)(x) - -#endif /* _POSIX_SOURCE */ +#define BYTE_ORDER 4321 +#include <sys/endian.h> #endif /* _M68K_ENDIAN_H_ */ |