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

Merge pull request #145 from Nekotekina/master

Browse source 
Fixed conflicts.
This commit is contained in:
Alexandro Sánchez Bach 2014-03-31 12:04:34 +02:00
parent 8011cc8ec4
commit 01dbb8eb9a
42 changed files with 1687 additions and 613 deletions
Download patch file Download diff file Expand all files Collapse all files

12
rpcs3/Emu/CPU/CPUThread.h
View file

@ -6,12 +6,12 @@
struct reservation_struct
{
SMutex mutex; // mutex for updating reservation_owner and data
volatile u32 owner; // id of thread that got reservation
volatile u32 addr;
volatile u32 size;
volatile u32 data32;
volatile u64 data64;
// atm, PPU can't break SPU MFC reservation correctly
u32 owner; // id of thread that got reservation
u32 addr;
u32 size;
u32 data32;
u64 data64;
u128 data[8];
__forceinline void clear()
{