Copy amd64 endian.h to x86 and merge with i386 endian.h. Replace
amd64/i386/pc98 endian.h with stubs. In __bswap64_const(x) the conflict between 0xffUL and 0xffULL has been resolved by reimplementing the macro in terms of __bswap32(x). As a side effect __bswap64_var(x) is now implemented using two bswap instructions on i386 and should be much faster. __bswap32_const(x) has been reimplemented in terms of __bswap16(x) for consistency.
This commit is contained in:
tijl
parent
22eaf01bc1
commit
bfd7a07500
@ -1,145 +1,6 @@
|
||||
/*-
|
||||
* Copyright (c) 1987, 1991 Regents of the University of California.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
* 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 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.8 (Berkeley) 4/3/91
|
||||
* $FreeBSD$
|
||||
* This file is in the public domain.
|
||||
*/
|
||||
/* $FreeBSD$ */
|
||||
|
||||
#ifndef _MACHINE_ENDIAN_H_
|
||||
#define _MACHINE_ENDIAN_H_
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
#include <sys/_types.h>
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Define the order of 32-bit words in 64-bit words.
|
||||
*/
|
||||
#define _QUAD_HIGHWORD 1
|
||||
#define _QUAD_LOWWORD 0
|
||||
|
||||
/*
|
||||
* 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 long */
|
||||
|
||||
#define _BYTE_ORDER _LITTLE_ENDIAN
|
||||
|
||||
/*
|
||||
* Deprecated variants that don't have enough underscores to be useful in more
|
||||
* strict namespaces.
|
||||
*/
|
||||
#if __BSD_VISIBLE
|
||||
#define LITTLE_ENDIAN _LITTLE_ENDIAN
|
||||
#define BIG_ENDIAN _BIG_ENDIAN
|
||||
#define PDP_ENDIAN _PDP_ENDIAN
|
||||
#define BYTE_ORDER _BYTE_ORDER
|
||||
#endif
|
||||
|
||||
#if defined(__GNUCLIKE_ASM) && defined(__GNUCLIKE_BUILTIN_CONSTANT_P)
|
||||
|
||||
#define __bswap64_const(_x) \
|
||||
(((_x) >> 56) | \
|
||||
(((_x) >> 40) & (0xffUL << 8)) | \
|
||||
(((_x) >> 24) & (0xffUL << 16)) | \
|
||||
(((_x) >> 8) & (0xffUL << 24)) | \
|
||||
(((_x) << 8) & (0xffUL << 32)) | \
|
||||
(((_x) << 24) & (0xffUL << 40)) | \
|
||||
(((_x) << 40) & (0xffUL << 48)) | \
|
||||
((_x) << 56))
|
||||
|
||||
#define __bswap32_const(_x) \
|
||||
(((_x) >> 24) | \
|
||||
(((_x) & (0xff << 16)) >> 8) | \
|
||||
(((_x) & (0xff << 8)) << 8) | \
|
||||
((_x) << 24))
|
||||
|
||||
#define __bswap16_const(_x) (__uint16_t)((_x) << 8 | (_x) >> 8)
|
||||
|
||||
static __inline __uint64_t
|
||||
__bswap64_var(__uint64_t _x)
|
||||
{
|
||||
|
||||
__asm ("bswap %0" : "+r" (_x));
|
||||
return (_x);
|
||||
}
|
||||
|
||||
static __inline __uint32_t
|
||||
__bswap32_var(__uint32_t _x)
|
||||
{
|
||||
|
||||
__asm ("bswap %0" : "+r" (_x));
|
||||
return (_x);
|
||||
}
|
||||
|
||||
static __inline __uint16_t
|
||||
__bswap16_var(__uint16_t _x)
|
||||
{
|
||||
|
||||
return (__bswap16_const(_x));
|
||||
}
|
||||
|
||||
#define __bswap64(_x) \
|
||||
(__builtin_constant_p(_x) ? \
|
||||
__bswap64_const((__uint64_t)(_x)) : __bswap64_var(_x))
|
||||
|
||||
#define __bswap32(_x) \
|
||||
(__builtin_constant_p(_x) ? \
|
||||
__bswap32_const((__uint32_t)(_x)) : __bswap32_var(_x))
|
||||
|
||||
#define __bswap16(_x) \
|
||||
(__builtin_constant_p(_x) ? \
|
||||
__bswap16_const((__uint16_t)(_x)) : __bswap16_var(_x))
|
||||
|
||||
#define __htonl(x) __bswap32(x)
|
||||
#define __htons(x) __bswap16(x)
|
||||
#define __ntohl(x) __bswap32(x)
|
||||
#define __ntohs(x) __bswap16(x)
|
||||
|
||||
#else /* !(__GNUCLIKE_ASM && __GNUCLIKE_BUILTIN_CONSTANT_P) */
|
||||
|
||||
/*
|
||||
* No optimizations are available for this compiler. Fall back to
|
||||
* non-optimized functions by defining the constant usually used to prevent
|
||||
* redefinition.
|
||||
*/
|
||||
#define _BYTEORDER_FUNC_DEFINED
|
||||
|
||||
#endif /* __GNUCLIKE_ASM && __GNUCLIKE_BUILTIN_CONSTANT_P */
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif /* !_MACHINE_ENDIAN_H_ */
|
||||
#include <x86/endian.h>
|
||||
|
||||
@ -1,145 +1,6 @@
|
||||
/*-
|
||||
* Copyright (c) 1987, 1991 Regents of the University of California.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
* 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 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.8 (Berkeley) 4/3/91
|
||||
* $FreeBSD$
|
||||
* This file is in the public domain.
|
||||
*/
|
||||
/* $FreeBSD$ */
|
||||
|
||||
#ifndef _MACHINE_ENDIAN_H_
|
||||
#define _MACHINE_ENDIAN_H_
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
#include <sys/_types.h>
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Define the order of 32-bit words in 64-bit words.
|
||||
*/
|
||||
#define _QUAD_HIGHWORD 1
|
||||
#define _QUAD_LOWWORD 0
|
||||
|
||||
/*
|
||||
* 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 long */
|
||||
|
||||
#define _BYTE_ORDER _LITTLE_ENDIAN
|
||||
|
||||
/*
|
||||
* Deprecated variants that don't have enough underscores to be useful in more
|
||||
* strict namespaces.
|
||||
*/
|
||||
#if __BSD_VISIBLE
|
||||
#define LITTLE_ENDIAN _LITTLE_ENDIAN
|
||||
#define BIG_ENDIAN _BIG_ENDIAN
|
||||
#define PDP_ENDIAN _PDP_ENDIAN
|
||||
#define BYTE_ORDER _BYTE_ORDER
|
||||
#endif
|
||||
|
||||
#if defined(__GNUCLIKE_ASM) && defined(__GNUCLIKE_BUILTIN_CONSTANT_P)
|
||||
|
||||
#define __bswap64_const(_x) \
|
||||
(((_x) >> 56) | \
|
||||
(((_x) >> 40) & (0xffULL << 8)) | \
|
||||
(((_x) >> 24) & (0xffULL << 16)) | \
|
||||
(((_x) >> 8) & (0xffULL << 24)) | \
|
||||
(((_x) << 8) & (0xffULL << 32)) | \
|
||||
(((_x) << 24) & (0xffULL << 40)) | \
|
||||
(((_x) << 40) & (0xffULL << 48)) | \
|
||||
((_x) << 56))
|
||||
|
||||
#define __bswap32_const(_x) \
|
||||
(((_x) >> 24) | \
|
||||
(((_x) & (0xff << 16)) >> 8) | \
|
||||
(((_x) & (0xff << 8)) << 8) | \
|
||||
((_x) << 24))
|
||||
|
||||
#define __bswap16_const(_x) (__uint16_t)((_x) << 8 | (_x) >> 8)
|
||||
|
||||
static __inline __uint64_t
|
||||
__bswap64_var(__uint64_t __x)
|
||||
{
|
||||
|
||||
return __bswap64_const(__x);
|
||||
}
|
||||
|
||||
|
||||
static __inline __uint32_t
|
||||
__bswap32_var(__uint32_t _x)
|
||||
{
|
||||
|
||||
__asm ("bswap %0" : "+r" (_x));
|
||||
return (_x);
|
||||
}
|
||||
|
||||
static __inline __uint16_t
|
||||
__bswap16_var(__uint16_t _x)
|
||||
{
|
||||
|
||||
return (__bswap16_const(_x));
|
||||
}
|
||||
|
||||
#define __bswap64(_x) \
|
||||
(__builtin_constant_p(_x) ? \
|
||||
__bswap64_const((__uint64_t)(_x)) : __bswap64_var(_x))
|
||||
|
||||
#define __bswap32(_x) \
|
||||
(__builtin_constant_p(_x) ? \
|
||||
__bswap32_const((__uint32_t)(_x)) : __bswap32_var(_x))
|
||||
|
||||
#define __bswap16(_x) \
|
||||
(__builtin_constant_p(_x) ? \
|
||||
__bswap16_const((__uint16_t)(_x)) : __bswap16_var(_x))
|
||||
|
||||
#define __htonl(x) __bswap32(x)
|
||||
#define __htons(x) __bswap16(x)
|
||||
#define __ntohl(x) __bswap32(x)
|
||||
#define __ntohs(x) __bswap16(x)
|
||||
|
||||
#else /* !(__GNUCLIKE_ASM && __GNUCLIKE_BUILTIN_CONSTANT_P) */
|
||||
|
||||
/*
|
||||
* No optimizations are available for this compiler. Fall back to
|
||||
* non-optimized functions by defining the constant usually used to prevent
|
||||
* redefinition.
|
||||
*/
|
||||
#define _BYTEORDER_FUNC_DEFINED
|
||||
|
||||
#endif /* __GNUCLIKE_ASM && __GNUCLIKE_BUILTIN_CONSTANT_P */
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif /* !_MACHINE_ENDIAN_H_ */
|
||||
#include <x86/endian.h>
|
||||
|
||||
@ -3,4 +3,4 @@
|
||||
*/
|
||||
/* $FreeBSD$ */
|
||||
|
||||
#include <i386/endian.h>
|
||||
#include <x86/endian.h>
|
||||
|
||||
138
sys/x86/include/endian.h
Normal file
138
sys/x86/include/endian.h
Normal file
@ -0,0 +1,138 @@
|
||||
/*-
|
||||
* Copyright (c) 1987, 1991 Regents of the University of California.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
* 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 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.8 (Berkeley) 4/3/91
|
||||
* $FreeBSD$
|
||||
*/
|
||||
|
||||
#ifndef _MACHINE_ENDIAN_H_
|
||||
#define _MACHINE_ENDIAN_H_
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
#include <sys/_types.h>
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Define the order of 32-bit words in 64-bit words.
|
||||
*/
|
||||
#define _QUAD_HIGHWORD 1
|
||||
#define _QUAD_LOWWORD 0
|
||||
|
||||
/*
|
||||
* 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 long */
|
||||
|
||||
#define _BYTE_ORDER _LITTLE_ENDIAN
|
||||
|
||||
/*
|
||||
* Deprecated variants that don't have enough underscores to be useful in more
|
||||
* strict namespaces.
|
||||
*/
|
||||
#if __BSD_VISIBLE
|
||||
#define LITTLE_ENDIAN _LITTLE_ENDIAN
|
||||
#define BIG_ENDIAN _BIG_ENDIAN
|
||||
#define PDP_ENDIAN _PDP_ENDIAN
|
||||
#define BYTE_ORDER _BYTE_ORDER
|
||||
#endif
|
||||
|
||||
#if defined(__GNUCLIKE_ASM) && defined(__GNUCLIKE_BUILTIN_CONSTANT_P)
|
||||
|
||||
#define __bswap16_const(_x) (__uint16_t)((_x) << 8 | (_x) >> 8)
|
||||
|
||||
#define __bswap16(_x) \
|
||||
(__builtin_constant_p(_x) ? \
|
||||
__bswap16_const((__uint16_t)(_x)) : __bswap16_var(_x))
|
||||
|
||||
#define __bswap32_const(_x) \
|
||||
(((__uint32_t)__bswap16(_x) << 16) | __bswap16((_x) >> 16))
|
||||
|
||||
#define __bswap32(_x) \
|
||||
(__builtin_constant_p(_x) ? \
|
||||
__bswap32_const((__uint32_t)(_x)) : __bswap32_var(_x))
|
||||
|
||||
#define __bswap64_const(_x) \
|
||||
(((__uint64_t)__bswap32(_x) << 32) | __bswap32((_x) >> 32))
|
||||
|
||||
#define __bswap64(_x) \
|
||||
(__builtin_constant_p(_x) ? \
|
||||
__bswap64_const((__uint64_t)(_x)) : __bswap64_var(_x))
|
||||
|
||||
static __inline __uint16_t
|
||||
__bswap16_var(__uint16_t _x)
|
||||
{
|
||||
|
||||
return (__bswap16_const(_x));
|
||||
}
|
||||
|
||||
static __inline __uint32_t
|
||||
__bswap32_var(__uint32_t _x)
|
||||
{
|
||||
|
||||
__asm ("bswap %0" : "+r" (_x));
|
||||
return (_x);
|
||||
}
|
||||
|
||||
static __inline __uint64_t
|
||||
__bswap64_var(__uint64_t _x)
|
||||
{
|
||||
#ifdef _LP64
|
||||
__asm ("bswap %0" : "+r" (_x));
|
||||
return (_x);
|
||||
#else
|
||||
return (__bswap64_const(_x));
|
||||
#endif
|
||||
}
|
||||
|
||||
#define __htonl(x) __bswap32(x)
|
||||
#define __htons(x) __bswap16(x)
|
||||
#define __ntohl(x) __bswap32(x)
|
||||
#define __ntohs(x) __bswap16(x)
|
||||
|
||||
#else /* !(__GNUCLIKE_ASM && __GNUCLIKE_BUILTIN_CONSTANT_P) */
|
||||
|
||||
/*
|
||||
* No optimizations are available for this compiler. Fall back to
|
||||
* non-optimized functions by defining the constant usually used to prevent
|
||||
* redefinition.
|
||||
*/
|
||||
#define _BYTEORDER_FUNC_DEFINED
|
||||
|
||||
#endif /* __GNUCLIKE_ASM && __GNUCLIKE_BUILTIN_CONSTANT_P */
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif /* !_MACHINE_ENDIAN_H_ */
|
||||
Loading…
x
Reference in New Issue
Block a user