Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ppu: Fix extreme reservation corner case #5119

Merged
merged 1 commit into from
Sep 12, 2018
Merged

ppu: Fix extreme reservation corner case #5119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions rpcs3/Emu/Cell/PPUThread.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1005,11 +1005,13 @@ static T ppu_load_acquire_reservation(ppu_thread& ppu, u32 addr)

extern u32 ppu_lwarx(ppu_thread& ppu, u32 addr)
{
ppu.lr_64 = false;
return ppu_load_acquire_reservation<u32>(ppu, addr);
}

extern u64 ppu_ldarx(ppu_thread& ppu, u32 addr)
{
ppu.lr_64 = true;
return ppu_load_acquire_reservation<u64>(ppu, addr);
}

Expand Down Expand Up @@ -1064,6 +1066,8 @@ extern bool ppu_stwcx(ppu_thread& ppu, u32 addr, u32 reg_value)
{
atomic_be_t<u32>& data = vm::_ref<atomic_be_t<u32>>(addr);

if (UNLIKELY(ppu.lr_64)) ppu.rdata >>= 32;

if (ppu.raddr != addr || ppu.rdata != data.load() || ppu.rtime != vm::reservation_acquire(addr, sizeof(u32)))
{
ppu.raddr = 0;
Expand Down
1 change: 1 addition & 0 deletions rpcs3/Emu/Cell/PPUThread.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@ class ppu_thread : public cpu_thread
u32 raddr{0}; // Reservation addr
u64 rtime{0};
u64 rdata{0}; // Reservation data
bool lr_64{false}; // Reservation size (true for 64 bit, false for 32 bit)

atomic_t<u32> prio{0}; // Thread priority (0..3071)
const u32 stack_size; // Stack size
Expand Down