archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-03 13:31:27 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

MINGW64 fix

Browse source
This commit is contained in:
Nekotekina 2015-11-26 11:13:33 +03:00
parent ca6783ba9a
commit 8a1ce6ba64
10 changed files with 51 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

45
Utilities/BEType.h
View file

@ -383,19 +383,28 @@ template<typename T> struct se_storage<T, 2>
{
using type = u16;
[[deprecated]] static constexpr u16 swap(u16 src) // for reference
[[deprecated]] static constexpr u16 _swap(u16 src) // for reference
{
return (src >> 8) | (src << 8);
}
static inline u16 swap(u16 src)
{
#if defined(__GNUG__)
return __builtin_bswap16(src);
#else
return _byteswap_ushort(src);
#endif
}
static inline u16 to(const T& src)
{
return _byteswap_ushort(reinterpret_cast<const u16&>(src));
return swap(reinterpret_cast<const u16&>(src));
}
static inline T from(u16 src)
{
const u16 result = _byteswap_ushort(src);
const u16 result = swap(src);
return reinterpret_cast<const T&>(result);
}
};
@ -404,19 +413,28 @@ template<typename T> struct se_storage<T, 4>
{
using type = u32;
[[deprecated]] static constexpr u32 swap(u32 src) // for reference
[[deprecated]] static constexpr u32 _swap(u32 src) // for reference
{
return (src >> 24) | (src << 24) | ((src >> 8) & 0x0000ff00) | ((src << 8) & 0x00ff0000);
}
static inline u32 swap(u32 src)
{
#if defined(__GNUG__)
return __builtin_bswap32(src);
#else
return _byteswap_ulong(src);
#endif
}
static inline u32 to(const T& src)
{
return _byteswap_ulong(reinterpret_cast<const u32&>(src));
return swap(reinterpret_cast<const u32&>(src));
}
static inline T from(u32 src)
{
const u32 result = _byteswap_ulong(src);
const u32 result = swap(src);
return reinterpret_cast<const T&>(result);
}
};
@ -425,7 +443,7 @@ template<typename T> struct se_storage<T, 8>
{
using type = u64;
[[deprecated]] static constexpr u64 swap(u64 src) // for reference
[[deprecated]] static constexpr u64 _swap(u64 src) // for reference
{
return (src >> 56) | (src << 56) |
((src >> 40) & 0x000000000000ff00) |
@ -436,14 +454,23 @@ template<typename T> struct se_storage<T, 8>
((src << 40) & 0x00ff000000000000);
}
static inline u64 swap(u64 src)
{
#if defined(__GNUG__)
return __builtin_bswap64(src);
#else
return _byteswap_uint64(src);
#endif
}
static inline u64 to(const T& src)
{
return _byteswap_uint64(reinterpret_cast<const u64&>(src));
return swap(reinterpret_cast<const u64&>(src));
}
static inline T from(u64 src)
{
const u64 result = _byteswap_uint64(src);
const u64 result = swap(src);
return reinterpret_cast<const T&>(result);
}
};

12
Utilities/GNU.h
View file

@ -40,20 +40,8 @@
#endif
#define _fpclass(x) std::fpclassify(x)
#define _byteswap_ushort(x) __builtin_bswap16(x)
#define _byteswap_uint64(x) __builtin_bswap64(x)
#define INFINITE 0xFFFFFFFF
#if !defined(__MINGW32__)
#define _byteswap_ulong(x) __builtin_bswap32(x)
#else
inline std::uint32_t _byteswap_ulong(std::uint32_t value)
{
__asm__("bswap %0" : "+r"(value));
return value;
}
#endif
#ifdef __APPLE__
// XXX only supports a single timer

4
Utilities/Thread.cpp
View file

@ -868,7 +868,7 @@ bool handle_access_violation(u32 addr, bool is_writing, x64_context* context)
case X64OP_LOAD:
{
u32 value;
if (is_writing || !thread->read_reg(addr, value) || !put_x64_reg_value(context, reg, d_size, _byteswap_ulong(value)))
if (is_writing || !thread->read_reg(addr, value) || !put_x64_reg_value(context, reg, d_size, se_storage<u32>::swap(value)))
{
return false;
}
@ -878,7 +878,7 @@ bool handle_access_violation(u32 addr, bool is_writing, x64_context* context)
case X64OP_STORE:
{
u64 reg_value;
if (!is_writing || !get_x64_reg_value(context, reg, d_size, i_size, reg_value) || !thread->write_reg(addr, _byteswap_ulong((u32)reg_value)))
if (!is_writing || !get_x64_reg_value(context, reg, d_size, i_size, reg_value) || !thread->write_reg(addr, se_storage<u32>::swap((u32)reg_value)))
{
return false;
}