ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10926 from shuffle2/old-gcc-warning 

SHA1/arm64: fix casting warning on certain gcc
This commit is contained in:
Tilka 2022-07-31 16:31:35 +02:00 committed by GitHub
parent 92c7566646 97ff757a74
commit 45f8ae6d51
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/Core/Common/Crypto/SHA1.cpp
View File

@ -287,12 +287,6 @@ private:
u32 e{}; u32 e{};
}; };
static inline uint32x4_t byterev_16B(uint32x4_t x)
{
// Just rev32 with casting wrappers
return vreinterpretq_u32_u8(vrev32q_u8(vreinterpretq_u8_u32(x)));
}
TARGET_ARMV8_SHA1 TARGET_ARMV8_SHA1
static inline uint32x4_t MsgSchedule(WorkBlock* wblock, size_t i) static inline uint32x4_t MsgSchedule(WorkBlock* wblock, size_t i)
{ {
@ -330,7 +324,7 @@ private:
{ {
WorkBlock w; WorkBlock w;
for (size_t i = 0; i < w.size(); i++) for (size_t i = 0; i < w.size(); i++)
w[i] = byterev_16B(vld1q_u8(&msg[sizeof(uint32x4_t) * i])); w[i] = vreinterpretq_u32_u8(vrev32q_u8(vld1q_u8(&msg[sizeof(uint32x4_t) * i])));
std::array<State, 2> states{state}; std::array<State, 2> states{state};
@ -363,7 +357,7 @@ private:
virtual Digest GetDigest() override virtual Digest GetDigest() override
{ {
Digest digest; Digest digest;
vst1q_u8(&digest[0], byterev_16B(state.abcd)); vst1q_u8(&digest[0], vrev32q_u8(vreinterpretq_u8_u32(state.abcd)));
u32 e = Common::FromBigEndian(state.e); u32 e = Common::FromBigEndian(state.e);
std::memcpy(&digest[sizeof(state.abcd)], &e, sizeof(e)); std::memcpy(&digest[sizeof(state.abcd)], &e, sizeof(e));
return digest; return digest;