mirrors-yuzu-emu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls synced 2024-11-25 03:28:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

aria: improve compiler inline compatibility

Browse source
This commit is contained in:
Manuel Pégourié-Gonnard 2018-02-28 12:38:04 +01:00
parent 22997b7200
commit c0bb66f47e
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
library/aria.c
View file

@ -48,6 +48,11 @@
#if !defined(MBEDTLS_ARIA_ALT) #if !defined(MBEDTLS_ARIA_ALT)
#if ( defined(__ARMCC_VERSION) || defined(_MSC_VER) ) && \
!defined(inline) && !defined(__cplusplus)
#define inline __inline
#endif
/* Implementation that should never be optimized out by the compiler */ /* Implementation that should never be optimized out by the compiler */
static void mbedtls_zeroize( void *v, size_t n ) { static void mbedtls_zeroize( void *v, size_t n ) {
volatile unsigned char *p = (unsigned char*)v; while( n-- ) *p++ = 0; volatile unsigned char *p = (unsigned char*)v; while( n-- ) *p++ = 0;
@ -97,7 +102,7 @@ static inline uint32_t aria_p1( uint32_t x )
} }
#define ARIA_P1 aria_p1 #define ARIA_P1 aria_p1
#elif defined(__ARMCC_VERSION) && __ARMCC_VERSION < 6000000 #elif defined(__ARMCC_VERSION) && __ARMCC_VERSION < 6000000
static __inline uint32_t aria_p1( uint32_t x ) static inline uint32_t aria_p1( uint32_t x )
{ {
uint32_t r; uint32_t r;
__asm( "rev16 r, x" ); __asm( "rev16 r, x" );
@ -146,7 +151,7 @@ static inline uint32_t aria_p3( uint32_t x )
} }
#define ARIA_P3 aria_p3 #define ARIA_P3 aria_p3
#elif defined(__ARMCC_VERSION) && __ARMCC_VERSION < 6000000 #elif defined(__ARMCC_VERSION) && __ARMCC_VERSION < 6000000
static __inline uint32_t aria_p3( uint32_t x ) static inline uint32_t aria_p3( uint32_t x )
{ {
uint32_t r; uint32_t r;
__asm( "rev r, x" ); __asm( "rev r, x" );