Skip to content

Commit

Permalink
sh: introduce asm/swab.h
Browse files Browse the repository at this point in the history
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Harvey Harrison authored and Linus Torvalds committed Jan 7, 2009
1 parent 13f7877 commit 1af84a6
Show file tree
Hide file tree
Showing 3 changed files with 64 additions and 59 deletions.
1 change: 1 addition & 0 deletions arch/sh/include/asm/Kbuild
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@ unifdef-y += unistd_32.h
unifdef-y += unistd_64.h
unifdef-y += posix_types_32.h
unifdef-y += posix_types_64.h
unifdef-y += swab.h
62 changes: 3 additions & 59 deletions arch/sh/include/asm/byteorder.h
Original file line number Diff line number Diff line change
@@ -1,68 +1,12 @@
#ifndef __ASM_SH_BYTEORDER_H
#define __ASM_SH_BYTEORDER_H

/*
* Copyright (C) 1999 Niibe Yutaka
* Copyright (C) 2000, 2001 Paolo Alberelli
*/
#include <linux/compiler.h>
#include <linux/types.h>
#include <asm/swab.h>

#ifdef __LITTLE_ENDIAN__
# define __LITTLE_ENDIAN
#include <linux/byteorder/little_endian.h>
#else
# define __BIG_ENDIAN
#include <linux/byteorder/big_endian.h>
#endif

#define __SWAB_64_THRU_32__

static inline __attribute_const__ __u32 __arch_swab32(__u32 x)
{
__asm__(
#ifdef __SH5__
"byterev %0, %0\n\t"
"shari %0, 32, %0"
#else
"swap.b %0, %0\n\t"
"swap.w %0, %0\n\t"
"swap.b %0, %0"
#endif
: "=r" (x)
: "0" (x));

return x;
}
#define __arch_swab32 __arch_swab32

static inline __attribute_const__ __u16 __arch_swab16(__u16 x)
{
__asm__(
#ifdef __SH5__
"byterev %0, %0\n\t"
"shari %0, 32, %0"
#else
"swap.b %0, %0"
#endif
: "=r" (x)
: "0" (x));

return x;
}
#define __arch_swab16 __arch_swab16

static inline __u64 __arch_swab64(__u64 val)
{
union {
struct { __u32 a,b; } s;
__u64 u;
} v, w;
v.u = val;
w.s.b = __arch_swab32(v.s.a);
w.s.a = __arch_swab32(v.s.b);
return w.u;
}
#define __arch_swab64 __arch_swab64

#include <linux/byteorder.h>

#endif /* __ASM_SH_BYTEORDER_H */
60 changes: 60 additions & 0 deletions arch/sh/include/asm/swab.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
#ifndef __ASM_SH_SWAB_H
#define __ASM_SH_SWAB_H

/*
* Copyright (C) 1999 Niibe Yutaka
* Copyright (C) 2000, 2001 Paolo Alberelli
*/
#include <linux/compiler.h>
#include <linux/types.h>

#define __SWAB_64_THRU_32__

static inline __attribute_const__ __u32 __arch_swab32(__u32 x)
{
__asm__(
#ifdef __SH5__
"byterev %0, %0\n\t"
"shari %0, 32, %0"
#else
"swap.b %0, %0\n\t"
"swap.w %0, %0\n\t"
"swap.b %0, %0"
#endif
: "=r" (x)
: "0" (x));

return x;
}
#define __arch_swab32 __arch_swab32

static inline __attribute_const__ __u16 __arch_swab16(__u16 x)
{
__asm__(
#ifdef __SH5__
"byterev %0, %0\n\t"
"shari %0, 32, %0"
#else
"swap.b %0, %0"
#endif
: "=r" (x)
: "0" (x));

return x;
}
#define __arch_swab16 __arch_swab16

static inline __u64 __arch_swab64(__u64 val)
{
union {
struct { __u32 a,b; } s;
__u64 u;
} v, w;
v.u = val;
w.s.b = __arch_swab32(v.s.a);
w.s.a = __arch_swab32(v.s.b);
return w.u;
}
#define __arch_swab64 __arch_swab64

#endif /* __ASM_SH_SWAB_H */

0 comments on commit 1af84a6

Please sign in to comment.