mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-02-19 03:39:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

hle gcm: Fix cellGcmGetReportDataAddressLocation

Browse Source 
* Never return NULL (also apllies to similar functions)
* Base offset is 0x0e000000 for main location
* Default location is LOCAL

Info was taken from disasm of gcm
This commit is contained in:
eladash 2018-12-29 13:15:43 +02:00 committed by Megamouse
parent 568206d11a
commit 26d47afec6
1 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
rpcs3/Emu/Cell/Modules/cellGcmSys.cpp
View File

@ -104,34 +104,35 @@ vm::ptr<CellGcmReportData> cellGcmGetReportDataAddressLocation(u32 index, u32 lo
{ {
cellGcmSys.warning("cellGcmGetReportDataAddressLocation(index=%d, location=%d)", index, location); cellGcmSys.warning("cellGcmGetReportDataAddressLocation(index=%d, location=%d)", index, location);
if (location == CELL_GCM_LOCATION_LOCAL) { if (location == CELL_GCM_LOCATION_MAIN)
if (index >= 2048) { {
cellGcmSys.error("cellGcmGetReportDataAddressLocation: Wrong local index (%d)", index); if (index >= 1024 * 1024)
return vm::null; {
}
return vm::ptr<CellGcmReportData>::make(fxm::get<CellGcmSysConfig>()->gcm_info.label_addr + 0x1400 + index * 0x10);
}
if (location == CELL_GCM_LOCATION_MAIN) {
if (index >= 1024 * 1024) {
cellGcmSys.error("cellGcmGetReportDataAddressLocation: Wrong main index (%d)", index); cellGcmSys.error("cellGcmGetReportDataAddressLocation: Wrong main index (%d)", index);
return vm::null;
}
return vm::ptr<CellGcmReportData>::make(RSXIOMem.RealAddr(index * 0x10));
} }
cellGcmSys.error("cellGcmGetReportDataAddressLocation: Wrong location (%d)", location); return vm::ptr<CellGcmReportData>::make(RSXIOMem.RealAddr(0x0e000000 + index * 0x10));
return vm::null; }
// Anything else is Local
if (index >= 2048)
{
cellGcmSys.error("cellGcmGetReportDataAddressLocation: Wrong local index (%d)", index);
}
return vm::ptr<CellGcmReportData>::make(fxm::get<CellGcmSysConfig>()->gcm_info.label_addr + 0x1400 + index * 0x10);
} }
u64 cellGcmGetTimeStamp(u32 index) u64 cellGcmGetTimeStamp(u32 index)
{ {
cellGcmSys.trace("cellGcmGetTimeStamp(index=%d)", index); cellGcmSys.trace("cellGcmGetTimeStamp(index=%d)", index);
if (index >= 2048) { if (index >= 2048)
{
cellGcmSys.error("cellGcmGetTimeStamp: Wrong local index (%d)", index); cellGcmSys.error("cellGcmGetTimeStamp: Wrong local index (%d)", index);
return 0;
} }
return vm::read64(fxm::get<CellGcmSysConfig>()->gcm_info.label_addr + 0x1400 + index * 0x10); return vm::read64(fxm::get<CellGcmSysConfig>()->gcm_info.label_addr + 0x1400 + index * 0x10);
} }
@ -166,9 +167,9 @@ u32 cellGcmGetReport(u32 type, u32 index)
{ {
cellGcmSys.warning("cellGcmGetReport(type=%d, index=%d)", type, index); cellGcmSys.warning("cellGcmGetReport(type=%d, index=%d)", type, index);
if (index >= 2048) { if (index >= 2048)
{
cellGcmSys.error("cellGcmGetReport: Wrong local index (%d)", index); cellGcmSys.error("cellGcmGetReport: Wrong local index (%d)", index);
return -1;
} }
if (type < 1 || type > 5) { if (type < 1 || type > 5) {
@ -183,10 +184,11 @@ u32 cellGcmGetReportDataAddress(u32 index)
{ {
cellGcmSys.warning("cellGcmGetReportDataAddress(index=%d)", index); cellGcmSys.warning("cellGcmGetReportDataAddress(index=%d)", index);
if (index >= 2048) { if (index >= 2048)
{
cellGcmSys.error("cellGcmGetReportDataAddress: Wrong local index (%d)", index); cellGcmSys.error("cellGcmGetReportDataAddress: Wrong local index (%d)", index);
return 0;
} }
return fxm::get<CellGcmSysConfig>()->gcm_info.label_addr + 0x1400 + index * 0x10; return fxm::get<CellGcmSysConfig>()->gcm_info.label_addr + 0x1400 + index * 0x10;
} }