Replaced _rotl with std::rotl

This commit is contained in:
Tom Lally 2022-08-30 11:47:35 +01:00
parent 1418186d82
commit e03cafe729
3 changed files with 6 additions and 6 deletions

View file

@ -11,7 +11,7 @@ static uint32 ppc_cmp_and_mask[8] = {
}; };
#define ppc_word_rotl(_data, _n) (_rotl(_data,(_n)&0x1F)) #define ppc_word_rotl(_data, _n) (std::rotl<unsigned int>(_data,(_n)&0x1F))
static inline uint32 ppc_mask(int MB, int ME) static inline uint32 ppc_mask(int MB, int ME)
{ {

View file

@ -8,7 +8,7 @@ uint32 RendererShader::GeneratePrecompiledCacheId()
const char* s = EMULATOR_VERSION_SUFFIX; const char* s = EMULATOR_VERSION_SUFFIX;
while (*s) while (*s)
{ {
v = _rotl(v, 7); v = std::rotl(v, 7);
v += (uint32)(*s); v += (uint32)(*s);
s++; s++;
} }

View file

@ -332,25 +332,25 @@ void InvMixColumns(aes128Ctx_t* aesCtx)
b = stateVal(0, 1); b = stateVal(0, 1);
c = stateVal(0, 2); c = stateVal(0, 2);
d = stateVal(0, 3); d = stateVal(0, 3);
stateValU32(0) = lookupTable_multiply[a] ^ _rotl(lookupTable_multiply[b], 8) ^ _rotl(lookupTable_multiply[c], 16) ^ _rotl(lookupTable_multiply[d], 24); stateValU32(0) = lookupTable_multiply[a] ^ std::rotl(lookupTable_multiply[b], 8) ^ std::rotl(lookupTable_multiply[c], 16) ^ std::rotl(lookupTable_multiply[d], 24);
// i1 // i1
a = stateVal(1, 0); a = stateVal(1, 0);
b = stateVal(1, 1); b = stateVal(1, 1);
c = stateVal(1, 2); c = stateVal(1, 2);
d = stateVal(1, 3); d = stateVal(1, 3);
stateValU32(1) = lookupTable_multiply[a] ^ _rotl(lookupTable_multiply[b], 8) ^ _rotl(lookupTable_multiply[c], 16) ^ _rotl(lookupTable_multiply[d], 24); stateValU32(1) = lookupTable_multiply[a] ^ std::rotl(lookupTable_multiply[b], 8) ^ std::rotl(lookupTable_multiply[c], 16) ^ std::rotl(lookupTable_multiply[d], 24);
// i2 // i2
a = stateVal(2, 0); a = stateVal(2, 0);
b = stateVal(2, 1); b = stateVal(2, 1);
c = stateVal(2, 2); c = stateVal(2, 2);
d = stateVal(2, 3); d = stateVal(2, 3);
stateValU32(2) = lookupTable_multiply[a] ^ _rotl(lookupTable_multiply[b], 8) ^ _rotl(lookupTable_multiply[c], 16) ^ _rotl(lookupTable_multiply[d], 24); stateValU32(2) = lookupTable_multiply[a] ^ std::rotl(lookupTable_multiply[b], 8) ^ std::rotl(lookupTable_multiply[c], 16) ^ std::rotl(lookupTable_multiply[d], 24);
// i3 // i3
a = stateVal(3, 0); a = stateVal(3, 0);
b = stateVal(3, 1); b = stateVal(3, 1);
c = stateVal(3, 2); c = stateVal(3, 2);
d = stateVal(3, 3); d = stateVal(3, 3);
stateValU32(3) = lookupTable_multiply[a] ^ _rotl(lookupTable_multiply[b], 8) ^ _rotl(lookupTable_multiply[c], 16) ^ _rotl(lookupTable_multiply[d], 24); stateValU32(3) = lookupTable_multiply[a] ^ std::rotl(lookupTable_multiply[b], 8) ^ std::rotl(lookupTable_multiply[c], 16) ^ std::rotl(lookupTable_multiply[d], 24);
} }
// The SubBytes Function Substitutes the values in the // The SubBytes Function Substitutes the values in the