Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add sys_rsx_context_iomap workaround #6085

Merged
merged 2 commits into from Jun 16, 2019
Merged

Add sys_rsx_context_iomap workaround #6085

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9d03332
Add sys_rsx_context_iomap workaround
Nekotekina Jun 13, 2019
0fe083e
Merge branch 'master' into Nekotekina-patch-2
Nekotekina Jun 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions rpcs3/Emu/Cell/lv2/sys_rsx.cpp
View file
Open in desktop
Expand Up @@ -186,7 +186,7 @@ error_code sys_rsx_context_iomap(u32 context_id, u32 io, u32 ea, u32 size, u64 f

for (u32 addr = ea, end = ea + size; addr < end; addr += 0x100000)
{
if (!vm::check_addr(addr, 1, vm::page_allocated | vm::page_1m_size))
if (!vm::check_addr(addr, 1, vm::page_allocated | (addr < 0x20000000 ? 0 : vm::page_1m_size)))
{
return CELL_EINVAL;
}
Expand Down Expand Up @@ -537,4 +537,4 @@ error_code sys_rsx_attribute(u32 packageId, u32 a2, u32 a3, u32 a4, u32 a5)
sys_rsx.warning("sys_rsx_attribute(packageId=0x%x, a2=0x%x, a3=0x%x, a4=0x%x, a5=0x%x)", packageId, a2, a3, a4, a5);

return CELL_OK;
}
}