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

cellGcm HLE: fix cellGcmMapMainMemory

Browse source 
Fix arguments order, softcode RsxReports::report offset.
This commit is contained in:
Eladash 2020-01-31 15:59:44 +02:00 • committed by kd-11
parent b7043ce000
commit 9d1bb60ad7
2 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -142,7 +142,7 @@ vm::ptr<CellGcmReportData> cellGcmGetReportDataAddressLocation(u32 index, u32 lo
cellGcmSys.error("cellGcmGetReportDataAddressLocation: Wrong local index (%d)", index); cellGcmSys.error("cellGcmGetReportDataAddressLocation: Wrong local index (%d)", index);
} }
return vm::ptr<CellGcmReportData>::make(g_fxo->get<gcm_config>()->gcm_info.label_addr + 0x1400 + index * 0x10); return vm::ptr<CellGcmReportData>::make(g_fxo->get<gcm_config>()->gcm_info.label_addr + ::offset32(&RsxReports::report) + index * 0x10);
} }
u64 cellGcmGetTimeStamp(u32 index) u64 cellGcmGetTimeStamp(u32 index)
@ -154,7 +154,7 @@ u64 cellGcmGetTimeStamp(u32 index)
cellGcmSys.error("cellGcmGetTimeStamp: Wrong local index (%d)", index); cellGcmSys.error("cellGcmGetTimeStamp: Wrong local index (%d)", index);
} }
return vm::read64(g_fxo->get<gcm_config>()->gcm_info.label_addr + 0x1400 + index * 0x10); return vm::read64(g_fxo->get<gcm_config>()->gcm_info.label_addr + ::offset32(&RsxReports::report) + index * 0x10);
} }
u32 cellGcmGetCurrentField() u32 cellGcmGetCurrentField()
@ -181,7 +181,7 @@ u32 cellGcmGetNotifyDataAddress(u32 index)
*/ */
vm::ptr<CellGcmReportData> _cellGcmFunc12() vm::ptr<CellGcmReportData> _cellGcmFunc12()
{ {
return vm::ptr<CellGcmReportData>::make(g_fxo->get<gcm_config>()->gcm_info.label_addr + 0x1400); // TODO return vm::ptr<CellGcmReportData>::make(g_fxo->get<gcm_config>()->gcm_info.label_addr + ::offset32(&RsxReports::report)); // TODO
} }
u32 cellGcmGetReport(u32 type, u32 index) u32 cellGcmGetReport(u32 type, u32 index)
@ -210,7 +210,7 @@ u32 cellGcmGetReportDataAddress(u32 index)
cellGcmSys.error("cellGcmGetReportDataAddress: Wrong local index (%d)", index); cellGcmSys.error("cellGcmGetReportDataAddress: Wrong local index (%d)", index);
} }
return g_fxo->get<gcm_config>()->gcm_info.label_addr + 0x1400 + index * 0x10; return g_fxo->get<gcm_config>()->gcm_info.label_addr + ::offset32(&RsxReports::report) + index * 0x10;
} }
u32 cellGcmGetReportDataLocation(u32 index, u32 location) u32 cellGcmGetReportDataLocation(u32 index, u32 location)
@ -230,7 +230,7 @@ u64 cellGcmGetTimeStampLocation(u32 index, u32 location)
cellGcmSys.error("cellGcmGetTimeStampLocation: Wrong local index (%d)", index); cellGcmSys.error("cellGcmGetTimeStampLocation: Wrong local index (%d)", index);
return 0; return 0;
} }
return vm::read64(g_fxo->get<gcm_config>()->gcm_info.label_addr + 0x1400 + index * 0x10); return vm::read64(g_fxo->get<gcm_config>()->gcm_info.label_addr + ::offset32(&RsxReports::report) + index * 0x10);
} }
if (location == CELL_GCM_LOCATION_MAIN) { if (location == CELL_GCM_LOCATION_MAIN) {
@ -1049,12 +1049,14 @@ error_code cellGcmMapMainMemory(u32 ea, u32 size, vm::ptr<u32> offset)
{ {
if (unmap_count >= (size >> 20)) if (unmap_count >= (size >> 20))
{ {
if (auto error = gcmMapEaIoAddress(io << 20, ea, size, false)) io <<= 20;
if (auto error = gcmMapEaIoAddress(ea, io, size, false))
{ {
return error; return error;
} }
*offset = io << 20; *offset = io;
return CELL_OK; return CELL_OK;
} }
} }

2
rpcs3/Emu/RSX/RSXThread.cpp
View file

@ -81,7 +81,7 @@ namespace rsx
{ {
if (offset < sizeof(RsxReports::report) /*&& (offset % 0x10) == 0*/) if (offset < sizeof(RsxReports::report) /*&& (offset % 0x10) == 0*/)
{ {
return render->label_addr + 0x1400 + offset; return render->label_addr + ::offset32(&RsxReports::report) + offset;
} }
msg = "Local RSX REPORT offset out of range!"sv; msg = "Local RSX REPORT offset out of range!"sv;