RPCS3/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-11-22 18:53:28 +01:00
Code Issues Releases Wiki Activity

PPUInterpreter: Fix undefined behavior of left rotate functions (#2469)

Browse Source 
* PPUInterpreter: Fix undefined behavior of rol8 and rol16 with inline assembly

* PPUInterpreter: Fix undefined behavior of rol32 and rol64

* PPUInterpreter: Change left rotate functions to inline functions and move to types.h
This commit is contained in:
Wilfried Rabouin 2017-03-04 14:41:40 +01:00 committed by Ivan
parent ef5225b776
commit 67ac8bf070
2 changed files with 36 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
Utilities/types.h
View File

@ -904,3 +904,39 @@ inline void busy_wait(std::size_t count = 100)
{
while (count--) _mm_pause();
}
// Left rotate helpers
#if defined(__GNUG__)
inline u8 rol8(const u8 x, const u8 n)
{
u8 result = x;
__asm__("rolb %[n], %[result]" : [result] "+g" (result) : [n] "c" (n));
return result;
}
inline u16 rol16(const u16 x, const u16 n)
{
u16 result = x;
__asm__("rolw %b[n], %[result]" : [result] "+g" (result) : [n] "c" (n));
return result;
}
inline u32 rol32(const u32 x, const u32 n)
{
u32 result = x;
__asm__("roll %b[n], %[result]" : [result] "+g" (result) : [n] "c" (n));
return result;
}
inline u64 rol64(const u64 x, const u64 n)
{
u64 result = x;
__asm__("rolq %b[n], %[result]" : [result] "+g" (result) : [n] "c" (n));
return result;
}
#elif defined(_MSC_VER)
inline u8 rol8(const u8 x, const u8 n) { return _rotl8(x, n); }
inline u16 rol16(const u16 x, const u16 n) { return _rotl16(x, n); }
inline u32 rol32(const u32 x, const u32 n) { return _rotl(x, n); }
inline u64 rol64(const u64 x, const u64 n) { return _rotl64(x, n); }
#endif

5
rpcs3/Emu/Cell/PPUInterpreter.cpp
View File

@ -5,11 +5,6 @@
#include <cmath>
// TODO: fix rol8 and rol16 for __GNUG__ (probably with __asm__)
inline u8 rol8(const u8 x, const u8 n) { return x << n | x >> (8 - n); }
inline u16 rol16(const u16 x, const u16 n) { return x << n | x >> (16 - n); }
inline u32 rol32(const u32 x, const u32 n) { return x << n | x >> (32 - n); }
inline u64 rol64(const u64 x, const u64 n) { return x << n | x >> (64 - n); }
inline u64 dup32(const u32 x) { return x | static_cast<u64>(x) << 32; }
#if defined(__GNUG__)