mirror of https://github.com/bochs-emu/Bochs
compilation fixes
This commit is contained in:
parent
25a90ac493
commit
081b228635
|
@ -30,17 +30,17 @@
|
|||
|
||||
#include "scalar_arith.h"
|
||||
|
||||
BX_CPP_INLINE SM3_P1(Bit32u v32)
|
||||
BX_CPP_INLINE Bit32u SM3_P1(Bit32u v32)
|
||||
{
|
||||
return v32 ^ rol32(v32, 15) ^ rol32(v32, 23);
|
||||
}
|
||||
|
||||
BX_CPP_INLINE SM3_P0(Bit32u v32)
|
||||
BX_CPP_INLINE Bit32u SM3_P0(Bit32u v32)
|
||||
{
|
||||
return v32 ^ rol32(v32, 9) ^ rol32(v32, 17);
|
||||
}
|
||||
|
||||
BX_CPP_INLINE SM3_FF(Bit32u x, Bit32u y, Bit32u z, unsigned round)
|
||||
BX_CPP_INLINE Bit32u SM3_FF(Bit32u x, Bit32u y, Bit32u z, unsigned round)
|
||||
{
|
||||
if (round < 16)
|
||||
return (x ^ y ^ z);
|
||||
|
@ -48,7 +48,7 @@ BX_CPP_INLINE SM3_FF(Bit32u x, Bit32u y, Bit32u z, unsigned round)
|
|||
return (x & y) | (x & z) | (y & z);
|
||||
}
|
||||
|
||||
BX_CPP_INLINE SM3_GG(Bit32u x, Bit32u y, Bit32u z, unsigned round)
|
||||
BX_CPP_INLINE Bit32u SM3_GG(Bit32u x, Bit32u y, Bit32u z, unsigned round)
|
||||
{
|
||||
if (round < 16)
|
||||
return (x ^ y ^ z);
|
||||
|
|
Loading…
Reference in New Issue