Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit acbbbe9f authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

x86: merge byteorder_32/64.h 



Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent d88203d1

include/asm-x86/Kbuild

+0 −2
Original line number Diff line number Diff line
@@ -11,8 +11,6 @@ header-y += sigcontext32.h 
header-y += ucontext.h

header-y += vsyscall32.h



unifdef-y += byteorder_32.h

unifdef-y += byteorder_64.h

unifdef-y += e820.h

unifdef-y += elf_32.h

unifdef-y += elf_64.h

include/asm-x86/byteorder.h

+70 −11
Original line number Diff line number Diff line 
#ifdef __KERNEL__

# ifdef CONFIG_X86_32

#  include "byteorder_32.h"

#ifndef _ASM_X86_BYTEORDER_H

#define _ASM_X86_BYTEORDER_H



#include <asm/types.h>

#include <linux/compiler.h>



#ifdef __GNUC__



#ifdef __i386__



static __inline__ __attribute_const__ __u32 ___arch__swab32(__u32 x)

{

#ifdef CONFIG_X86_BSWAP

	__asm__("bswap %0" : "=r" (x) : "0" (x));

#else

#  include "byteorder_64.h"

	__asm__("xchgb %b0,%h0\n\t"	/* swap lower bytes	*/

		"rorl $16,%0\n\t"	/* swap words		*/

		"xchgb %b0,%h0"		/* swap higher bytes	*/

		:"=q" (x)

		: "0" (x));

#endif

	return x;

}



static __inline__ __attribute_const__ __u64 ___arch__swab64(__u64 val)

{

	union {

		struct { __u32 a,b; } s;

		__u64 u;

	} v;

	v.u = val;

#ifdef CONFIG_X86_BSWAP

	asm("bswapl %0 ; bswapl %1 ; xchgl %0,%1"

	    : "=r" (v.s.a), "=r" (v.s.b)

	    : "0" (v.s.a), "1" (v.s.b));

#else

# ifdef __i386__

#  include "byteorder_32.h"

# else

#  include "byteorder_64.h"

	v.s.a = ___arch__swab32(v.s.a);

	v.s.b = ___arch__swab32(v.s.b);

	asm("xchgl %0,%1" : "=r" (v.s.a), "=r" (v.s.b) : "0" (v.s.a), "1" (v.s.b));

#endif

	return v.u;

}



#else /* __i386__ */



static __inline__ __attribute_const__ __u64 ___arch__swab64(__u64 x)

{

	__asm__("bswapq %0" : "=r" (x) : "0" (x));

	return x;

}



static __inline__ __attribute_const__ __u32 ___arch__swab32(__u32 x)

{

	__asm__("bswapl %0" : "=r" (x) : "0" (x));

	return x;

}



#endif



/* Do not define swab16.  Gcc is smart enough to recognize "C" version and

   convert it into rotation or exhange.  */



#define __arch__swab64(x) ___arch__swab64(x)

#define __arch__swab32(x) ___arch__swab32(x)



#define __BYTEORDER_HAS_U64__



#endif /* __GNUC__ */



#include <linux/byteorder/little_endian.h>



#endif /* _ASM_X86_BYTEORDER_H */

include/asm-x86/byteorder_32.h

deleted100644 → 0
+0 −58
Original line number Diff line number Diff line 
#ifndef _I386_BYTEORDER_H

#define _I386_BYTEORDER_H



#include <asm/types.h>

#include <linux/compiler.h>



#ifdef __GNUC__



/* For avoiding bswap on i386 */

#ifdef __KERNEL__

#endif



static __inline__ __attribute_const__ __u32 ___arch__swab32(__u32 x)

{

#ifdef CONFIG_X86_BSWAP

	__asm__("bswap %0" : "=r" (x) : "0" (x));

#else

	__asm__("xchgb %b0,%h0\n\t"	/* swap lower bytes	*/

		"rorl $16,%0\n\t"	/* swap words		*/

		"xchgb %b0,%h0"		/* swap higher bytes	*/

		:"=q" (x)

		: "0" (x));

#endif

	return x;

}



static __inline__ __attribute_const__ __u64 ___arch__swab64(__u64 val)

{ 

	union { 

		struct { __u32 a,b; } s;

		__u64 u;

	} v;

	v.u = val;

#ifdef CONFIG_X86_BSWAP

	asm("bswapl %0 ; bswapl %1 ; xchgl %0,%1" 

	    : "=r" (v.s.a), "=r" (v.s.b) 

	    : "0" (v.s.a), "1" (v.s.b)); 

#else

   v.s.a = ___arch__swab32(v.s.a); 

	v.s.b = ___arch__swab32(v.s.b); 

	asm("xchgl %0,%1" : "=r" (v.s.a), "=r" (v.s.b) : "0" (v.s.a), "1" (v.s.b));

#endif

	return v.u;	

} 



/* Do not define swab16.  Gcc is smart enough to recognize "C" version and

   convert it into rotation or exhange.  */



#define __arch__swab64(x) ___arch__swab64(x)

#define __arch__swab32(x) ___arch__swab32(x)



#define __BYTEORDER_HAS_U64__



#endif /* __GNUC__ */



#include <linux/byteorder/little_endian.h>



#endif /* _I386_BYTEORDER_H */

include/asm-x86/byteorder_64.h

deleted100644 → 0
+0 −33
Original line number Diff line number Diff line 
#ifndef _X86_64_BYTEORDER_H

#define _X86_64_BYTEORDER_H



#include <asm/types.h>

#include <linux/compiler.h>



#ifdef __GNUC__



static __inline__ __attribute_const__ __u64 ___arch__swab64(__u64 x)

{

	__asm__("bswapq %0" : "=r" (x) : "0" (x));

	return x;

}



static __inline__ __attribute_const__ __u32 ___arch__swab32(__u32 x)

{

	__asm__("bswapl %0" : "=r" (x) : "0" (x));

	return x;

}



/* Do not define swab16.  Gcc is smart enough to recognize "C" version and

   convert it into rotation or exhange.  */



#define __arch__swab32(x) ___arch__swab32(x)

#define __arch__swab64(x) ___arch__swab64(x)



#endif /* __GNUC__ */



#define __BYTEORDER_HAS_U64__



#include <linux/byteorder/little_endian.h>



#endif /* _X86_64_BYTEORDER_H */