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

Fix cellGcm HLE regression

Browse source 
Also correct flags.
This commit is contained in:
Eladash 2019-10-21 23:07:50 +03:00 • committed by kd-11
parent 945abcc6cd
commit 586fe11e22
3 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -969,8 +969,7 @@ s32 gcmMapEaIoAddress(u32 ea, u32 io, u32 size, bool is_strict)
return CELL_GCM_ERROR_FAILURE; return CELL_GCM_ERROR_FAILURE;
} }
// TODO: Pass correct flags and context if (s32 error = sys_rsx_context_iomap(0x55555555, io, ea, size, 0xe000000000000800ull | (u64{is_strict} << 60)))
if (s32 error = sys_rsx_context_iomap(0, io, ea, size, 0))
{ {
return error; return error;
} }
@ -1035,7 +1034,7 @@ s32 cellGcmMapMainMemory(u32 ea, u32 size, vm::ptr<u32> offset)
{ {
if (unmap_count >= (size >> 20)) if (unmap_count >= (size >> 20))
{ {
if (s32 error = sys_rsx_context_iomap(0, io << 20, ea, size, 0)) if (s32 error = sys_rsx_context_iomap(0x55555555, io << 20, ea, size, 0xe000000000000800ull))
{ {
return error; return error;
} }

6
rpcs3/Emu/Cell/lv2/sys_rsx.h
View file

@ -56,6 +56,12 @@ struct RsxDriverInfo
static_assert(sizeof(RsxDriverInfo) == 0x12F8, "rsxSizeTest"); static_assert(sizeof(RsxDriverInfo) == 0x12F8, "rsxSizeTest");
static_assert(sizeof(RsxDriverInfo::Head) == 0x40, "rsxHeadSizeTest"); static_assert(sizeof(RsxDriverInfo::Head) == 0x40, "rsxHeadSizeTest");
enum : u64
{
// Unused
SYS_RSX_IO_MAP_IS_STRICT = 1ull << 60
};
struct RsxDmaControl struct RsxDmaControl
{ {
u8 resv[0x40]; u8 resv[0x40];

2
rpcs3/Emu/RSX/Capture/rsx_replay.cpp
View file

@ -50,7 +50,7 @@ namespace rsx
get_current_renderer()->main_mem_size = buffer_size; get_current_renderer()->main_mem_size = buffer_size;
if (sys_rsx_context_iomap(contextInfo->context_id, 0, user_mem_addr, buffer_size, 0) != CELL_OK) if (sys_rsx_context_iomap(contextInfo->context_id, 0, user_mem_addr, buffer_size, 0xf000000000000800ull) != CELL_OK)
fmt::throw_exception("Capture Replay: rsx io mapping failed!"); fmt::throw_exception("Capture Replay: rsx io mapping failed!");
return contextInfo->context_id; return contextInfo->context_id;