mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-02-06 18:40:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #88 from Bigpet/master

Browse Source 
fix small mistakes
This commit is contained in:
Alexandro Sánchez Bach 2014-02-28 19:39:43 +01:00
commit 6a15351363
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Utilities/BEType.h
View File

@ -50,10 +50,11 @@ class be_t
public: public:
typedef T type; typedef T type;
#ifdef __GNUG__ #ifdef _WIN32
be_t(){}
#else
be_t() noexcept = default be_t() noexcept = default
#endif #endif
be_t(){}
be_t(const T& value) be_t(const T& value)
{ {

2
Utilities/GNU.h
View File

@ -15,5 +15,5 @@
#define InterlockedCompareExchange64(ptr,new_val,old_val) __sync_val_compare_and_swap(ptr,old_val,new_val) #define InterlockedCompareExchange64(ptr,new_val,old_val) __sync_val_compare_and_swap(ptr,old_val,new_val)
#define _aligned_malloc(size,alignment) aligned_alloc(alignment,size) #define _aligned_malloc(size,alignment) aligned_alloc(alignment,size)
#define _aligned_free(pointer) free(pointer) #define _aligned_free(pointer) free(pointer)
#define DWORD int64_t #define DWORD int32_t
#endif #endif

4
rpcs3/Emu/Cell/PPUInterpreter.h
View File

@ -2665,7 +2665,7 @@ private:
if (lock.tid == reservation.owner && reservation.addr == addr && reservation.size == 4) if (lock.tid == reservation.owner && reservation.addr == addr && reservation.size == 4)
{ {
// Memory.Write32(addr, CPU.GPR[rs]); // Memory.Write32(addr, CPU.GPR[rs]);
CPU.SetCR_EQ(0, InterlockedCompareExchange((volatile long*)(Memory + addr), (u32)CPU.GPR[rs], reservation.data32) == reservation.data32); CPU.SetCR_EQ(0, InterlockedCompareExchange((volatile long*) (Memory + addr), re((u32) CPU.GPR[rs]), re(reservation.data32)) == re(reservation.data32));
reservation.clear(); reservation.clear();
} }
else else
@ -2718,7 +2718,7 @@ private:
if (lock.tid == reservation.owner && reservation.addr == addr && reservation.size == 8) if (lock.tid == reservation.owner && reservation.addr == addr && reservation.size == 8)
{ {
// Memory.Write64(addr, CPU.GPR[rs]); // Memory.Write64(addr, CPU.GPR[rs]);
CPU.SetCR_EQ(0, InterlockedCompareExchange64((volatile long long*)(Memory + addr), CPU.GPR[rs], reservation.data64) == reservation.data64); CPU.SetCR_EQ(0, InterlockedCompareExchange64((volatile long long*)(Memory + addr), re(CPU.GPR[rs]), re(reservation.data64)) == re(reservation.data64));
reservation.clear(); reservation.clear();
} }
else else