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

HLE cellGcmSys: Make cellGcmAddressToOffset accurate

Browse source
This commit is contained in:
Eladash 2020-02-15 08:56:57 +02:00 • committed by Ivan
commit 299af768e8
1 changed files with 6 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -891,26 +891,22 @@ error_code cellGcmAddressToOffset(u32 address, vm::ptr<u32> offset)
{ {
cellGcmSys.trace("cellGcmAddressToOffset(address=0x%x, offset=*0x%x)", address, offset); cellGcmSys.trace("cellGcmAddressToOffset(address=0x%x, offset=*0x%x)", address, offset);
// Address not on main memory or local memory const auto cfg = g_fxo->get<gcm_config>();
if (address >= 0xD0000000)
{
return CELL_GCM_ERROR_FAILURE;
}
u32 result; u32 result;
// Address in local memory // Test if address is within local memory
if ((address >> 28) == 0xC) if (const u32 offs = address - cfg->local_addr; offs < cfg->local_size)
{ {
result = address - rsx::constants::local_mem_base; result = offs;
} }
// Address in main memory else check // Address in main memory else check
else else
{ {
const u32 upper12Bits = g_fxo->get<gcm_config>()->offsetTable.ioAddress[address >> 20]; const u32 upper12Bits = cfg->offsetTable.ioAddress[address >> 20];
// If the address is mapped in IO // If the address is mapped in IO
if (upper12Bits != 0xFFFF) if (upper12Bits << 20 < rsx::get_current_renderer()->main_mem_size)
{ {
result = (upper12Bits << 20) | (address & 0xFFFFF); result = (upper12Bits << 20) | (address & 0xFFFFF);
} }