generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

modes/modes_lcl.h: make it indent-friendly.

Browse Source 
Conflicts:
	crypto/modes/modes_lcl.h

Reviewed-by: Tim Hudson <tjh@openssl.org>
This commit is contained in:
Andy Polyakov 2015-01-21 11:11:32 +01:00 committed by Matt Caswell
parent 3cf9f81b09
commit 1d7c823ab5
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
crypto/modes/modes_lcl.h
View File

@ -34,20 +34,20 @@ typedef unsigned char u8;
#endif #endif
#if !defined(PEDANTIC) && !defined(OPENSSL_NO_ASM) && !defined(OPENSSL_NO_INLINE_ASM) #if !defined(PEDANTIC) && !defined(OPENSSL_NO_ASM) && !defined(OPENSSL_NO_INLINE_ASM)
#if defined(__GNUC__) && __GNUC__>=2 # if defined(__GNUC__) && __GNUC__>=2
# if defined(__x86_64) || defined(__x86_64__) # if defined(__x86_64) || defined(__x86_64__)
# define BSWAP8(x) ({ u64 ret=(x); \ # define BSWAP8(x) ({ u64 ret=(x); \
asm ("bswapq %0" \ asm ("bswapq %0" \
: "+r"(ret)); ret; }) : "+r"(ret)); ret; })
# define BSWAP4(x) ({ u32 ret=(x); \ # define BSWAP4(x) ({ u32 ret=(x); \
asm ("bswapl %0" \ asm ("bswapl %0" \
: "+r"(ret)); ret; }) : "+r"(ret)); ret; })
# elif (defined(__i386) || defined(__i386__)) && !defined(I386_ONLY) # elif (defined(__i386) || defined(__i386__)) && !defined(I386_ONLY)
# define BSWAP8(x) ({ u32 lo=(u64)(x)>>32,hi=(x); \ # define BSWAP8(x) ({ u32 lo=(u64)(x)>>32,hi=(x); \
asm ("bswapl %0; bswapl %1" \ asm ("bswapl %0; bswapl %1" \
: "+r"(hi),"+r"(lo)); \ : "+r"(hi),"+r"(lo)); \
(u64)hi<<32|lo; }) (u64)hi<<32|lo; })
# define BSWAP4(x) ({ u32 ret=(x); \ # define BSWAP4(x) ({ u32 ret=(x); \
asm ("bswapl %0" \ asm ("bswapl %0" \
: "+r"(ret)); ret; }) : "+r"(ret)); ret; })
# elif (defined(__arm__) || defined(__arm)) && !defined(STRICT_ALIGNMENT) # elif (defined(__arm__) || defined(__arm)) && !defined(STRICT_ALIGNMENT)
@ -55,25 +55,25 @@ typedef unsigned char u8;
asm ("rev %0,%0; rev %1,%1" \ asm ("rev %0,%0; rev %1,%1" \
: "+r"(hi),"+r"(lo)); \ : "+r"(hi),"+r"(lo)); \
(u64)hi<<32|lo; }) (u64)hi<<32|lo; })
# define BSWAP4(x) ({ u32 ret; \ # define BSWAP4(x) ({ u32 ret; \
asm ("rev %0,%1" \ asm ("rev %0,%1" \
: "=r"(ret) : "r"((u32)(x))); \ : "=r"(ret) : "r"((u32)(x))); \
ret; }) ret; })
# endif # endif
#elif defined(_MSC_VER) # elif defined(_MSC_VER)
# if _MSC_VER>=1300 # if _MSC_VER>=1300
# pragma intrinsic(_byteswap_uint64,_byteswap_ulong) # pragma intrinsic(_byteswap_uint64,_byteswap_ulong)
# define BSWAP8(x) _byteswap_uint64((u64)(x)) # define BSWAP8(x) _byteswap_uint64((u64)(x))
# define BSWAP4(x) _byteswap_ulong((u32)(x)) # define BSWAP4(x) _byteswap_ulong((u32)(x))
# elif defined(_M_IX86) # elif defined(_M_IX86)
__inline u32 _bswap4(u32 val) { __inline u32 _bswap4(u32 val) {
_asm mov eax,val _asm mov eax,val
_asm bswap eax _asm bswap eax
} }
# define BSWAP4(x) _bswap4(x) # define BSWAP4(x) _bswap4(x)
# endif
# endif # endif
#endif #endif
#endif
#if defined(BSWAP4) && !defined(STRICT_ALIGNMENT) #if defined(BSWAP4) && !defined(STRICT_ALIGNMENT)
#define GETU32(p) BSWAP4(*(const u32 *)(p)) #define GETU32(p) BSWAP4(*(const u32 *)(p))