mirrors/rpcs3
0
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-09-19 15:59:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Correctness fix for RSXIOMem

Browse source 
- Make RSXIOMem volatile.
- Hint the compiler to check only once the address returned.
This commit is contained in:
elad 2019-03-02 13:35:07 +02:00 • committed by Ivan
commit fc253165e2
3 changed files with 17 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

8
rpcs3/Emu/Cell/Modules/cellGcmSys.cpp
View file

@ -1086,8 +1086,8 @@ s32 cellGcmUnmapEaIoAddress(u32 ea)
for (u32 i = 0; i < size; i++) for (u32 i = 0; i < size; i++)
{ {
RSXIOMem.io[ea + i] = offsetTable.ioAddress[ea + i] = 0xFFFF; RSXIOMem.io[ea + i].release(offsetTable.ioAddress[ea + i] = 0xFFFF);
RSXIOMem.ea[io + i] = offsetTable.eaAddress[io + i] = 0xFFFF; RSXIOMem.ea[io + i].release(offsetTable.eaAddress[io + i] = 0xFFFF);
} }
} }
else else
@ -1109,8 +1109,8 @@ s32 cellGcmUnmapIoAddress(u32 io)
for (u32 i = 0; i < size; i++) for (u32 i = 0; i < size; i++)
{ {
RSXIOMem.io[ea + i] = offsetTable.ioAddress[ea + i] = 0xFFFF; RSXIOMem.io[ea + i].release(offsetTable.ioAddress[ea + i] = 0xFFFF);
RSXIOMem.ea[io + i] = offsetTable.eaAddress[io + i] = 0xFFFF; RSXIOMem.ea[io + i].release(offsetTable.eaAddress[io + i] = 0xFFFF);
} }
} }
else else

8
rpcs3/Emu/Cell/lv2/sys_rsx.cpp
View file

@ -196,8 +196,8 @@ s32 sys_rsx_context_iomap(u32 context_id, u32 io, u32 ea, u32 size, u64 flags)
for (u32 i = 0; i < size; i++) for (u32 i = 0; i < size; i++)
{ {
RSXIOMem.io[ea + i] = io + i; RSXIOMem.io[ea + i].release(io + i);
RSXIOMem.ea[io + i] = ea + i; RSXIOMem.ea[io + i].release(ea + i);
} }
return CELL_OK; return CELL_OK;
@ -221,8 +221,8 @@ s32 sys_rsx_context_iounmap(u32 context_id, u32 io, u32 size)
const u32 end = (io >>= 20) + (size >>= 20); const u32 end = (io >>= 20) + (size >>= 20);
for (u32 ea = RSXIOMem.ea[io]; io < end;) for (u32 ea = RSXIOMem.ea[io]; io < end;)
{ {
RSXIOMem.io[ea++] = 0xFFFF; RSXIOMem.io[ea++].release(0xFFFF);
RSXIOMem.ea[io++] = 0xFFFF; RSXIOMem.ea[io++].release(0xFFFF);
} }
return CELL_OK; return CELL_OK;

14
rpcs3/Emu/RSX/RSXThread.h
View file

@ -27,21 +27,25 @@ extern u64 get_system_time();
struct RSXIOTable struct RSXIOTable
{ {
u16 ea[4096]; atomic_t<u16> ea[4096];
u16 io[3072]; atomic_t<u16> io[3072];
// try to get the real address given a mapped address // try to get the real address given a mapped address
// return non zero on success // return non zero on success
inline u32 RealAddr(u32 offs) inline u32 RealAddr(u32 offs)
{ {
const u32 upper = this->ea[offs >> 20]; u32 result = this->ea[offs >> 20].load();
if (static_cast<s16>(upper) < 0) if (static_cast<s16>(result) < 0)
{ {
return 0; return 0;
} }
return (upper << 20) | (offs & 0xFFFFF); result <<= 20; result |= (offs & 0xFFFFF);
ASSUME(result != 0);
return result;
} }
}; };