arne
/
cryptopp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Switch to byte instead of uint8_t 

Several places in ppc-simd.h used uint8_t rather than byte
pull/703/head
Jeffrey Walton 2018-08-13 00:41:55 -04:00
parent 39b1f60de5
commit 7dc2e6ea31
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
ppc-simd.h
View File

@ -394,7 +394,7 @@ inline bool VectorNotEqual(const T1& vec1, const T2& vec2)
/// \note VectorLoadBE() does not require an aligned array. /// \note VectorLoadBE() does not require an aligned array.
/// \sa Reverse(), VectorLoadBE(), VectorLoad() /// \sa Reverse(), VectorLoadBE(), VectorLoad()
/// \since Crypto++ 6.0 /// \since Crypto++ 6.0
inline uint32x4_p VectorLoadBE(const uint8_t src[16]) inline uint32x4_p VectorLoadBE(const byte src[16])
{ {
#if defined(CRYPTOPP_XLC_VERSION) #if defined(CRYPTOPP_XLC_VERSION)
return (uint32x4_p)vec_xl_be(0, (byte*)src); return (uint32x4_p)vec_xl_be(0, (byte*)src);
@ -415,7 +415,7 @@ inline uint32x4_p VectorLoadBE(const uint8_t src[16])
/// \note VectorLoadBE does not require an aligned array. /// \note VectorLoadBE does not require an aligned array.
/// \sa Reverse(), VectorLoadBE(), VectorLoad() /// \sa Reverse(), VectorLoadBE(), VectorLoad()
/// \since Crypto++ 6.0 /// \since Crypto++ 6.0
inline uint32x4_p VectorLoadBE(int off, const uint8_t src[16]) inline uint32x4_p VectorLoadBE(int off, const byte src[16])
{ {
#if defined(CRYPTOPP_XLC_VERSION) #if defined(CRYPTOPP_XLC_VERSION)
return (uint32x4_p)vec_xl_be(off, (byte*)src); return (uint32x4_p)vec_xl_be(off, (byte*)src);
@ -439,7 +439,7 @@ inline uint32x4_p VectorLoad(const byte src[16])
#if defined(CRYPTOPP_XLC_VERSION) #if defined(CRYPTOPP_XLC_VERSION)
return (uint32x4_p)vec_xl(0, (byte*)src); return (uint32x4_p)vec_xl(0, (byte*)src);
#else #else
return (uint32x4_p)vec_vsx_ld(0, src); return (uint32x4_p)vec_vsx_ld(0, (byte*)src);
#endif #endif
} }
@ -455,7 +455,7 @@ inline uint32x4_p VectorLoad(int off, const byte src[16])
#if defined(CRYPTOPP_XLC_VERSION) #if defined(CRYPTOPP_XLC_VERSION)
return (uint32x4_p)vec_xl(off, (byte*)src); return (uint32x4_p)vec_xl(off, (byte*)src);
#else #else
return (uint32x4_p)vec_vsx_ld(off, src); return (uint32x4_p)vec_vsx_ld(off, (byte*)src);
#endif #endif
} }
@ -469,15 +469,15 @@ inline uint32x4_p VectorLoad(int off, const byte src[16])
/// \sa Reverse(), VectorLoadBE(), VectorLoad() /// \sa Reverse(), VectorLoadBE(), VectorLoad()
/// \since Crypto++ 6.0 /// \since Crypto++ 6.0
template <class T> template <class T>
inline void VectorStoreBE(const T& src, uint8_t dest[16]) inline void VectorStoreBE(const T& src, byte dest[16])
{ {
#if defined(CRYPTOPP_XLC_VERSION) #if defined(CRYPTOPP_XLC_VERSION)
vec_xst_be((uint8x16_p)src, 0, dest); vec_xst_be((uint8x16_p)src, 0, (byte*)dest);
#else #else
# if defined(CRYPTOPP_BIG_ENDIAN) # if defined(CRYPTOPP_BIG_ENDIAN)
vec_vsx_st((uint8x16_p)src, 0, dest); vec_vsx_st((uint8x16_p)src, 0, (byte*)dest);
# else # else
vec_vsx_st((uint8x16_p)Reverse(src), 0, dest); vec_vsx_st((uint8x16_p)Reverse(src), 0, (byte*)dest);
# endif # endif
#endif #endif
} }
@ -493,15 +493,15 @@ inline void VectorStoreBE(const T& src, uint8_t dest[16])
/// \sa Reverse(), VectorLoadBE(), VectorLoad() /// \sa Reverse(), VectorLoadBE(), VectorLoad()
/// \since Crypto++ 6.0 /// \since Crypto++ 6.0
template <class T> template <class T>
inline void VectorStoreBE(const T& src, int off, uint8_t dest[16]) inline void VectorStoreBE(const T& src, int off, byte dest[16])
{ {
#if defined(CRYPTOPP_XLC_VERSION) #if defined(CRYPTOPP_XLC_VERSION)
vec_xst_be((uint8x16_p)src, off, dest); vec_xst_be((uint8x16_p)src, off, (byte*)dest);
#else #else
# if defined(CRYPTOPP_BIG_ENDIAN) # if defined(CRYPTOPP_BIG_ENDIAN)
vec_vsx_st((uint8x16_p)src, off, dest); vec_vsx_st((uint8x16_p)src, off, (byte*)dest);
# else # else
vec_vsx_st((uint8x16_p)Reverse(src), off, dest); vec_vsx_st((uint8x16_p)Reverse(src), off, (byte*)dest);
# endif # endif
#endif #endif
} }
@ -517,9 +517,9 @@ template<class T>
inline void VectorStore(const T& src, byte dest[16]) inline void VectorStore(const T& src, byte dest[16])
{ {
#if defined(CRYPTOPP_XLC_VERSION) #if defined(CRYPTOPP_XLC_VERSION)
vec_xst((uint8x16_p)src, 0, dest); vec_xst((uint8x16_p)src, 0, (byte*)dest);
#else #else
vec_vsx_st((uint8x16_p)src, 0, dest); vec_vsx_st((uint8x16_p)src, 0, (byte*)dest);
#endif #endif
} }
@ -535,9 +535,9 @@ template<class T>
inline void VectorStore(const T& src, int off, byte dest[16]) inline void VectorStore(const T& src, int off, byte dest[16])
{ {
#if defined(CRYPTOPP_XLC_VERSION) #if defined(CRYPTOPP_XLC_VERSION)
vec_xst((uint8x16_p)src, off, dest); vec_xst((uint8x16_p)src, off, (byte*)dest);
#else #else
vec_vsx_st((uint8x16_p)src, off, dest); vec_vsx_st((uint8x16_p)src, off, (byte*)dest);
#endif #endif
} }
@ -595,7 +595,7 @@ inline uint32x4_p VectorLoad(int off, const byte src[16])
/// \note VectorLoadBE() does not require an aligned array. /// \note VectorLoadBE() does not require an aligned array.
/// \sa Reverse(), VectorLoadBE(), VectorLoad() /// \sa Reverse(), VectorLoadBE(), VectorLoad()
/// \since Crypto++ 6.0 /// \since Crypto++ 6.0
inline uint32x4_p VectorLoadBE(const uint8_t src[16]) inline uint32x4_p VectorLoadBE(const byte src[16])
{ {
#if defined(CRYPTOPP_BIG_ENDIAN) #if defined(CRYPTOPP_BIG_ENDIAN)
return (uint32x4_p)VectorLoad(src); return (uint32x4_p)VectorLoad(src);
@ -636,7 +636,7 @@ inline void VectorStore(const T& data, byte dest[16])
/// \sa Reverse(), VectorLoadBE(), VectorLoad() /// \sa Reverse(), VectorLoadBE(), VectorLoad()
/// \since Crypto++ 6.0 /// \since Crypto++ 6.0
template <class T> template <class T>
inline void VectorStoreBE(const T& src, uint8_t dest[16]) inline void VectorStoreBE(const T& src, byte dest[16])
{ {
#if defined(CRYPTOPP_BIG_ENDIAN) #if defined(CRYPTOPP_BIG_ENDIAN)
VectorStore(src, dest); VectorStore(src, dest);