mirror of
git://sourceware.org/git/glibc.git
synced 2025-01-18 12:16:13 +08:00
Add byteswap-16.h for __bswap_16
This commit is contained in:
parent
d4d1707fd6
commit
f8887d0a5f
13
ChangeLog
13
ChangeLog
@ -1,3 +1,16 @@
|
|||||||
|
2012-04-06 H.J. Lu <hongjiu.lu@intel.com>
|
||||||
|
|
||||||
|
* bits/byteswap.h (__bswap_16): Removed.
|
||||||
|
Include <bits/byteswap-16.h> to get __bswap_16.
|
||||||
|
* sysdeps/i386/bits/byteswap.h: Likewise.
|
||||||
|
* sysdeps/s390/bits/byteswap.h: Likewise.
|
||||||
|
* sysdeps/x86_64/bits/byteswap.h: Likewise.
|
||||||
|
* bits/byteswap-16.h: New file.
|
||||||
|
* sysdeps/i386/bits/byteswap-16.h: Likewise.
|
||||||
|
* sysdeps/s390/bits/byteswap-16.h: Likewise.
|
||||||
|
* sysdeps/x86_64/bits/byteswap-16.h: Likewise.
|
||||||
|
* string/Makefile (headers): Add bits/byteswap-16.h.
|
||||||
|
|
||||||
2012-04-06 Paul Pluzhnikov <ppluzhnikov@google.com>
|
2012-04-06 Paul Pluzhnikov <ppluzhnikov@google.com>
|
||||||
|
|
||||||
[BZ #13895]
|
[BZ #13895]
|
||||||
|
33
bits/byteswap-16.h
Normal file
33
bits/byteswap-16.h
Normal file
@ -0,0 +1,33 @@
|
|||||||
|
/* Macros to swap the order of bytes in 16-bit integer values.
|
||||||
|
Copyright (C) 2012 Free Software Foundation, Inc.
|
||||||
|
This file is part of the GNU C Library.
|
||||||
|
|
||||||
|
The GNU C Library is free software; you can redistribute it and/or
|
||||||
|
modify it under the terms of the GNU Lesser General Public
|
||||||
|
License as published by the Free Software Foundation; either
|
||||||
|
version 2.1 of the License, or (at your option) any later version.
|
||||||
|
|
||||||
|
The GNU C Library is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
|
Lesser General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU Lesser General Public
|
||||||
|
License along with the GNU C Library; if not, see
|
||||||
|
<http://www.gnu.org/licenses/>. */
|
||||||
|
|
||||||
|
#ifndef _BITS_BYTESWAP_H
|
||||||
|
# error "Never use <bits/byteswap-16.h> directly; include <byteswap.h> instead."
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef __GNUC__
|
||||||
|
# define __bswap_16(x) \
|
||||||
|
(__extension__ \
|
||||||
|
({ unsigned short int __bsx = (x); __bswap_constant_16 (__bsx); }))
|
||||||
|
#else
|
||||||
|
static __inline unsigned short int
|
||||||
|
__bswap_16 (unsigned short int __bsx)
|
||||||
|
{
|
||||||
|
return __bswap_constant_16 (__bsx);
|
||||||
|
}
|
||||||
|
#endif
|
@ -27,17 +27,8 @@
|
|||||||
#define __bswap_constant_16(x) \
|
#define __bswap_constant_16(x) \
|
||||||
((((x) >> 8) & 0xffu) | (((x) & 0xffu) << 8))
|
((((x) >> 8) & 0xffu) | (((x) & 0xffu) << 8))
|
||||||
|
|
||||||
#ifdef __GNUC__
|
/* Get __bswap_16. */
|
||||||
# define __bswap_16(x) \
|
#include <bits/byteswap-16.h>
|
||||||
(__extension__ \
|
|
||||||
({ unsigned short int __bsx = (x); __bswap_constant_16 (__bsx); }))
|
|
||||||
#else
|
|
||||||
static __inline unsigned short int
|
|
||||||
__bswap_16 (unsigned short int __bsx)
|
|
||||||
{
|
|
||||||
return __bswap_constant_16 (__bsx);
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* Swap bytes in 32 bit value. */
|
/* Swap bytes in 32 bit value. */
|
||||||
#define __bswap_constant_32(x) \
|
#define __bswap_constant_32(x) \
|
||||||
|
@ -21,8 +21,8 @@
|
|||||||
subdir := string
|
subdir := string
|
||||||
|
|
||||||
headers := string.h strings.h memory.h endian.h bits/endian.h \
|
headers := string.h strings.h memory.h endian.h bits/endian.h \
|
||||||
argz.h envz.h byteswap.h bits/byteswap.h bits/string.h \
|
argz.h envz.h byteswap.h bits/byteswap.h bits/byteswap-16.h \
|
||||||
bits/string2.h bits/string3.h
|
bits/string.h bits/string2.h bits/string3.h
|
||||||
|
|
||||||
routines := strcat strchr strcmp strcoll strcpy strcspn \
|
routines := strcat strchr strcmp strcoll strcpy strcspn \
|
||||||
strverscmp strdup strndup \
|
strverscmp strdup strndup \
|
||||||
|
49
sysdeps/i386/bits/byteswap-16.h
Normal file
49
sysdeps/i386/bits/byteswap-16.h
Normal file
@ -0,0 +1,49 @@
|
|||||||
|
/* Macros to swap the order of bytes in 16-bit integer values.
|
||||||
|
Copyright (C) 2012 Free Software Foundation, Inc.
|
||||||
|
This file is part of the GNU C Library.
|
||||||
|
|
||||||
|
The GNU C Library is free software; you can redistribute it and/or
|
||||||
|
modify it under the terms of the GNU Lesser General Public
|
||||||
|
License as published by the Free Software Foundation; either
|
||||||
|
version 2.1 of the License, or (at your option) any later version.
|
||||||
|
|
||||||
|
The GNU C Library is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
|
Lesser General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU Lesser General Public
|
||||||
|
License along with the GNU C Library; if not, see
|
||||||
|
<http://www.gnu.org/licenses/>. */
|
||||||
|
|
||||||
|
#ifndef _BITS_BYTESWAP_H
|
||||||
|
# error "Never use <bits/byteswap-16.h> directly; include <byteswap.h> instead."
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef __GNUC__
|
||||||
|
# if __GNUC__ >= 2
|
||||||
|
# define __bswap_16(x) \
|
||||||
|
(__extension__ \
|
||||||
|
({ register unsigned short int __v, __x = (unsigned short int) (x); \
|
||||||
|
if (__builtin_constant_p (__x)) \
|
||||||
|
__v = __bswap_constant_16 (__x); \
|
||||||
|
else \
|
||||||
|
__asm__ ("rorw $8, %w0" \
|
||||||
|
: "=r" (__v) \
|
||||||
|
: "0" (__x) \
|
||||||
|
: "cc"); \
|
||||||
|
__v; }))
|
||||||
|
# else
|
||||||
|
/* This is better than nothing. */
|
||||||
|
# define __bswap_16(x) \
|
||||||
|
(__extension__ \
|
||||||
|
({ register unsigned short int __x = (unsigned short int) (x); \
|
||||||
|
__bswap_constant_16 (__x); }))
|
||||||
|
# endif
|
||||||
|
#else
|
||||||
|
static __inline unsigned short int
|
||||||
|
__bswap_16 (unsigned short int __bsx)
|
||||||
|
{
|
||||||
|
return __bswap_constant_16 (__bsx);
|
||||||
|
}
|
||||||
|
#endif
|
@ -27,33 +27,8 @@
|
|||||||
#define __bswap_constant_16(x) \
|
#define __bswap_constant_16(x) \
|
||||||
((unsigned short int) ((((x) >> 8) & 0xff) | (((x) & 0xff) << 8)))
|
((unsigned short int) ((((x) >> 8) & 0xff) | (((x) & 0xff) << 8)))
|
||||||
|
|
||||||
#ifdef __GNUC__
|
/* Get __bswap_16. */
|
||||||
# if __GNUC__ >= 2
|
#include <bits/byteswap-16.h>
|
||||||
# define __bswap_16(x) \
|
|
||||||
(__extension__ \
|
|
||||||
({ register unsigned short int __v, __x = (unsigned short int) (x); \
|
|
||||||
if (__builtin_constant_p (__x)) \
|
|
||||||
__v = __bswap_constant_16 (__x); \
|
|
||||||
else \
|
|
||||||
__asm__ ("rorw $8, %w0" \
|
|
||||||
: "=r" (__v) \
|
|
||||||
: "0" (__x) \
|
|
||||||
: "cc"); \
|
|
||||||
__v; }))
|
|
||||||
# else
|
|
||||||
/* This is better than nothing. */
|
|
||||||
# define __bswap_16(x) \
|
|
||||||
(__extension__ \
|
|
||||||
({ register unsigned short int __x = (unsigned short int) (x); \
|
|
||||||
__bswap_constant_16 (__x); }))
|
|
||||||
# endif
|
|
||||||
#else
|
|
||||||
static __inline unsigned short int
|
|
||||||
__bswap_16 (unsigned short int __bsx)
|
|
||||||
{
|
|
||||||
return __bswap_constant_16 (__bsx);
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* Swap bytes in 32 bit value. */
|
/* Swap bytes in 32 bit value. */
|
||||||
#define __bswap_constant_32(x) \
|
#define __bswap_constant_32(x) \
|
||||||
|
65
sysdeps/s390/bits/byteswap-16.h
Normal file
65
sysdeps/s390/bits/byteswap-16.h
Normal file
@ -0,0 +1,65 @@
|
|||||||
|
/* Macros to swap the order of bytes in 16-bit integer values. s390 version
|
||||||
|
Copyright (C) 2012 Free Software Foundation, Inc.
|
||||||
|
Contributed by Martin Schwidefsky (schwidefsky@de.ibm.com).
|
||||||
|
This file is part of the GNU C Library.
|
||||||
|
|
||||||
|
The GNU C Library is free software; you can redistribute it and/or
|
||||||
|
modify it under the terms of the GNU Lesser General Public
|
||||||
|
License as published by the Free Software Foundation; either
|
||||||
|
version 2.1 of the License, or (at your option) any later version.
|
||||||
|
|
||||||
|
The GNU C Library is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
|
Lesser General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU Lesser General Public
|
||||||
|
License along with the GNU C Library; if not, see
|
||||||
|
<http://www.gnu.org/licenses/>. */
|
||||||
|
|
||||||
|
#ifndef _BITS_BYTESWAP_H
|
||||||
|
# error "Never use <bits/byteswap-16.h> directly; include <byteswap.h> instead."
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#include <bits/wordsize.h>
|
||||||
|
|
||||||
|
/* Swap bytes in 16 bit value. */
|
||||||
|
#if defined __GNUC__ && __GNUC__ >= 2
|
||||||
|
# if __WORDSIZE == 64
|
||||||
|
# define __bswap_16(x) \
|
||||||
|
(__extension__ \
|
||||||
|
({ unsigned short int __v, __x = (x); \
|
||||||
|
if (__builtin_constant_p (x)) \
|
||||||
|
__v = __bswap_constant_16 (__x); \
|
||||||
|
else { \
|
||||||
|
unsigned short int __tmp = (unsigned short int) (__x); \
|
||||||
|
__asm__ __volatile__ ( \
|
||||||
|
"lrvh %0,%1" \
|
||||||
|
: "=&d" (__v) : "m" (__tmp) ); \
|
||||||
|
} \
|
||||||
|
__v; }))
|
||||||
|
# else
|
||||||
|
# define __bswap_16(x) \
|
||||||
|
(__extension__ \
|
||||||
|
({ unsigned short int __v, __x = (x); \
|
||||||
|
if (__builtin_constant_p (x)) \
|
||||||
|
__v = __bswap_constant_16 (__x); \
|
||||||
|
else { \
|
||||||
|
unsigned short int __tmp = (unsigned short int) (__x); \
|
||||||
|
__asm__ __volatile__ ( \
|
||||||
|
"sr %0,%0\n" \
|
||||||
|
"la 1,%1\n" \
|
||||||
|
"icm %0,2,1(1)\n" \
|
||||||
|
"ic %0,0(1)" \
|
||||||
|
: "=&d" (__v) : "m" (__tmp) : "1"); \
|
||||||
|
} \
|
||||||
|
__v; }))
|
||||||
|
# endif
|
||||||
|
#else
|
||||||
|
/* This is better than nothing. */
|
||||||
|
static __inline unsigned short int
|
||||||
|
__bswap_16 (unsigned short int __bsx)
|
||||||
|
{
|
||||||
|
return __bswap_constant_16 (__bsx);
|
||||||
|
}
|
||||||
|
#endif
|
@ -29,46 +29,8 @@
|
|||||||
#define __bswap_constant_16(x) \
|
#define __bswap_constant_16(x) \
|
||||||
((((x) >> 8) & 0xff) | (((x) & 0xff) << 8))
|
((((x) >> 8) & 0xff) | (((x) & 0xff) << 8))
|
||||||
|
|
||||||
/* Swap bytes in 16 bit value. */
|
/* Get __bswap_16. */
|
||||||
#if defined __GNUC__ && __GNUC__ >= 2
|
#include <bits/byteswap-16.h>
|
||||||
# if __WORDSIZE == 64
|
|
||||||
# define __bswap_16(x) \
|
|
||||||
(__extension__ \
|
|
||||||
({ unsigned short int __v, __x = (x); \
|
|
||||||
if (__builtin_constant_p (x)) \
|
|
||||||
__v = __bswap_constant_16 (__x); \
|
|
||||||
else { \
|
|
||||||
unsigned short int __tmp = (unsigned short int) (__x); \
|
|
||||||
__asm__ __volatile__ ( \
|
|
||||||
"lrvh %0,%1" \
|
|
||||||
: "=&d" (__v) : "m" (__tmp) ); \
|
|
||||||
} \
|
|
||||||
__v; }))
|
|
||||||
# else
|
|
||||||
# define __bswap_16(x) \
|
|
||||||
(__extension__ \
|
|
||||||
({ unsigned short int __v, __x = (x); \
|
|
||||||
if (__builtin_constant_p (x)) \
|
|
||||||
__v = __bswap_constant_16 (__x); \
|
|
||||||
else { \
|
|
||||||
unsigned short int __tmp = (unsigned short int) (__x); \
|
|
||||||
__asm__ __volatile__ ( \
|
|
||||||
"sr %0,%0\n" \
|
|
||||||
"la 1,%1\n" \
|
|
||||||
"icm %0,2,1(1)\n" \
|
|
||||||
"ic %0,0(1)" \
|
|
||||||
: "=&d" (__v) : "m" (__tmp) : "1"); \
|
|
||||||
} \
|
|
||||||
__v; }))
|
|
||||||
# endif
|
|
||||||
#else
|
|
||||||
/* This is better than nothing. */
|
|
||||||
static __inline unsigned short int
|
|
||||||
__bswap_16 (unsigned short int __bsx)
|
|
||||||
{
|
|
||||||
return __bswap_constant_16 (__bsx);
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* Swap bytes in 32 bit value. */
|
/* Swap bytes in 32 bit value. */
|
||||||
#define __bswap_constant_32(x) \
|
#define __bswap_constant_32(x) \
|
||||||
|
49
sysdeps/x86_64/bits/byteswap-16.h
Normal file
49
sysdeps/x86_64/bits/byteswap-16.h
Normal file
@ -0,0 +1,49 @@
|
|||||||
|
/* Macros to swap the order of bytes in 16-bit integer values.
|
||||||
|
Copyright (C) 2012 Free Software Foundation, Inc.
|
||||||
|
This file is part of the GNU C Library.
|
||||||
|
|
||||||
|
The GNU C Library is free software; you can redistribute it and/or
|
||||||
|
modify it under the terms of the GNU Lesser General Public
|
||||||
|
License as published by the Free Software Foundation; either
|
||||||
|
version 2.1 of the License, or (at your option) any later version.
|
||||||
|
|
||||||
|
The GNU C Library is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
|
Lesser General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU Lesser General Public
|
||||||
|
License along with the GNU C Library; if not, see
|
||||||
|
<http://www.gnu.org/licenses/>. */
|
||||||
|
|
||||||
|
#ifndef _BITS_BYTESWAP_H
|
||||||
|
# error "Never use <bits/byteswap-16.h> directly; include <byteswap.h> instead."
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef __GNUC__
|
||||||
|
# if __GNUC__ >= 2
|
||||||
|
# define __bswap_16(x) \
|
||||||
|
(__extension__ \
|
||||||
|
({ register unsigned short int __v, __x = (unsigned short int) (x); \
|
||||||
|
if (__builtin_constant_p (__x)) \
|
||||||
|
__v = __bswap_constant_16 (__x); \
|
||||||
|
else \
|
||||||
|
__asm__ ("rorw $8, %w0" \
|
||||||
|
: "=r" (__v) \
|
||||||
|
: "0" (__x) \
|
||||||
|
: "cc"); \
|
||||||
|
__v; }))
|
||||||
|
# else
|
||||||
|
/* This is better than nothing. */
|
||||||
|
# define __bswap_16(x) \
|
||||||
|
(__extension__ \
|
||||||
|
({ register unsigned short int __x = (unsigned short int) (x); \
|
||||||
|
__bswap_constant_16 (__x); }))
|
||||||
|
# endif
|
||||||
|
#else
|
||||||
|
static __inline unsigned short int
|
||||||
|
__bswap_16 (unsigned short int __bsx)
|
||||||
|
{
|
||||||
|
return __bswap_constant_16 (__bsx);
|
||||||
|
}
|
||||||
|
#endif
|
@ -29,26 +29,8 @@
|
|||||||
#define __bswap_constant_16(x) \
|
#define __bswap_constant_16(x) \
|
||||||
((unsigned short int) ((((x) >> 8) & 0xff) | (((x) & 0xff) << 8)))
|
((unsigned short int) ((((x) >> 8) & 0xff) | (((x) & 0xff) << 8)))
|
||||||
|
|
||||||
#if defined __GNUC__ && __GNUC__ >= 2
|
/* Get __bswap_16. */
|
||||||
# define __bswap_16(x) \
|
#include <bits/byteswap-16.h>
|
||||||
(__extension__ \
|
|
||||||
({ register unsigned short int __v, __x = (unsigned short int) (x); \
|
|
||||||
if (__builtin_constant_p (__x)) \
|
|
||||||
__v = __bswap_constant_16 (__x); \
|
|
||||||
else \
|
|
||||||
__asm__ ("rorw $8, %w0" \
|
|
||||||
: "=r" (__v) \
|
|
||||||
: "0" (__x) \
|
|
||||||
: "cc"); \
|
|
||||||
__v; }))
|
|
||||||
#else
|
|
||||||
/* This is better than nothing. */
|
|
||||||
# define __bswap_16(x) \
|
|
||||||
(__extension__ \
|
|
||||||
({ register unsigned short int __x = (unsigned short int) (x); \
|
|
||||||
__bswap_constant_16 (__x); }))
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
/* Swap bytes in 32 bit value. */
|
/* Swap bytes in 32 bit value. */
|
||||||
#define __bswap_constant_32(x) \
|
#define __bswap_constant_32(x) \
|
||||||
|
Loading…
Reference in New Issue
Block a user